From 57a88743bcca6fce44d2b68487eac051ff7b2577 Mon Sep 17 00:00:00 2001 From: Yutaka Ishii Date: Thu, 7 Dec 2017 12:18:07 +0900 Subject: [PATCH 1/9] icon style update. Delete Zoom --- browser/main/Detail/InfoButton.styl | 1 - browser/main/Detail/MarkdownNoteDetail.js | 5 ----- browser/main/Detail/MarkdownNoteDetail.styl | 3 +-- browser/main/Detail/TrashButton.styl | 3 +-- browser/styles/index.styl | 2 +- resources/icon/icon-info-24.svg | 19 ------------------- resources/icon/icon-info.svg | 8 ++++---- resources/icon/icon-sidebar-24.svg | 18 ------------------ resources/icon/icon-sidebar.svg | 2 +- resources/icon/icon-star-24.svg | 18 ------------------ resources/icon/icon-star.svg | 20 +++++++------------- resources/icon/icon-starred-24.svg | 18 ------------------ resources/icon/icon-trash-24.svg | 18 ------------------ resources/icon/icon-trash.svg | 8 ++++---- resources/icon/icon-unlock.svg | 2 +- 15 files changed, 20 insertions(+), 125 deletions(-) delete mode 100644 resources/icon/icon-info-24.svg delete mode 100644 resources/icon/icon-sidebar-24.svg delete mode 100644 resources/icon/icon-star-24.svg delete mode 100644 resources/icon/icon-starred-24.svg delete mode 100644 resources/icon/icon-trash-24.svg diff --git a/browser/main/Detail/InfoButton.styl b/browser/main/Detail/InfoButton.styl index 67618fb3..2de4c0f4 100644 --- a/browser/main/Detail/InfoButton.styl +++ b/browser/main/Detail/InfoButton.styl @@ -1,6 +1,5 @@ .control-infoButton top 10px - margin-bottom 10px topBarButtonLight() .infoButton diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index f4c805c1..d9af3004 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -390,11 +390,6 @@ class MarkdownNoteDetail extends React.Component { ignorePreviewPointerEvents={this.props.ignorePreviewPointerEvents} /> - - ) } diff --git a/browser/main/Detail/MarkdownNoteDetail.styl b/browser/main/Detail/MarkdownNoteDetail.styl index 597447eb..4c001031 100644 --- a/browser/main/Detail/MarkdownNoteDetail.styl +++ b/browser/main/Detail/MarkdownNoteDetail.styl @@ -12,8 +12,7 @@ padding-bottom 3px .control-lockButton - top 160px - margin-bottom 10px + top 150px topBarButtonLight() .trashed-infopanel diff --git a/browser/main/Detail/TrashButton.styl b/browser/main/Detail/TrashButton.styl index b1edbb5f..4410395f 100644 --- a/browser/main/Detail/TrashButton.styl +++ b/browser/main/Detail/TrashButton.styl @@ -1,6 +1,5 @@ .control-trashButton - top 120px - margin-bottom 10px + top 115px topBarButtonLight() .control-trashButton--in-trash diff --git a/browser/styles/index.styl b/browser/styles/index.styl index d2c32b88..f252a002 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -181,7 +181,7 @@ topBarButtonLight() border-radius 17px font-size 14px border none - color alpha($ui-button-color, 0.4) + color alpha($ui-button-color, 0.2) fill $ui-button-color background-color transparent &:active diff --git a/resources/icon/icon-info-24.svg b/resources/icon/icon-info-24.svg deleted file mode 100644 index 28b2afb5..00000000 --- a/resources/icon/icon-info-24.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - icon-info-24 - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/icon/icon-info.svg b/resources/icon/icon-info.svg index b7ac5bb1..bd808f8c 100644 --- a/resources/icon/icon-info.svg +++ b/resources/icon/icon-info.svg @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/resources/icon/icon-sidebar-24.svg b/resources/icon/icon-sidebar-24.svg deleted file mode 100644 index efdc3ebb..00000000 --- a/resources/icon/icon-sidebar-24.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - icon-sidebar-24 - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/icon/icon-sidebar.svg b/resources/icon/icon-sidebar.svg index 26f2be2a..619c4ea3 100644 --- a/resources/icon/icon-sidebar.svg +++ b/resources/icon/icon-sidebar.svg @@ -8,7 +8,7 @@ - + diff --git a/resources/icon/icon-star-24.svg b/resources/icon/icon-star-24.svg deleted file mode 100644 index 40b9bf45..00000000 --- a/resources/icon/icon-star-24.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - icon-star-24 - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/icon/icon-star.svg b/resources/icon/icon-star.svg index c9a6d84b..3318a7e7 100644 --- a/resources/icon/icon-star.svg +++ b/resources/icon/icon-star.svg @@ -1,21 +1,15 @@ - + - icon-star + icon-star-24 Created with Sketch. - - - - - - - - - - - + + + + + diff --git a/resources/icon/icon-starred-24.svg b/resources/icon/icon-starred-24.svg deleted file mode 100644 index 3e44a3e2..00000000 --- a/resources/icon/icon-starred-24.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - icon-starred-24 - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/icon/icon-trash-24.svg b/resources/icon/icon-trash-24.svg deleted file mode 100644 index a72ff7da..00000000 --- a/resources/icon/icon-trash-24.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - icon-trash-24 - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/icon/icon-trash.svg b/resources/icon/icon-trash.svg index 431972bd..64dedb87 100644 --- a/resources/icon/icon-trash.svg +++ b/resources/icon/icon-trash.svg @@ -5,10 +5,10 @@ Created with Sketch. - - - - + + + + diff --git a/resources/icon/icon-unlock.svg b/resources/icon/icon-unlock.svg index 75503cfb..0e20453f 100644 --- a/resources/icon/icon-unlock.svg +++ b/resources/icon/icon-unlock.svg @@ -8,7 +8,7 @@ - + From 6f359fa6a87e648bcbd5a43c127cb51e47715cd8 Mon Sep 17 00:00:00 2001 From: Yutaka Ishii Date: Thu, 7 Dec 2017 15:14:10 +0900 Subject: [PATCH 2/9] color setting --- browser/components/TodoListPercentage.styl | 4 ++-- browser/main/Detail/MarkdownNoteDetail.styl | 2 +- browser/main/NoteList/NoteList.styl | 2 +- browser/main/SideNav/SideNav.styl | 4 ++-- browser/styles/index.styl | 10 ++++++---- resources/icon/icon-info.svg | 8 ++++---- resources/icon/icon-sidebar.svg | 2 +- resources/icon/icon-star.svg | 14 ++++++++------ 8 files changed, 25 insertions(+), 21 deletions(-) diff --git a/browser/components/TodoListPercentage.styl b/browser/components/TodoListPercentage.styl index 66fc62ee..a5141130 100644 --- a/browser/components/TodoListPercentage.styl +++ b/browser/components/TodoListPercentage.styl @@ -23,10 +23,10 @@ body[data-theme="dark"] .percentageBar - background-color #363A3D + background-color #444444 .progressBar - background-color: alpha(#939395, 50%) + background-color: #1EC38B .percentageText color $ui-dark-text-color \ No newline at end of file diff --git a/browser/main/Detail/MarkdownNoteDetail.styl b/browser/main/Detail/MarkdownNoteDetail.styl index 4c001031..33168bb6 100644 --- a/browser/main/Detail/MarkdownNoteDetail.styl +++ b/browser/main/Detail/MarkdownNoteDetail.styl @@ -42,7 +42,7 @@ body[data-theme="dark"] .root background-color $ui-dark-noteDetail-backgroundColor box-shadow none - border none + border-left 1px solid $ui-dark-borderColor .control-lockButton topBarButtonDark() diff --git a/browser/main/NoteList/NoteList.styl b/browser/main/NoteList/NoteList.styl index 8332eefb..37bcea41 100644 --- a/browser/main/NoteList/NoteList.styl +++ b/browser/main/NoteList/NoteList.styl @@ -3,7 +3,7 @@ $control-height = 30px .root absolute left bottom top $topBar-height - 1 - background-color $ui-noteList-backgroundColor + background-color $ui-dark-backgroundColor .control absolute top left right diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl index d42076da..196f68ab 100644 --- a/browser/main/SideNav/SideNav.styl +++ b/browser/main/SideNav/SideNav.styl @@ -1,7 +1,7 @@ .root absolute top left bottom width $sideNav-width - background-color #2E3235 + background-color $ui-dark-backgroundColor user-select none color $ui-text-color height: 100vh @@ -138,7 +138,7 @@ body[data-theme="white"] body[data-theme="dark"] .root, .root--folded - border-color $ui-dark-borderColor + border-right 1px solid $ui-dark-borderColor background-color $ui-dark-backgroundColor color $ui-dark-text-color diff --git a/browser/styles/index.styl b/browser/styles/index.styl index f252a002..4787e975 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -223,10 +223,12 @@ $ui-button--focus-borderColor = lighten(#369DCD, 25%) /******* Dark theme ********/ $ui-dark-active-color = #3A404C -$ui-dark-borderColor = lighten(#21252B, 20%) -$ui-dark-backgroundColor = #1E2124 -$ui-dark-noteList-backgroundColor = #282C30 -$ui-dark-noteDetail-backgroundColor = #2D3033 + +$ui-dark-borderColor = #282828 +$ui-dark-backgroundColor = #151915 +$ui-dark-noteList-backgroundColor = #151915 +$ui-dark-noteDetail-backgroundColor = #151915 + $ui-dark-tag-backgroundColor = #3A404C $dark-background-color = lighten($ui-dark-backgroundColor, 10%) $ui-dark-text-color = #DDDDDD diff --git a/resources/icon/icon-info.svg b/resources/icon/icon-info.svg index bd808f8c..253b8cab 100644 --- a/resources/icon/icon-info.svg +++ b/resources/icon/icon-info.svg @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/resources/icon/icon-sidebar.svg b/resources/icon/icon-sidebar.svg index 619c4ea3..da4a0926 100644 --- a/resources/icon/icon-sidebar.svg +++ b/resources/icon/icon-sidebar.svg @@ -8,7 +8,7 @@ - + diff --git a/resources/icon/icon-star.svg b/resources/icon/icon-star.svg index 3318a7e7..cda4af25 100644 --- a/resources/icon/icon-star.svg +++ b/resources/icon/icon-star.svg @@ -1,15 +1,17 @@ - icon-star-24 + icon-star Created with Sketch. - - - - - + + + + + + + From 728f1058304fbc3af8ff7e822da9dad1b8d0db90 Mon Sep 17 00:00:00 2001 From: Yutaka Ishii Date: Mon, 11 Dec 2017 14:51:23 +0900 Subject: [PATCH 3/9] dark theme update --- browser/components/TodoListPercentage.styl | 1 + browser/main/NoteList/NoteList.styl | 2 +- browser/main/SideNav/SideNav.styl | 2 +- browser/styles/index.styl | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/browser/components/TodoListPercentage.styl b/browser/components/TodoListPercentage.styl index a5141130..aec99d0e 100644 --- a/browser/components/TodoListPercentage.styl +++ b/browser/components/TodoListPercentage.styl @@ -9,6 +9,7 @@ font-size: 12px z-index 100 border-radius 2px + padding-left 10px .progressBar background-color: #1EC38B diff --git a/browser/main/NoteList/NoteList.styl b/browser/main/NoteList/NoteList.styl index 37bcea41..8332eefb 100644 --- a/browser/main/NoteList/NoteList.styl +++ b/browser/main/NoteList/NoteList.styl @@ -3,7 +3,7 @@ $control-height = 30px .root absolute left bottom top $topBar-height - 1 - background-color $ui-dark-backgroundColor + background-color $ui-noteList-backgroundColor .control absolute top left right diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl index 196f68ab..1405254f 100644 --- a/browser/main/SideNav/SideNav.styl +++ b/browser/main/SideNav/SideNav.styl @@ -1,7 +1,7 @@ .root absolute top left bottom width $sideNav-width - background-color $ui-dark-backgroundColor + background-color #2E3235 user-select none color $ui-text-color height: 100vh diff --git a/browser/styles/index.styl b/browser/styles/index.styl index 4787e975..35663120 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -224,10 +224,10 @@ $ui-button--focus-borderColor = lighten(#369DCD, 25%) /******* Dark theme ********/ $ui-dark-active-color = #3A404C -$ui-dark-borderColor = #282828 -$ui-dark-backgroundColor = #151915 -$ui-dark-noteList-backgroundColor = #151915 -$ui-dark-noteDetail-backgroundColor = #151915 +$ui-dark-borderColor = #444444 +$ui-dark-backgroundColor = #333333 +$ui-dark-noteList-backgroundColor = #333333 +$ui-dark-noteDetail-backgroundColor = #333333 $ui-dark-tag-backgroundColor = #3A404C $dark-background-color = lighten($ui-dark-backgroundColor, 10%) From 9e8d04d806d3e60a3796d77a984b36aa4e5336d3 Mon Sep 17 00:00:00 2001 From: Yutaka Ishii Date: Mon, 11 Dec 2017 21:52:08 +0900 Subject: [PATCH 4/9] =?UTF-8?q?progressBar=20padding=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- browser/components/TodoListPercentage.js | 4 +++- browser/components/TodoListPercentage.styl | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/browser/components/TodoListPercentage.js b/browser/components/TodoListPercentage.js index f152130c..3be63ca5 100644 --- a/browser/components/TodoListPercentage.js +++ b/browser/components/TodoListPercentage.js @@ -16,7 +16,9 @@ const TodoListPercentage = ({ }) => (
-

{percentageOfTodo}%

+
+

{percentageOfTodo}%

+
) diff --git a/browser/components/TodoListPercentage.styl b/browser/components/TodoListPercentage.styl index aec99d0e..7f44fd08 100644 --- a/browser/components/TodoListPercentage.styl +++ b/browser/components/TodoListPercentage.styl @@ -9,7 +9,6 @@ font-size: 12px z-index 100 border-radius 2px - padding-left 10px .progressBar background-color: #1EC38B @@ -17,9 +16,18 @@ border-radius 2px transition 0.4s cubic-bezier(0.4, 0.4, 0, 1) +.progressBarInner + padding 0 10px + min-width 1px + height 100% + display -webkit-box + display box + justify-content center + align-items center + + .percentageText color #f4f4f4 - padding: 2px 43% font-weight 600 body[data-theme="dark"] From 4983605b2384f1b26fd5ff681115cefdad9cd7f5 Mon Sep 17 00:00:00 2001 From: Yutaka Ishii Date: Mon, 11 Dec 2017 22:03:29 +0900 Subject: [PATCH 5/9] fixed sideNav icons --- browser/components/SideNavFilter.js | 4 ++-- resources/icon/icon-star-sidenav.svg | 20 ++++++++++++++++++++ resources/icon/icon-star.svg | 18 +++++++++--------- resources/icon/icon-trash-sidenav.svg | 16 ++++++++++++++++ 4 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 resources/icon/icon-star-sidenav.svg create mode 100644 resources/icon/icon-trash-sidenav.svg diff --git a/browser/components/SideNavFilter.js b/browser/components/SideNavFilter.js index a3fc1ff9..dba26f92 100644 --- a/browser/components/SideNavFilter.js +++ b/browser/components/SideNavFilter.js @@ -41,7 +41,7 @@ const SideNavFilter = ({
@@ -55,7 +55,7 @@ const SideNavFilter = ({
diff --git a/resources/icon/icon-star-sidenav.svg b/resources/icon/icon-star-sidenav.svg new file mode 100644 index 00000000..932f4d66 --- /dev/null +++ b/resources/icon/icon-star-sidenav.svg @@ -0,0 +1,20 @@ + + + + icon-star-sidenav + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/icon/icon-star.svg b/resources/icon/icon-star.svg index cda4af25..da4abb3d 100644 --- a/resources/icon/icon-star.svg +++ b/resources/icon/icon-star.svg @@ -1,16 +1,16 @@ - - + + icon-star Created with Sketch. - - - - - - - + + + + + + + diff --git a/resources/icon/icon-trash-sidenav.svg b/resources/icon/icon-trash-sidenav.svg new file mode 100644 index 00000000..ba87033b --- /dev/null +++ b/resources/icon/icon-trash-sidenav.svg @@ -0,0 +1,16 @@ + + + + icon-trash-sidenav + Created with Sketch. + + + + + + + + + + + \ No newline at end of file From 685206950b17c1cafcec8178ab2d3005316105c7 Mon Sep 17 00:00:00 2001 From: Yutaka Ishii Date: Tue, 12 Dec 2017 10:22:31 +0900 Subject: [PATCH 6/9] restore StatusBar --- browser/main/Detail/MarkdownNoteDetail.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index d9af3004..24e040a0 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -390,6 +390,11 @@ class MarkdownNoteDetail extends React.Component { ignorePreviewPointerEvents={this.props.ignorePreviewPointerEvents} /> + + ) } From 1a4c37820d55ed8dade47bc26013a94bdafd461b Mon Sep 17 00:00:00 2001 From: Yutaka Ishii Date: Tue, 12 Dec 2017 10:26:55 +0900 Subject: [PATCH 7/9] little bit darker color for new dark theme --- browser/styles/index.styl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/styles/index.styl b/browser/styles/index.styl index 35663120..de8c0e7f 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -225,9 +225,9 @@ $ui-button--focus-borderColor = lighten(#369DCD, 25%) $ui-dark-active-color = #3A404C $ui-dark-borderColor = #444444 -$ui-dark-backgroundColor = #333333 -$ui-dark-noteList-backgroundColor = #333333 -$ui-dark-noteDetail-backgroundColor = #333333 +$ui-dark-backgroundColor = #2C3033 +$ui-dark-noteList-backgroundColor = #2C3033 +$ui-dark-noteDetail-backgroundColor = #2C3033 $ui-dark-tag-backgroundColor = #3A404C $dark-background-color = lighten($ui-dark-backgroundColor, 10%) From ac624eb98ff308dd673ed30e30a429be286beaad Mon Sep 17 00:00:00 2001 From: Yutaka Ishii Date: Tue, 12 Dec 2017 17:01:33 +0900 Subject: [PATCH 8/9] Change Edit Lock Icon --- browser/main/Detail/InfoButton.styl | 2 +- browser/main/Detail/MarkdownNoteDetail.js | 2 +- browser/main/Detail/MarkdownNoteDetail.styl | 4 ++-- browser/main/Detail/SnippetNoteDetail.styl | 2 +- browser/main/Detail/StarButton.styl | 2 +- browser/main/Detail/TrashButton.styl | 4 ++-- browser/styles/index.styl | 4 ++-- resources/icon/icon-edit-lock.svg | 13 +++++++++++++ resources/icon/icon-edit.svg | 13 +++++++++++++ 9 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 resources/icon/icon-edit-lock.svg create mode 100644 resources/icon/icon-edit.svg diff --git a/browser/main/Detail/InfoButton.styl b/browser/main/Detail/InfoButton.styl index 2de4c0f4..9a2604df 100644 --- a/browser/main/Detail/InfoButton.styl +++ b/browser/main/Detail/InfoButton.styl @@ -1,6 +1,6 @@ .control-infoButton top 10px - topBarButtonLight() + topBarButtonRight() .infoButton padding 0px diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 24e040a0..6621c4df 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -233,7 +233,7 @@ class MarkdownNoteDetail extends React.Component { } getToggleLockButton () { - return this.state.isLocked ? '../resources/icon/icon-lock.svg' : '../resources/icon/icon-unlock.svg' + return this.state.isLocked ? '../resources/icon/icon-edit-lock.svg' : '../resources/icon/icon-edit.svg' } handleDeleteKeyDown (e) { diff --git a/browser/main/Detail/MarkdownNoteDetail.styl b/browser/main/Detail/MarkdownNoteDetail.styl index 33168bb6..8385d3a6 100644 --- a/browser/main/Detail/MarkdownNoteDetail.styl +++ b/browser/main/Detail/MarkdownNoteDetail.styl @@ -13,7 +13,7 @@ .control-lockButton top 150px - topBarButtonLight() + topBarButtonRight() .trashed-infopanel top 40px @@ -21,7 +21,7 @@ .control-fullScreenButton top 80px - topBarButtonLight() + topBarButtonRight() .body absolute left right diff --git a/browser/main/Detail/SnippetNoteDetail.styl b/browser/main/Detail/SnippetNoteDetail.styl index e661d07c..8e9d4deb 100644 --- a/browser/main/Detail/SnippetNoteDetail.styl +++ b/browser/main/Detail/SnippetNoteDetail.styl @@ -69,7 +69,7 @@ .control-fullScreenButton top 80px margin-bottom 10px - topBarButtonLight() + topBarButtonRight() body[data-theme="white"] .root diff --git a/browser/main/Detail/StarButton.styl b/browser/main/Detail/StarButton.styl index b1880a8e..1e5bf239 100644 --- a/browser/main/Detail/StarButton.styl +++ b/browser/main/Detail/StarButton.styl @@ -1,6 +1,6 @@ .root top 45px - topBarButtonLight() + topBarButtonRight() &:hover transition 0.2s color alpha($ui-favorite-star-button-color, 0.6) diff --git a/browser/main/Detail/TrashButton.styl b/browser/main/Detail/TrashButton.styl index 4410395f..0acd60a5 100644 --- a/browser/main/Detail/TrashButton.styl +++ b/browser/main/Detail/TrashButton.styl @@ -1,10 +1,10 @@ .control-trashButton top 115px - topBarButtonLight() + topBarButtonRight() .control-trashButton--in-trash top 60px - topBarButtonLight() + topBarButtonRight() .trashButton padding 0px diff --git a/browser/styles/index.styl b/browser/styles/index.styl index de8c0e7f..949ca143 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -174,7 +174,7 @@ modal() overflow hidden border-radius $modal-border-radius -topBarButtonLight() +topBarButtonRight() position absolute width 34px height 34px @@ -187,7 +187,7 @@ topBarButtonLight() &:active border-color $ui-button--active-backgroundColor &:hover - transform scale(1.1) + // transform scale(1.1) transition 0.4s color $ui-button-color .control-lockButton-tooltip diff --git a/resources/icon/icon-edit-lock.svg b/resources/icon/icon-edit-lock.svg new file mode 100644 index 00000000..12ede4cc --- /dev/null +++ b/resources/icon/icon-edit-lock.svg @@ -0,0 +1,13 @@ + + + + icon-edit-lock + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/resources/icon/icon-edit.svg b/resources/icon/icon-edit.svg new file mode 100644 index 00000000..3707c6fe --- /dev/null +++ b/resources/icon/icon-edit.svg @@ -0,0 +1,13 @@ + + + + icon-edit + Created with Sketch. + + + + + + + + \ No newline at end of file From ab9ab004b7aa00bf4af98e7b5df298884851653c Mon Sep 17 00:00:00 2001 From: Yutaka Ishii Date: Tue, 12 Dec 2017 17:02:09 +0900 Subject: [PATCH 9/9] delete non-use icon --- resources/icon/info.svg | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 resources/icon/info.svg diff --git a/resources/icon/info.svg b/resources/icon/info.svg deleted file mode 100644 index d724468b..00000000 --- a/resources/icon/info.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - info - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file