Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: document for svg icon setting #348

Merged
merged 11 commits into from
Mar 6, 2020
Merged

chore: document for svg icon setting #348

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9c05710
feat: default menu svg icon - middle commit
jinwoo-kim-nhn Feb 25, 2020
de73075
feat: default icon normal Check basic operation
jinwoo-kim-nhn Feb 26, 2020
f6db01d
feat: prototype complete for default icon improve
jinwoo-kim-nhn Feb 26, 2020
e1ea371
feat: complate default icon code
jinwoo-kim-nhn Feb 27, 2020
d72a50c
example file update for default icon setting
jinwoo-kim-nhn Feb 27, 2020
c5f8e42
chore: svg-loader dependency -> devdependency
jinwoo-kim-nhn Feb 27, 2020
c3bfeda
chore: document for svg icon setting
jinwoo-kim-nhn Feb 27, 2020
0b0e628
fixed some link at document
jinwoo-kim-nhn Feb 27, 2020
c5e2cd7
apply codereview
jinwoo-kim-nhn Mar 4, 2020
94115ed
Merge branch 'master' into chore/documentForSvgIconSetting
jinwoo-kim-nhn Mar 6, 2020
7c8ffba
apply codereview - 2
jinwoo-kim-nhn Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat: default menu svg icon - middle commit
  • Loading branch information
@jinwoo-kim-nhn
jinwoo-kim-nhn committed Feb 25, 2020
commit 9c057107d4c47e700d8b8acd704cfe41d4773dd8
26 changes: 10 additions & 16 deletions examples/js/theme/black-theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,23 @@ var blackTheme = {
'downloadButton.fontSize': '12px',

// main icons
'menu.normalIcon.path': '../dist/svg/icon-d.svg',
'menu.normalIcon.name': 'icon-d',
'menu.activeIcon.path': '../dist/svg/icon-b.svg',
'menu.activeIcon.name': 'icon-b',
'menu.disabledIcon.path': '../dist/svg/icon-a.svg',
'menu.disabledIcon.name': 'icon-a',
'menu.hoverIcon.path': '../dist/svg/icon-c.svg',
'menu.hoverIcon.name': 'icon-c',
'menu.normalIcon.color': '#8a8a8a',
'menu.activeIcon.color': '#555555',
'menu.disabledIcon.color': '#434343',
'menu.hoverIcon.color': '#e9e9e9',
'menu.iconSize.width': '24px',
'menu.iconSize.height': '24px',

// submenu primary color
'submenu.backgroundColor': '#1e1e1e',
'submenu.partition.color': '#3c3c3c',

// submenu icons
'submenu.normalIcon.path': '../dist/svg/icon-d.svg',
'submenu.normalIcon.name': 'icon-d',
'submenu.activeIcon.path': '../dist/svg/icon-c.svg',
'submenu.activeIcon.name': 'icon-c',
'submenu.normalIcon.color': '#8a8a8a',
'submenu.activeIcon.color': '#e9e9e9',
'submenu.iconSize.width': '32px',
'submenu.iconSize.height': '32px',

// submenu primary color
'submenu.backgroundColor': '#1e1e1e',
'submenu.partition.color': '#3c3c3c',

// submenu labels
'submenu.normalLabel.color': '#8a8a8a',
'submenu.normalLabel.fontWeight': 'lighter',
Expand Down
25 changes: 10 additions & 15 deletions examples/js/theme/white-theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,24 @@ var whiteTheme = {
'downloadButton.fontSize': '12px',

// main icons
'menu.normalIcon.path': '../dist/svg/icon-d.svg',
'menu.normalIcon.name': 'icon-d',
'menu.activeIcon.path': '../dist/svg/icon-b.svg',
'menu.activeIcon.name': 'icon-b',
'menu.disabledIcon.path': '../dist/svg/icon-a.svg',
'menu.disabledIcon.name': 'icon-a',
'menu.hoverIcon.path': '../dist/svg/icon-c.svg',
'menu.hoverIcon.name': 'icon-c',
'menu.normalIcon.color': '#8a8a8a',
'menu.activeIcon.color': '#555555',
'menu.disabledIcon.color': '#434343',
'menu.hoverIcon.color': '#e9e9e9',
'menu.iconSize.width': '24px',
'menu.iconSize.height': '24px',

// submenu primary color
'submenu.backgroundColor': 'transparent',
'submenu.partition.color': '#e5e5e5',

// submenu icons
'submenu.normalIcon.path': '../dist/svg/icon-d.svg',
'submenu.normalIcon.name': 'icon-d',
'submenu.activeIcon.path': '../dist/svg/icon-b.svg',
'submenu.normalIcon.color': '../dist/svg/icon-d.svg',
'submenu.activeIcon.color': '../dist/svg/icon-b.svg',
'submenu.activeIcon.name': 'icon-b',
'submenu.iconSize.width': '32px',
'submenu.iconSize.height': '32px',

// submenu primary color
'submenu.backgroundColor': 'transparent',
'submenu.partition.color': '#e5e5e5',

// submenu labels
'submenu.normalLabel.color': '#858585',
'submenu.normalLabel.fontWeight': 'normal',
Expand Down
26 changes: 18 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"dependencies": {
"core-js": "2.4.1",
"fabric": "3.6.0",
"svg-inline-loader": "^0.8.2",
"tui-code-snippet": "^1.5.0",
"tui-color-picker": "^2.2.0"
}
Expand Down
1 change: 1 addition & 0 deletions src/css/icon.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.tie-icon-add-button .{prefix}-button
min-width: 42px;
.svg_ic-menu
.svg_ic-helpmenu
width: 24px;
height: 24px;
.svg_ic-submenu
Expand Down
6 changes: 3 additions & 3 deletions src/js/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,9 @@ class Ui {
const {normal, active, hover} = this.theme.getStyle('menu.icon');
const menuItemHtml = `
<svg class="svg_ic-menu">
<use xlink:href="${normal.path}#${normal.name}-ic-${menuName}" class="normal"/>
<use xlink:href="${active.path}#${active.name}-ic-${menuName}" class="active"/>
<use xlink:href="${hover.path}#${hover.name}-ic-${menuName}" class="hover"/>
<use xlink:href="#ic-${menuName}" class="normal normal-color"/>
<use xlink:href="#ic-${menuName}" class="active active-color"/>
<use xlink:href="#ic-${menuName}" class="hover hover-color"/>
</svg>
`;

Expand Down
12 changes: 6 additions & 6 deletions src/js/ui/template/controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ export default ({locale, biImage, iconStyle: {normal, hover, disabled}, loadButt
<ul class="tui-image-editor-menu">
<li class="tie-btn-undo tui-image-editor-item">
<svg class="svg_ic-menu">
<use xlink:href="${normal.path}#${normal.name}-ic-undo" class="enabled"/>
<use xlink:href="${disabled.path}#${disabled.name}-ic-undo" class="normal"/>
<use xlink:href="${hover.path}#${hover.name}-ic-undo" class="hover"/>
<use xlink:href="#ic-undo" class="enabled normal-color"/>
<use xlink:href="#ic-undo" class="normal disabled-color"/>
<use xlink:href="#ic-undo" class="hover hover-color"/>
</svg>
</li>
<li class="tie-btn-redo tui-image-editor-item">
<svg class="svg_ic-menu">
<use xlink:href="${normal.path}#${normal.name}-ic-redo" class="enabled"/>
<use xlink:href="${disabled.path}#${disabled.name}-ic-redo" class="normal"/>
<use xlink:href="${hover.path}#${hover.name}-ic-redo" class="hover"/>
<use xlink:href="#ic-redo" class="enabled normal-color"/>
<use xlink:href="#ic-redo" class="normal disabled-color"/>
<use xlink:href="#ic-redo" class="hover hover-color"/>
</svg>
</li>
<li class="tie-btn-reset tui-image-editor-item">
Expand Down
Loading