From 57a88743bcca6fce44d2b68487eac051ff7b2577 Mon Sep 17 00:00:00 2001 From: Yutaka Ishii Date: Thu, 7 Dec 2017 12:18:07 +0900 Subject: [PATCH] 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 @@ - +