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
Prev Previous commit
Next Next commit
example file update for default icon setting
  • Loading branch information
@jinwoo-kim-nhn
jinwoo-kim-nhn committed Feb 27, 2020
commit d72a50cd5b216690f25c1b8e528bb17881042f6c
44 changes: 10 additions & 34 deletions examples/js/theme/black-theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,48 +25,24 @@ var blackTheme = {
'downloadButton.fontFamily': '\'Noto Sans\', sans-serif',
'downloadButton.fontSize': '12px',

// // main icons
// '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 icons
// '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',

// 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.activeIcon.name': 'icon-b',
'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
5 changes: 2 additions & 3 deletions examples/js/theme/white-theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ var whiteTheme = {
'menu.iconSize.height': '24px',

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

Expand Down
14 changes: 12 additions & 2 deletions src/js/ui/theme/standard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,26 @@
* @property {string} downloadButton.color - download button foreground color
* @property {string} downloadButton.fontFamily - download button font type
* @property {string} downloadButton.fontSize - download button font size
* @property {string} menu.normalIcon.path - Menu default icon svg bundle file path
* @property {string} menu.normalIcon.name - Menu default icon svg bundle name
* @property {string} menu.normalIcon.color - Menu normal color for default icon
* @property {string} menu.normalIcon.path - Menu normal icon svg bundle file path
* @property {string} menu.normalIcon.name - Menu normal icon svg bundle name
* @property {string} menu.activeIcon.color - Menu active color for default icon
* @property {string} menu.activeIcon.path - Menu active icon svg bundle file path
* @property {string} menu.activeIcon.name - Menu active icon svg bundle name
* @property {string} menu.disabled.color - Menu disabled color for default icon
* @property {string} menu.disabled.path - Menu disabled icon svg bundle file path
* @property {string} menu.disabled.name - Menu disabled icon svg bundle name
* @property {string} menu.hover.color - Menu default icon hover color
* @property {string} menu.hover.path - Menu hover icon svg bundle file path
* @property {string} menu.hover.name - Menu hover icon svg bundle name
* @property {string} menu.iconSize.width - Menu icon Size Width
* @property {string} menu.iconSize.height - Menu Icon Size Height
* @property {string} submenu.backgroundColor - Sub-menu area background color
* @property {string} submenu.partition.color - Submenu partition line color
* @property {string} submenu.normalIcon.color - Submenu normal color for default icon
* @property {string} submenu.normalIcon.path - Submenu default icon svg bundle file path
* @property {string} submenu.normalIcon.name - Submenu default icon svg bundle name
* @property {string} submenu.activeIcon.color - Submenu active color for default icon
* @property {string} submenu.activeIcon.path - Submenu active icon svg bundle file path
* @property {string} submenu.activeIcon.name - Submenu active icon svg bundle name
* @property {string} submenu.iconSize.width - Submenu icon Size Width
Expand Down