From 0d52417ee7df601f85774a4f41b7f513ccff1c91 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 21 Oct 2017 13:06:04 +0900 Subject: [PATCH 1/8] disable switch-buttons, when NavToggle --- browser/main/SideNav/SideNav.styl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl index f3de5803..735598ed 100644 --- a/browser/main/SideNav/SideNav.styl +++ b/browser/main/SideNav/SideNav.styl @@ -65,6 +65,10 @@ overflow-y auto flex: 1 +.root--folded + .swith-buttons + display none + body[data-theme="dark"] .root, .root--folded border-color $ui-dark-borderColor From 57b054794c5c16f5b80b64060c959577207dc7ee Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 21 Oct 2017 13:25:28 +0900 Subject: [PATCH 2/8] fix position of preference button --- browser/main/SideNav/SideNav.styl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl index 735598ed..ad14b715 100644 --- a/browser/main/SideNav/SideNav.styl +++ b/browser/main/SideNav/SideNav.styl @@ -68,6 +68,13 @@ .root--folded .swith-buttons display none + .top + height 60px + .top-menu + position static + width 43px + height 60px + text-align center body[data-theme="dark"] .root, .root--folded From fe51c232b6cc2e2d1171ac2ce28fcd0f3348db9c Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 21 Oct 2017 13:27:45 +0900 Subject: [PATCH 3/8] fix typo --- browser/main/SideNav/SideNav.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl index ad14b715..73df7be3 100644 --- a/browser/main/SideNav/SideNav.styl +++ b/browser/main/SideNav/SideNav.styl @@ -66,7 +66,7 @@ flex: 1 .root--folded - .swith-buttons + .switch-buttons display none .top height 60px From 2aeb53920c813f61fee93f7cfe6efdec7d45832d Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 21 Oct 2017 13:37:10 +0900 Subject: [PATCH 4/8] enable tooltip-label of Preference --- browser/main/SideNav/SideNav.styl | 21 +++++++++++++++++++++ browser/main/SideNav/index.js | 1 + 2 files changed, 22 insertions(+) diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl index 73df7be3..8b6d6290 100644 --- a/browser/main/SideNav/SideNav.styl +++ b/browser/main/SideNav/SideNav.styl @@ -75,6 +75,27 @@ width 43px height 60px text-align center + &:hover .top-menu-label + transition opacity 0.15s + opacity 1 + .top-menu-label + position fixed + display inline-block + height 30px + left 43px + padding 0 10px + margin-top -8px + opacity 0 + margin-left 0 + overflow hidden + background-color $ui-tooltip-backgroundColor + z-index 10 + color white + line-height 30px + border-top-right-radius 2px + border-bottom-right-radius 2px + pointer-events none + font-size 12px body[data-theme="dark"] .root, .root--folded diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js index 9fe198ad..d93eb87e 100644 --- a/browser/main/SideNav/index.js +++ b/browser/main/SideNav/index.js @@ -150,6 +150,7 @@ class SideNav extends React.Component { onClick={(e) => this.handleMenuButtonClick(e)} > + Preferences From c91fd6783d0a13d4968396aa5a902cbe849abdd4 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 21 Oct 2017 13:56:21 +0900 Subject: [PATCH 5/8] fix preference button style --- browser/main/SideNav/SideNav.styl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl index 8b6d6290..95fe79bc 100644 --- a/browser/main/SideNav/SideNav.styl +++ b/browser/main/SideNav/SideNav.styl @@ -15,7 +15,8 @@ navButtonColor() position absolute top 22px - right 5px + left 200px + height 23px &:hover color $ui-text-color &:active, &:active:hover @@ -49,6 +50,7 @@ .top-menu-label margin-left 5px overflow ellipsis + opacity 0 .tabBody flex 1 From 4194b6137349a9b23a249af168fff26daefcf7ed Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 21 Oct 2017 14:11:35 +0900 Subject: [PATCH 6/8] text-align of button-lebels in SideNavFilder are center --- browser/components/SideNavFilter.styl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/browser/components/SideNavFilter.styl b/browser/components/SideNavFilter.styl index bad5661b..4dfeae3c 100644 --- a/browser/components/SideNavFilter.styl +++ b/browser/components/SideNavFilter.styl @@ -50,7 +50,6 @@ .menu--folded @extend .menu .menu-button, .menu-button--active - text-align center &:hover .menu-button-label transition opacity 0.15s opacity 1 @@ -102,4 +101,4 @@ body[data-theme="dark"] background-color alpha($ui-dark-button--active-backgroundColor, 50%) color $ui-favorite-star-button-color .menu-button-label - color $ui-dark-text-color \ No newline at end of file + color $ui-dark-text-color From 4af71fd1dd69f5f86b1a108b81bf8d6cda1a56b6 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 21 Oct 2017 14:29:29 +0900 Subject: [PATCH 7/8] fix Folded-SideNav size --- browser/components/SideNavFilter.styl | 1 + browser/main/SideNav/SideNav.styl | 2 ++ 2 files changed, 3 insertions(+) diff --git a/browser/components/SideNavFilter.styl b/browser/components/SideNavFilter.styl index 4dfeae3c..b7fd7dc6 100644 --- a/browser/components/SideNavFilter.styl +++ b/browser/components/SideNavFilter.styl @@ -50,6 +50,7 @@ .menu--folded @extend .menu .menu-button, .menu-button--active + text-align center &:hover .menu-button-label transition opacity 0.15s opacity 1 diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl index 95fe79bc..36de3f7d 100644 --- a/browser/main/SideNav/SideNav.styl +++ b/browser/main/SideNav/SideNav.styl @@ -68,6 +68,8 @@ flex: 1 .root--folded + height 100vh + width $sideNav--folded-width .switch-buttons display none .top From cae7baa5e1887e22abbd340b2330098d0d7cf9b3 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 21 Oct 2017 14:45:26 +0900 Subject: [PATCH 8/8] change from premitive value to variable --- browser/main/SideNav/SideNav.styl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl index 36de3f7d..58669287 100644 --- a/browser/main/SideNav/SideNav.styl +++ b/browser/main/SideNav/SideNav.styl @@ -76,7 +76,7 @@ height 60px .top-menu position static - width 43px + width $sideNav--folded-width height 60px text-align center &:hover .top-menu-label @@ -86,7 +86,7 @@ position fixed display inline-block height 30px - left 43px + left $sideNav--folded-width padding 0 10px margin-top -8px opacity 0