12.0 fix icon size (#6259)

* 01 change wiki dropdown icon style * 02 change wiki title color
2025-04-28 03:10:45 +00:00 · 2024-06-25 21:45:41 +08:00 · 2024-06-25 21:45:41 +08:00 · a5edeafb74
commit a5edeafb74
parent 939c85d3c1
11 changed files with 28 additions and 29 deletions
--- 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;
 }

--- 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}
          >
            <DropdownItem onClick={this.props.onToggleAddView.bind(this, this.props.folderId)}>
-              <Icon symbol={'file'}/>
+              <i className="sf3-font sf3-font-file" />
              <span className="item-text">{gettext('Add page')}</span>
            </DropdownItem>
            <DropdownItem onClick={this.openFolderEditor}>
-              <Icon symbol={'edit'}/>
+              <i className="sf3-font sf3-font-rename" />
              <span className="item-text">{gettext('Modify name')}</span>
            </DropdownItem>
            <DropdownItem onMouseDown={this.onDeleteFolder}>
-              <Icon symbol={'delete'}/>
+              <i className="sf3-font sf3-font-delete1" />
              <span className="item-text">{gettext('Delete folder')}</span>
            </DropdownItem>
          </DropdownMenu>
--- 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}
        >
          <DropdownItem onClick={this.handleCopyLink}>
-            <i className="sf3-font sf3-font-sdoc-link" />
+            <i className="sf3-font sf3-font-link" />
            <span className="item-text">{gettext('Copy link')}</span>
          </DropdownItem>
          <DropdownItem onClick={this.onRenameView}>
-            <Icon symbol={'edit'}/>
+            <i className="sf3-font sf3-font-rename" />
            <span className="item-text">{gettext('Modify name')}</span>
          </DropdownItem>
          {canDuplicate &&
            <DropdownItem onClick={this.duplicatePage}>
-              <Icon symbol={'copy'}/>
+              <i className="sf3-font sf3-font-copy1" />
              <span className="item-text">{gettext('Duplicate page')}</span>
            </DropdownItem>
          }
          {(isOnlyOneView || pagesLength === 1 || !canDelete) ? '' : (
            <DropdownItem onClick={this.onDeleteView}>
-              <Icon symbol={'delete'}/>
+              <i className="sf3-font sf3-font-delete1" />
              <span className="item-text">{gettext('Delete page')}</span>
            </DropdownItem>
          )}
          {folderId &&
            <DropdownItem onClick={this.onRemoveFromFolder}>
-              <Icon symbol={'remove-from-folder'}/>
+              <i className="sf3-font sf3-font-move" />
              <span className="item-text">{gettext('Remove from folder')}</span>
            </DropdownItem>
          }
@ -187,7 +186,7 @@ export default class PageDropdownMenu extends Component {
                toggle={this.onToggleFoldersMenu}
              >
                <div className="folders-dropdown-toggle" ref={ref => this.foldersDropdownToggle = ref}>
-                  <Icon symbol={'move-to'}/>
+                  <i className="sf3-font sf3-font-move" />
                  <span className="item-text">{gettext('Move to')}</span>
                  <span className="icon-dropdown-toggle">
                    <i className="sf3-font-down sf3-font rotate-270"></i>
--- 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 */
--- 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";
 }

--- a/media/css/sf_font3/iconfont.eot
+++ b/media/css/sf_font3/iconfont.eot
--- a/media/css/sf_font3/iconfont.js
+++ b/media/css/sf_font3/iconfont.js
--- a/media/css/sf_font3/iconfont.svg
+++ b/media/css/sf_font3/iconfont.svg
@ -14,7 +14,9 @@
    />
      <missing-glyph />
      
-      <glyph glyph-name="folder" unicode="&#59436;" d="M448 736H160c-16 0-32-12.8-32-38.4v-627.2c0-19.2 16-38.4 32-38.4h704c16 0 32 19.2 32 38.4V560c0 19.2-16 35.2-32 35.2h-304c-9.6 0-16 6.4-19.2 12.8L448 736z m144-41.6H896c54.4 0 96-41.6 96-96V32c0-54.4-41.6-96-96-96H128c-54.4 0-96 41.6-96 96V736c0 54.4 41.6 96 96 96h345.6c9.6 0 16-6.4 22.4-12.8l96-124.8z"  horiz-adv-x="1024" />
+      <glyph glyph-name="image" unicode="&#59437;" d="M896 640v-512c0-19.2-12.8-32-32-32H160c-19.2 0-32 12.8-32 32V640c0 19.2 12.8 32 32 32h704c19.2 0 32-12.8 32-32zM32 672v-576c0-54.4 41.6-96 96-96h768c54.4 0 96 41.6 96 96V672c0 54.4-41.6 96-96 96H128C73.6 768 32 726.4 32 672z m563.2-224c12.8 0 25.6-6.4 32-16L864 160H160l140.8 172.8c6.4 9.6 19.2 16 32 16s25.6-6.4 32-16l51.2-67.2 144 169.6c9.6 6.4 22.4 12.8 35.2 12.8zM300.8 620.8c32 0 60.8-16 76.8-44.8 16-28.8 16-60.8 0-89.6-16-28.8-44.8-44.8-76.8-44.8-51.2 0-89.6 41.6-89.6 89.6s41.6 89.6 89.6 89.6z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="folder" unicode="&#59436;" d="M448 672H160c-16 0-32-9.6-32-32v-512c0-16 16-32 32-32h704c16 0 32 16 32 32V528c0 16-16 28.8-32 28.8h-304c-9.6 0-16 6.4-19.2 9.6L448 672z m144-22.4H896c54.4 0 96-41.6 96-96V96c0-54.4-41.6-96-96-96H128c-54.4 0-96 41.6-96 96V672c0 54.4 41.6 96 96 96h345.6c9.6 0 16-6.4 22.4-9.6l96-108.8z"  horiz-adv-x="1024" />
      
      <glyph glyph-name="duplicate-page" unicode="&#59434;" d="M560 832c19.2 0 48-16 48-48S579.2 736 560 736h-384c-9.6 0-16-6.4-16-16v-672c0-9.6 6.4-16 16-16h672c9.6 0 16 6.4 16 16v384c0 16 6.4 48 48 48s48-32 48-48V0c0-35.2-28.8-64-64-64H128c-35.2 0-64 28.8-64 64V768c0 35.2 28.8 64 64 64h432z m348.8 25.6c9.6 9.6 28.8 9.6 38.4 0l38.4-38.4c9.6-9.6 9.6-28.8 0-38.4L428.8 224 320 192l32 108.8L908.8 857.6z"  horiz-adv-x="1024" />
      
@ -22,7 +24,7 @@
      
      <glyph glyph-name="open-in-new-tab" unicode="&#58912;" d="M102.4 48L784 729.6H339.2C310.4 729.6 288 755.2 288 780.8S310.4 832 339.2 832h544C924.8 832 960 800 960 755.2v-547.2c0-28.8-22.4-51.2-51.2-51.2-28.8 0-51.2 22.4-51.2 51.2V662.4L176-25.600000000000023c-19.2-22.4-54.4-22.4-73.6 0-22.4 19.2-22.4 54.4 0 73.6z"  horiz-adv-x="1024" />
      
-      <glyph glyph-name="sdoc-link" unicode="&#58911;" d="M614.4 489.6l35.2-35.2-67.2-67.2-35.2 35.2c-67.2 67.2-176 70.4-246.4 9.6l-6.4-6.4-147.2-147.2c-35.2-35.2-54.4-80-54.4-128s19.2-92.8 54.4-128l3.2-3.2c35.2-35.2 80-54.4 128-54.4s92.8 19.2 128 54.4l73.6 73.6 6.4 6.4 28.8 35.2 73.6-57.6-28.8-35.2-12.8-12.8-73.6-73.6c-51.2-51.2-121.6-80-192-80-73.6 0-144 28.8-195.2 80l-3.2 3.2C28.8 6.4 0 76.8 0 150.4s28.8 144 80 195.2l147.2 147.2c3.2 3.2 9.6 6.4 12.8 12.8 108.8 92.8 272 86.4 374.4-16zM745.6 896c73.6 0 144-28.8 195.2-80l3.2-3.2c51.2-51.2 80-121.6 80-195.2s-28.8-144-80-195.2L796.8 275.2c-3.2-3.2-9.6-6.4-12.8-12.8-51.2-44.8-115.2-67.2-182.4-67.2-73.6 0-140.8 28.8-192 80l-35.2 35.2 67.2 67.2 35.2-35.2c67.2-67.2 176-70.4 246.4-9.6l6.4 6.4 3.2 3.2L880 489.6c35.2 35.2 54.4 80 54.4 128s-19.2 92.8-54.4 128l-3.2 3.2c-35.2 35.2-80 54.4-128 54.4s-92.8-19.2-128-54.4l-73.6-73.6-6.4-6.4-28.8-35.2-73.6 57.6 28.8 35.2 12.8 12.8 73.6 73.6C604.8 867.2 675.2 896 745.6 896z"  horiz-adv-x="1024" />
+      <glyph glyph-name="link" unicode="&#58911;" d="M614.4 489.6l35.2-35.2-67.2-67.2-35.2 35.2c-67.2 67.2-176 70.4-246.4 9.6l-6.4-6.4-147.2-147.2c-35.2-35.2-54.4-80-54.4-128s19.2-92.8 54.4-128l3.2-3.2c35.2-35.2 80-54.4 128-54.4s92.8 19.2 128 54.4l73.6 73.6 6.4 6.4 28.8 35.2 73.6-57.6-28.8-35.2-12.8-12.8-73.6-73.6c-51.2-51.2-121.6-80-192-80-73.6 0-144 28.8-195.2 80l-3.2 3.2C28.8 6.399999999999977 0 76.79999999999995 0 150.39999999999998s28.8 144 80 195.2l147.2 147.2c3.2 3.2 9.6 6.4 12.8 12.8 108.8 92.8 272 86.4 374.4-16zM745.6 896c73.6 0 144-28.8 195.2-80l3.2-3.2c51.2-51.2 80-121.6 80-195.2s-28.8-144-80-195.2L796.8 275.20000000000005c-3.2-3.2-9.6-6.4-12.8-12.8-51.2-44.8-115.2-67.2-182.4-67.2-73.6 0-140.8 28.8-192 80l-35.2 35.2 67.2 67.2 35.2-35.2c67.2-67.2 176-70.4 246.4-9.6l6.4 6.4 3.2 3.2L880 489.6c35.2 35.2 54.4 80 54.4 128s-19.2 92.8-54.4 128l-3.2 3.2c-35.2 35.2-80 54.4-128 54.4s-92.8-19.2-128-54.4l-73.6-73.6-6.4-6.4-28.8-35.2-73.6 57.6 28.8 35.2 12.8 12.8 73.6 73.6C604.8 867.2 675.2 896 745.6 896z"  horiz-adv-x="1024" />
      
      <glyph glyph-name="files2" unicode="&#59432;" d="M768-96H256c-73.6 0-128 57.6-128 131.2V732.8C128 806.4 182.4 864 256 864h297.6c12.8 0 22.4-3.2 28.8-12.8l297.6-304c9.6-9.6 12.8-16 12.8-32v-480C896-38.4 841.6-96 768-96zM265.6 768C240 768 224 752 224 726.4v-681.6c0-28.8 16-44.8 41.6-44.8h492.8c25.6 0 41.6 16 41.6 41.6V496L537.6 768H265.6zM822.4 448h-297.6c-25.6 0-41.6 16-41.6 41.6V790.4c-3.2 25.6 12.8 41.6 38.4 41.6s41.6-16 41.6-41.6v-256h256c25.6 0 41.6-16 41.6-41.6s-12.8-44.8-38.4-44.8zM368 352h288c25.6 0 48-22.4 48-48s-22.4-48-48-48h-288c-25.6 0-48 22.4-48 48s22.4 48 48 48zM368 192h288c25.6 0 48-22.4 48-48s-22.4-48-48-48h-288c-25.6 0-48 22.4-48 48s22.4 48 48 48z"  horiz-adv-x="1024" />
      
--- a/media/css/sf_font3/iconfont.ttf
+++ b/media/css/sf_font3/iconfont.ttf
--- a/media/css/sf_font3/iconfont.woff
+++ b/media/css/sf_font3/iconfont.woff
--- a/media/css/sf_font3/iconfont.woff2
+++ b/media/css/sf_font3/iconfont.woff2