diff --git a/frontend/src/pages/wiki2/css/view-structure.css b/frontend/src/pages/wiki2/css/view-structure.css index c9ce46a165..3724c79efe 100644 --- a/frontend/src/pages/wiki2/css/view-structure.css +++ b/frontend/src/pages/wiki2/css/view-structure.css @@ -248,10 +248,6 @@ margin-top: 4px; } -.view-operation-dropdown-menu .sf3-font { - margin-right: 10px; -} - .view-operation-dropdown-menu .divider { margin: 0.2rem 0; } @@ -334,16 +330,13 @@ top: 0; } -/* dropdown icon */ -.dtable-dropdown-menu .dropdown-item .item-icon, -.dtable-dropdown-menu .dropdown-item .seafile-multicolor-icon { +.dtable-dropdown-menu .dropdown-item .sf3-font { font-size: 14px; margin-right: 10px; color: #8c8c8c; } -.dtable-dropdown-menu .dropdown-item:hover .item-icon, -.dtable-dropdown-menu .dropdown-item:hover .seafile-multicolor-icon { +.dtable-dropdown-menu .dropdown-item:hover .sf3-font { color: #fff; } diff --git a/frontend/src/pages/wiki2/view-structure/folders/folder-operation-dropdownmenu.js b/frontend/src/pages/wiki2/view-structure/folders/folder-operation-dropdownmenu.js index 16d76ae5be..913c2620d6 100644 --- a/frontend/src/pages/wiki2/view-structure/folders/folder-operation-dropdownmenu.js +++ b/frontend/src/pages/wiki2/view-structure/folders/folder-operation-dropdownmenu.js @@ -57,15 +57,15 @@ export default class FolderOperationDropdownMenu extends Component { positionFixed={true} > - + {gettext('Add page')} - + {gettext('Modify name')} - + {gettext('Delete folder')} diff --git a/frontend/src/pages/wiki2/view-structure/views/page-dropdownmenu.js b/frontend/src/pages/wiki2/view-structure/views/page-dropdownmenu.js index f474217d0d..2fbd5fb7dd 100644 --- a/frontend/src/pages/wiki2/view-structure/views/page-dropdownmenu.js +++ b/frontend/src/pages/wiki2/view-structure/views/page-dropdownmenu.js @@ -3,7 +3,6 @@ import PropTypes from 'prop-types'; import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; import toaster from '../../../../components/toast'; import { gettext } from '../../../../utils/constants'; -import Icon from '../../../../components/icon'; import { getWikPageLink } from '../../utils'; export default class PageDropdownMenu extends Component { @@ -143,28 +142,28 @@ export default class PageDropdownMenu extends Component { positionFixed={true} > - + {gettext('Copy link')} - + {gettext('Modify name')} {canDuplicate && - + {gettext('Duplicate page')} } {(isOnlyOneView || pagesLength === 1 || !canDelete) ? '' : ( - + {gettext('Delete page')} )} {folderId && - + {gettext('Remove from folder')} } @@ -187,7 +186,7 @@ export default class PageDropdownMenu extends Component { toggle={this.onToggleFoldersMenu} >
this.foldersDropdownToggle = ref}> - + {gettext('Move to')} diff --git a/frontend/src/pages/wiki2/wiki.css b/frontend/src/pages/wiki2/wiki.css index 5edfb78fb1..09f0f55fa5 100644 --- a/frontend/src/pages/wiki2/wiki.css +++ b/frontend/src/pages/wiki2/wiki.css @@ -67,6 +67,7 @@ img[src=""] { padding-left: 142px; font-weight: bold; font-size: 26pt; + color: #212529; } /* reset article h1 */ diff --git a/media/css/sf_font3/iconfont.css b/media/css/sf_font3/iconfont.css index 4bffa9d430..f054406413 100644 --- a/media/css/sf_font3/iconfont.css +++ b/media/css/sf_font3/iconfont.css @@ -1,11 +1,11 @@ @font-face { font-family: "sf3-font"; /* Project id 1230969 */ - src: url('iconfont.eot?t=1718690041029'); /* IE9 */ - src: url('iconfont.eot?t=1718690041029#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('iconfont.woff2?t=1718690041029') format('woff2'), - url('iconfont.woff?t=1718690041029') format('woff'), - url('iconfont.ttf?t=1718690041029') format('truetype'), - url('iconfont.svg?t=1718690041029#sf3-font') format('svg'); + src: url('iconfont.eot?t=1719282050936'); /* IE9 */ + src: url('iconfont.eot?t=1719282050936#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('iconfont.woff2?t=1719282050936') format('woff2'), + url('iconfont.woff?t=1719282050936') format('woff'), + url('iconfont.ttf?t=1719282050936') format('truetype'), + url('iconfont.svg?t=1719282050936#sf3-font') format('svg'); } .sf3-font { @@ -16,6 +16,10 @@ -moz-osx-font-smoothing: grayscale; } +.sf3-font-image:before { + content: "\e82d"; +} + .sf3-font-folder:before { content: "\e82c"; } @@ -32,7 +36,7 @@ content: "\e620"; } -.sf3-font-sdoc-link:before { +.sf3-font-link:before { content: "\e61f"; } diff --git a/media/css/sf_font3/iconfont.eot b/media/css/sf_font3/iconfont.eot index 72e962e2f9..df624ba3c5 100644 Binary files a/media/css/sf_font3/iconfont.eot and b/media/css/sf_font3/iconfont.eot differ diff --git a/media/css/sf_font3/iconfont.js b/media/css/sf_font3/iconfont.js index 2cc3e69870..0d1e6982c4 100644 --- a/media/css/sf_font3/iconfont.js +++ b/media/css/sf_font3/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_1230969='',function(h){var c=(c=document.getElementsByTagName("script"))[c.length-1],l=c.getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var s,o,t,v,i,m=function(c,l){l.parentNode.insertBefore(c,l)};if(l&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}s=function(){var c,l=document.createElement("div");l.innerHTML=h._iconfont_svg_string_1230969,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?m(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(s,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),s()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(t=s,v=h.document,i=!1,z(),v.onreadystatechange=function(){"complete"==v.readyState&&(v.onreadystatechange=null,f())})}function f(){i||(i=!0,t())}function z(){try{v.documentElement.doScroll("left")}catch(c){return void setTimeout(z,50)}f()}}(window); \ No newline at end of file +window._iconfont_svg_string_1230969='',function(h){var c=(c=document.getElementsByTagName("script"))[c.length-1],l=c.getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var s,o,t,v,i,m=function(c,l){l.parentNode.insertBefore(c,l)};if(l&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}s=function(){var c,l=document.createElement("div");l.innerHTML=h._iconfont_svg_string_1230969,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?m(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(s,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),s()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(t=s,v=h.document,i=!1,z(),v.onreadystatechange=function(){"complete"==v.readyState&&(v.onreadystatechange=null,f())})}function f(){i||(i=!0,t())}function z(){try{v.documentElement.doScroll("left")}catch(c){return void setTimeout(z,50)}f()}}(window); \ No newline at end of file diff --git a/media/css/sf_font3/iconfont.svg b/media/css/sf_font3/iconfont.svg index 987bb00af8..eeae34b953 100644 --- a/media/css/sf_font3/iconfont.svg +++ b/media/css/sf_font3/iconfont.svg @@ -14,7 +14,9 @@ /> - + + + @@ -22,7 +24,7 @@ - + diff --git a/media/css/sf_font3/iconfont.ttf b/media/css/sf_font3/iconfont.ttf index 535f46d894..0edbc2b1f5 100644 Binary files a/media/css/sf_font3/iconfont.ttf and b/media/css/sf_font3/iconfont.ttf differ diff --git a/media/css/sf_font3/iconfont.woff b/media/css/sf_font3/iconfont.woff index d9e1cefabe..497ef149e9 100644 Binary files a/media/css/sf_font3/iconfont.woff and b/media/css/sf_font3/iconfont.woff differ diff --git a/media/css/sf_font3/iconfont.woff2 b/media/css/sf_font3/iconfont.woff2 index b2eb43d8e9..11692e2fa7 100644 Binary files a/media/css/sf_font3/iconfont.woff2 and b/media/css/sf_font3/iconfont.woff2 differ