Просмотр исходного кода

Merge pull request #2996 from weseek/fix/fix-layout-presentation-button

Fix/fix layout presentation button
Yuki Takei 5 лет назад
Родитель
Сommit
6846a40c58

+ 1 - 1
src/client/js/components/Icons/PresentationIcon.jsx

@@ -3,7 +3,7 @@ import React from 'react';
 const PresentationIcon = () => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
-    width="12.25"
+    width="14"
     height="14"
     viewBox="0 0 12.25 14"
   >

+ 1 - 1
src/client/js/components/Page/PageManagement.jsx

@@ -132,7 +132,7 @@ const PageManagement = (props) => {
         <button className="dropdown-item" type="button" onClick={openPagePresentationModalHandler}>
           <i className="icon-fw"><PresentationIcon /></i> { t('Presentation Mode') }
         </button>
-        <button type="button" className="dropdown-item" onClick={() => { exportPageHandler('md') }}>
+        <button className="dropdown-item" type="button" onClick={() => { exportPageHandler('md') }}>
           <i className="icon-fw icon-cloud-download"></i>{t('export_bulk.export_page_markdown')}
         </button>
         {/* TODO GW-2746 create api to bulk export pages */}

+ 9 - 0
src/client/styles/scss/theme/_apply-colors.scss

@@ -92,10 +92,19 @@ pre:not(.hljs):not(.CodeMirror-line) {
 
 .dropdown-item {
   color: $color-global;
+
+  svg {
+    fill: $color-global;
+  }
+
   &:active,
   &.active {
     color: $color-dropdown-link-active;
     background-color: $bgcolor-dropdown-link-active;
+
+    svg {
+      fill: $color-dropdown-link-active;
+    }
   }
   &:hover {
     background-color: $light;