Skip to content

Fix side nav style #999

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

Merged
merged 8 commits into from
Oct 21, 2017
Merged

Fix side nav style #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0d52417
disable switch-buttons, when NavToggle
sosukesuzuki Oct 21, 2017
57b0547
fix position of preference button
sosukesuzuki Oct 21, 2017
fe51c23
fix typo
sosukesuzuki Oct 21, 2017
2aeb539
enable tooltip-label of Preference
sosukesuzuki Oct 21, 2017
c91fd67
fix preference button style
sosukesuzuki Oct 21, 2017
4194b61
text-align of button-lebels in SideNavFilder are center
sosukesuzuki Oct 21, 2017
4af71fd
fix Folded-SideNav size
sosukesuzuki Oct 21, 2017
cae7baa
change from premitive value to variable
sosukesuzuki Oct 21, 2017
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
2 changes: 1 addition & 1 deletion browser/components/SideNavFilter.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,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
color $ui-dark-text-color
38 changes: 37 additions & 1 deletion browser/main/SideNav/SideNav.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
navButtonColor()
position absolute
top 22px
right 5px
left 200px
height 23px
&:hover
color $ui-text-color
&:active, &:active:hover
Expand Down Expand Up @@ -49,6 +50,7 @@
.top-menu-label
margin-left 5px
overflow ellipsis
opacity 0

.tabBody
flex 1
Expand All @@ -65,6 +67,40 @@
overflow-y auto
flex: 1

.root--folded
height 100vh
width $sideNav--folded-width
.switch-buttons
display none
.top
height 60px
.top-menu
position static
width $sideNav--folded-width
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 $sideNav--folded-width
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
border-color $ui-dark-borderColor
Expand Down
1 change: 1 addition & 0 deletions browser/main/SideNav/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ class SideNav extends React.Component {
onClick={(e) => this.handleMenuButtonClick(e)}
>
<i className='fa fa-wrench fa-fw' />
<span styleName='top-menu-label'>Preferences</span>
</button>
</div>
</div>
Expand Down