Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions browser/components/NavToggleButton.styl
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
line-height 32px
padding 0

body[data-theme="white"]
navWhiteButtonColor()

body[data-theme="dark"]
.navToggle
&:hover
Expand Down
24 changes: 18 additions & 6 deletions browser/components/NoteItem.styl
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ $control-height = 30px
user-select none
cursor pointer
background-color $ui-noteList-backgroundColor
transition background-color 0.2s
transition 0.2s
&:hover
background-color alpha($ui-button--active-backgroundColor, 40%)
background-color alpha($ui-button--active-backgroundColor, 20%)
.item-title
.item-title-icon
.item-bottom-time
Expand All @@ -25,7 +25,7 @@ $control-height = 30px
.item-star
color $ui-favorite-star-button-color
&:active
background-color $ui-button--active-backgroundColor
background-color alpha($ui-button--active-backgroundColor, 40%)
color $ui-text-color
.item-title
.item-title-icon
Expand All @@ -43,7 +43,7 @@ $control-height = 30px

.item--active
@extend .item
background-color $ui-button--active-backgroundColor
background-color alpha($ui-button--active-backgroundColor, 60%)
color $ui-text-color
.item-title
.item-title-empty
Expand All @@ -59,12 +59,12 @@ $control-height = 30px
.item-star
color $ui-favorite-star-button-color
&:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
background-color alpha($ui-button--active-backgroundColor, 40%)
color #e74c3c
.menu-button-label
color $ui-text-color
&:active, &:active:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
background-color alpha($ui-button--active-backgroundColor, 40%)
color #e74c3c
.menu-button-label
color $ui-text-color
Expand Down Expand Up @@ -145,6 +145,18 @@ $control-height = 30px
padding 0
border-radius 17px

body[data-theme="white"]
.item
background-color $ui-white-noteList-backgroundColor
&:hover
background-color alpha($ui-button--active-backgroundColor, 40%)
&:active
background-color $ui-button--active-backgroundColor

.item--active
@extend .item
background-color $ui-button--active-backgroundColor

body[data-theme="dark"]
.root
border-color $ui-dark-borderColor
Expand Down
24 changes: 18 additions & 6 deletions browser/components/NoteItemSimple.styl
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ $control-height = 30px
user-select none
cursor pointer
background-color $ui-noteList-backgroundColor
transition background-color 0.15s
transition 0.2s
&:hover
background-color alpha($ui-button--active-backgroundColor, 40%)
background-color alpha($ui-button--active-backgroundColor, 20%)
.item-simple-title
.item-simple-title-empty
.item-simple-title-icon
color $ui-text-color
&:active
background-color $ui-button--active-backgroundColor
background-color alpha($ui-button--active-backgroundColor, 40%)
color $ui-text-color
.item-simple-title
.item-simple-title-empty
Expand All @@ -28,7 +28,7 @@ $control-height = 30px

.item-simple--active
@extend .item-simple
background-color $ui-button--active-backgroundColor
background-color alpha($ui-button--active-backgroundColor, 60%)
color $ui-text-color
.item-simple-title
.item-simple-title-empty
Expand All @@ -37,12 +37,12 @@ $control-height = 30px
.item-simple-title-icon
color $ui-text-color
&:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
background-color alpha($ui-button--active-backgroundColor, 40%)
color #e74c3c
.menu-button-label
color $ui-text-color
&:active, &:active:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
background-color alpha($ui-button--active-backgroundColor, 40%)
color #e74c3c
.menu-button-label
color $ui-text-color
Expand All @@ -67,6 +67,18 @@ $control-height = 30px
font-weight normal
color $ui-inactive-text-color

body[data-theme="white"]
.item-simple
background-color $ui-white-noteList-backgroundColor
&:hover
background-color alpha($ui-button--active-backgroundColor, 40%)
&:active
background-color $ui-button--active-backgroundColor

.item-simple--active
@extend .item-simple
background-color $ui-button--active-backgroundColor

body[data-theme="dark"]
.root
border-color $ui-dark-borderColor
Expand Down
109 changes: 70 additions & 39 deletions browser/components/SideNavFilter.styl
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@
width 100%
text-align left
overflow ellipsis
&:hover
color $ui-button-default-color
background-color alpha($ui-button-default--active-backgroundColor, 20%)
transition background-color 0.15s
&:active, &:active:hover
color $ui-button-default-color
background-color $ui-button-default--active-backgroundColor

.counters
float right
Expand All @@ -17,53 +24,17 @@
.menu-button--active
@extend .menu-button
color #e74c3c
background-color $ui-button--active-backgroundColor
.menu-button-label
color $ui-text-color
&:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
color #e74c3c
.menu-button-label
color $ui-text-color
&:active, &:active:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
color #e74c3c
.menu-button-label
color $ui-text-color
SideNavFilter()

.menu-button-star--active
@extend .menu-button
color #F9BF3B
background-color $ui-button--active-backgroundColor
.menu-button-label
color $ui-text-color
&:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
color #F9BF3B
.menu-button-label
color $ui-text-color
&:active, &:active:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
color #F9BF3B
.menu-button-label
color $ui-text-color
SideNavFilter()

.menu-button-trash--active
@extend .menu-button
color #5D9E36
background-color $ui-button--active-backgroundColor
.menu-button-label
color $ui-text-color
&:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
color #5D9E36
.menu-button-label
color $ui-text-color
&:active, &:active:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
color #5D9E36
.menu-button-label
color $ui-text-color
SideNavFilter()

.menu-button-label
margin-left 5px
Expand Down Expand Up @@ -93,6 +64,66 @@
pointer-events none
opacity 0
font-size 13px
.counters
display none

body[data-theme="white"]
.menu-button
navWhiteButtonColor()

.counters
color $ui-inactive-text-color

.menu-button--active
@extend .menu-button
color #e74c3c
background-color $ui-button--active-backgroundColor
.menu-button-label
color $ui-text-color
&:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
color #e74c3c
.menu-button-label
color $ui-text-color
&:active, &:active:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
color #e74c3c
.menu-button-label
color $ui-text-color

.menu-button-star--active
@extend .menu-button
color #F9BF3B
background-color $ui-button--active-backgroundColor
.menu-button-label
color $ui-text-color
&:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
color #F9BF3B
.menu-button-label
color $ui-text-color
&:active, &:active:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
color #F9BF3B
.menu-button-label
color $ui-text-color

.menu-button-trash--active
@extend .menu-button
color #5D9E36
background-color $ui-button--active-backgroundColor
.menu-button-label
color $ui-text-color
&:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
color #5D9E36
.menu-button-label
color $ui-text-color
&:active, &:active:hover
background-color alpha($ui-button--active-backgroundColor, 50%)
color #5D9E36
.menu-button-label
color $ui-text-color

body[data-theme="dark"]
.menu-button
Expand Down
38 changes: 29 additions & 9 deletions browser/components/StorageItem.styl
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
&:first-child
margin-top 0
&:hover
color $ui-text-color
background-color alpha($ui-button--active-backgroundColor, 20%)
color $ui-button-default-color
background-color alpha($ui-button-default--active-backgroundColor, 20%)
transition background-color 0.15s
&:active
color $ui-text-color
background-color $ui-button--active-backgroundColor
color $$ui-button-default-color
background-color $ui-button-default--active-backgroundColor

.folderList-item--active
@extend .folderList-item
color $ui-text-color
background-color $ui-button--active-backgroundColor
color $ui-button-default-color
background-color $ui-button-default--active-backgroundColor
&:hover
color $ui-text-color
background-color alpha($ui-button--active-backgroundColor, 50%)
color $ui-button-default-color
background-color alpha($ui-button-default--active-backgroundColor, 50%)

.folderList-item-name
display block
Expand Down Expand Up @@ -69,8 +69,28 @@

.folderList-item-name--folded
@extend .folderList-item-name
padding-left 12px
padding-left 17px
text
display none

body[data-theme="white"]
.folderList-item
color $ui-inactive-text-color
&:hover
color $ui-text-color
background-color alpha($ui-button--active-backgroundColor, 20%)
transition background-color 0.15s
&:active
color $ui-text-color
background-color $ui-button--active-backgroundColor

.folderList-item--active
@extend .folderList-item
color $ui-text-color
background-color $ui-button--active-backgroundColor
&:hover
color $ui-text-color
background-color alpha($ui-button--active-backgroundColor, 50%)

body[data-theme="dark"]
.folderList-item
Expand Down
2 changes: 1 addition & 1 deletion browser/components/StorageList.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @fileoverview Micro component for showing StorageList
*/
import React, { PropTypes } from 'react'
import styles from './StorgaeList.styl'
import styles from './StorageList.styl'
import CSSModules from 'browser/lib/CSSModules'

/**
Expand Down
31 changes: 24 additions & 7 deletions browser/components/TagListItem.styl
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
&:first-child
margin-top 0
&:hover
color $ui-text-color
background-color alpha($ui-button--active-backgroundColor, 20%)
color $ui-button-default-color
background-color alpha($ui-button-default--active-backgroundColor, 20%)
transition background-color 0.15s
&:active
color $ui-text-color
background-color $ui-button--active-backgroundColor
&:active, &:active:hover
color $ui-button-default-color
background-color $ui-button-default--active-backgroundColor

.tagList-item-active
background-color $ui-button--active-backgroundColor
background-color $ui-button-default--active-backgroundColor
display flex
width 100%
height 26px
Expand All @@ -31,8 +31,9 @@
border none
overflow ellipsis
font-size 13px
color $ui-button-default-color
&:hover
background-color alpha($ui-button--active-backgroundColor, 60%)
background-color alpha($ui-button-default--active-backgroundColor, 60%)
transition 0.2s

.tagList-item-name
Expand All @@ -47,6 +48,22 @@
overflow hidden
text-overflow ellipsis

body[data-theme="white"]
.tagList-item
color $ui-inactive-text-color
&:hover
color $ui-text-color
background-color alpha($ui-button--active-backgroundColor, 20%)
&:active
color $ui-text-color
background-color $ui-button--active-backgroundColor

.tagList-item-active
background-color $ui-button--active-backgroundColor
color $ui-text-color
&:hover
background-color alpha($ui-button--active-backgroundColor, 60%)

body[data-theme="dark"]
.tagList-item
color $ui-dark-inactive-text-color
Expand Down
Loading