1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-14 02:06:29 +00:00

Merge pull request #462 from BoostIO/Design-update

Design update
This commit is contained in:
Kazu Yokomizo
2017-04-21 18:21:16 +09:00
committed by GitHub
12 changed files with 134 additions and 86 deletions

View File

@@ -17,18 +17,22 @@ $control-height = 30px
.item-title .item-title
.item-title-icon .item-title-icon
.item-bottom-time .item-bottom-time
.item-bottom-tagList-item
transition 0.15s transition 0.15s
color $ui-text-color color $ui-text-color
.item-bottom-tagList-item
background-color alpha(white, 0.6)
color $ui-text-color
&:active &:active
background-color $ui-button--active-backgroundColor background-color $ui-button--active-backgroundColor
color $ui-text-color color $ui-text-color
.item-title .item-title
.item-title-icon .item-title-icon
.item-bottom-time .item-bottom-time
.item-bottom-tagList-item
transition 0.15s transition 0.15s
color $ui-text-color color $ui-text-color
.item-bottom-tagList-item
background-color alpha(white, 0.6)
color $ui-text-color
.item-wrapper .item-wrapper
padding 15px 0 padding 15px 0
@@ -45,7 +49,7 @@ $control-height = 30px
.item-title-icon .item-title-icon
color $ui-text-color color $ui-text-color
.item-bottom-tagList-item .item-bottom-tagList-item
background-color transparent background-color alpha(white, 0.6)
color $ui-text-color color $ui-text-color
.item-wrapper .item-wrapper
border-color transparent border-color transparent
@@ -93,9 +97,10 @@ $control-height = 30px
padding 0 padding 0
height 20px height 20px
box-sizing border-box box-sizing border-box
border-radius 20px border-radius 2px
padding 1px 2px
vertical-align middle vertical-align middle
background-color transparent background-color white
color $ui-inactive-text-color color $ui-inactive-text-color
.item-bottom-time .item-bottom-time
@@ -123,23 +128,31 @@ body[data-theme="dark"]
.item .item
border-color $ui-dark-borderColor border-color $ui-dark-borderColor
background-color $ui-dark-noteList-backgroundColor background-color $ui-dark-noteList-backgroundColor
&:active
background-color $ui-dark-button--active-backgroundColor
.item-title
.item-title-icon
.item-bottom-time
.item-bottom-tagList-item
transition 0.15s
color $ui-dark-text-color
&:hover &:hover
transition 0.15s
background-color alpha($ui-dark-button--active-backgroundColor, 20%) background-color alpha($ui-dark-button--active-backgroundColor, 20%)
.item-title .item-title
.item-title-icon .item-title-icon
.item-bottom-time .item-bottom-time
.item-bottom-tagList-item
transition 0.15s transition 0.15s
color $ui-dark-text-color color $ui-dark-text-color
.item-bottom-tagList-item
transition 0.15s
background-color alpha($ui-dark-button--active-backgroundColor, 40%)
color $ui-dark-text-color
&:active
transition 0.15s
background-color $ui-dark-button--active-backgroundColor
.item-title
.item-title-icon
.item-bottom-time
transition 0.15s
color $ui-dark-text-color
.item-bottom-tagList-item
transition 0.15s
background-color alpha(white, 10%)
color $ui-dark-text-color
.item-wrapper .item-wrapper
border-color $ui-dark-borderColor border-color $ui-dark-borderColor
@@ -153,7 +166,7 @@ body[data-theme="dark"]
.item-bottom-time .item-bottom-time
color $ui-dark-text-color color $ui-dark-text-color
.item-bottom-tagList-item .item-bottom-tagList-item
background-color transparent background-color alpha(white, 10%)
color $ui-dark-text-color color $ui-dark-text-color
.item-title .item-title
@@ -166,7 +179,7 @@ body[data-theme="dark"]
color $ui-inactive-text-color color $ui-inactive-text-color
.item-bottom-tagList-item .item-bottom-tagList-item
background-color transparent background-color alpha($ui-dark-button--active-backgroundColor, 40%)
color $ui-inactive-text-color color $ui-inactive-text-color
.item-bottom-tagList-empty .item-bottom-tagList-empty

View File

@@ -24,7 +24,7 @@ const SideNavFilter = ({
<i className='fa fa-archive fa-fw' /> <i className='fa fa-archive fa-fw' />
<span styleName='menu-button-label'>All Notes</span> <span styleName='menu-button-label'>All Notes</span>
</button> </button>
<button styleName={isStarredActive ? 'menu-button--active' : 'menu-button'} <button styleName={isStarredActive ? 'menu-button-star--active' : 'menu-button'}
onClick={handleStarredButtonClick} onClick={handleStarredButtonClick}
> >
<i className='fa fa-star fa-fw' /> <i className='fa fa-star fa-fw' />

View File

@@ -12,11 +12,27 @@
.menu-button--active .menu-button--active
@extend .menu-button @extend .menu-button
color $ui-text-color color #e74c3c
background-color $ui-button--active-backgroundColor background-color $ui-button--active-backgroundColor
.menu-button-label
color $ui-text-color
&:hover &:hover
background-color $ui-button--active-backgroundColor background-color $ui-button--active-backgroundColor
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 color $ui-text-color
&:hover
background-color $ui-button--active-backgroundColor
color #F9BF3B
.menu-button-label
color $ui-text-color
.menu-button-label .menu-button-label
margin-left 5px margin-left 5px
@@ -55,9 +71,25 @@ body[data-theme="dark"]
&:hover &:hover
background-color alpha($ui-dark-button--active-backgroundColor, 20%) background-color alpha($ui-dark-button--active-backgroundColor, 20%)
color $ui-dark-text-color color $ui-dark-text-color
.menu-button--active .menu-button--active
color $ui-dark-text-color color #c0392b
background-color $ui-dark-button--active-backgroundColor background-color $ui-dark-button--active-backgroundColor
&:active .menu-button-label
color $ui-dark-text-color
&:hover
background-color $ui-dark-button--active-backgroundColor background-color $ui-dark-button--active-backgroundColor
color $ui-dark-text-color color #c0392b
.menu-button-label
color $ui-dark-text-color
.menu-button-star--active
color $ui-favorite-star-button-color
background-color $ui-dark-button--active-backgroundColor
.menu-button-label
color $ui-dark-text-color
&:hover
background-color $ui-dark-button--active-backgroundColor
color $ui-favorite-star-button-color
.menu-button-label
color $ui-dark-text-color

View File

@@ -1,8 +1,5 @@
.root .root
absolute top bottom right absolute top bottom right
border-width 1px 0
border-style solid
border-color $ui-borderColor
.empty .empty
height 320px height 320px
@@ -18,7 +15,6 @@
body[data-theme="dark"] body[data-theme="dark"]
.root .root
border-color $ui-dark-borderColor
background-color $ui-dark-backgroundColor background-color $ui-dark-backgroundColor
.empty-message .empty-message
color $ui-dark-inactive-text-color color $ui-dark-inactive-text-color

View File

@@ -2,20 +2,27 @@
left 7px left 7px
top 0 top 0
padding 0 padding 0
color alpha($ui-favorite-star-button-color, 60%)
&:hover &:hover
background-color #DCDCDC transition 0.15s
.icon background-color alpha($ui-button--active-backgroundColor, 40%)
transform rotate(-72deg) color $ui-favorite-star-button-color
.tooltip &:active
opacity 1 transition 0.15s
background-color alpha($ui-button--active-backgroundColor, 40%)
color $ui-favorite-star-button-color
.root--active .root--active
@extend .root @extend .root
color $ui-favorite-star-button-color color $ui-favorite-star-button-color
&:hover &:hover
transition 0.15s
color $ui-favorite-star-button-color color $ui-favorite-star-button-color
.icon background-color alpha($ui-button--active-backgroundColor, 40%)
transform rotate(-72deg) &:active
transition 0.15s
color $ui-favorite-star-button-color
background-color alpha($ui-button--active-backgroundColor, 40%)
.icon .icon
transition transform 0.15s transition transform 0.15s
@@ -23,4 +30,18 @@
body[data-theme="dark"] body[data-theme="dark"]
.root .root
&:hover &:hover
background-color #272B32 transition 0.15s
background-color alpha($ui-dark-button--active-backgroundColor, 20%)
color $ui-favorite-star-button-color
&:active
transition 0.15s
background-color alpha($ui-dark-button--active-backgroundColor, 20%)
color $ui-favorite-star-button-color
.root--active
@extend .root
color $ui-favorite-star-button-color
&:hover
transition 0.15s
color $ui-favorite-star-button-color
background-color alpha($ui-dark-button--active-backgroundColor, 20%)

View File

@@ -12,12 +12,12 @@
.tag .tag
display inline-block display inline-block
margin 0 2px margin 1px 3px
padding-left 10px padding 0
vertical-align middle vertical-align middle
height 20px height 20px
background-color alpha($ui-tag-backgroundColor, 10%) background-color alpha($ui-tag-backgroundColor, 10%)
border-radius 20px border-radius 3px
overflow hidden overflow hidden
clearfix() clearfix()
@@ -54,34 +54,11 @@
height 24px height 24px
box-sizing borde-box box-sizing borde-box
border none border none
border-bottom $ui-border
background-color transparent background-color transparent
outline none outline none
padding 0 4px padding 0 4px
&:focus
border-color $ui-input--focus-borderColor = #369DCD
&:disabled
background-color $ui-input--disabled-backgroundColor = #DDD
.add-tag-button
display inline
margin-left 5px
width 20px
height 20px
border none
border-radius 20px
padding 0
color #FFFFFF
&:hover
background-color rgba(0, 0, 0, 0.3)
&:active, &:active:hover
background-color rgba(0, 0, 0, 0.5)
color $ui-button--active-color
body[data-theme="dark"] body[data-theme="dark"]
.icon
color $ui-dark-button-color
.tag .tag
background-color alpha($ui-dark-tag-backgroundColor, 60%) background-color alpha($ui-dark-tag-backgroundColor, 60%)
@@ -94,17 +71,6 @@ body[data-theme="dark"]
color $ui-dark-text-color color $ui-dark-text-color
.newTag .newTag
border-color $ui-dark-borderColor border-color none
background-color transparent background-color transparent
color $ui-dark-text-color color $ui-dark-text-color
&:focus
border-color $ui-input--focus-borderColor = #369DCD
&:disabled
background-color $ui-input--disabled-backgroundColor = #DDD
.add-tag-button
&:hover
background-color rgba(255, 255, 255, 0.3)
&:active, &:active:hover
background-color rgba(255, 255, 255, 0.5)
color $ui-button--active-color

View File

@@ -20,8 +20,8 @@ $control-height = 30px
padding-left 25px padding-left 25px
.control-sortBy-select .control-sortBy-select
margin-left 0 appearance: none;
font-size 12px margin-left 3px
color $ui-inactive-text-color color $ui-inactive-text-color
padding 0 padding 0
border none border none
@@ -29,6 +29,9 @@ $control-height = 30px
outline none outline none
cursor pointer cursor pointer
font-size 10px font-size 10px
&:hover
transition 0.2s
color $ui-text-color
.control-button .control-button
width 25px width 25px
@@ -58,13 +61,15 @@ body[data-theme="dark"]
border-color $ui-dark-borderColor border-color $ui-dark-borderColor
background-color $ui-dark-noteList-backgroundColor background-color $ui-dark-noteList-backgroundColor
.control
background-color $ui-dark-noteList-backgroundColor
.control .control
background-color $ui-dark-noteList-backgroundColor background-color $ui-dark-noteList-backgroundColor
border-color $ui-dark-borderColor border-color $ui-dark-borderColor
.control-sortBy-select
&:hover
transition 0.2s
color $ui-dark-text-color
.control-button .control-button
color $ui-dark-inactive-text-color color $ui-dark-inactive-text-color
&:hover &:hover

View File

@@ -404,7 +404,7 @@ class NoteList extends React.Component {
> >
<div styleName='control'> <div styleName='control'>
<div styleName='control-sortBy'> <div styleName='control-sortBy'>
Sort by <i className='fa fa-bolt' />
<select styleName='control-sortBy-select' <select styleName='control-sortBy-select'
value={config.sortBy} value={config.sortBy}
onChange={(e) => this.handleSortByChange(e)} onChange={(e) => this.handleSortByChange(e)}

View File

@@ -122,3 +122,9 @@ body[data-theme="dark"]
.storageList-empty .storageList-empty
color $ui-dark-inactive-text-color color $ui-dark-inactive-text-color
.navToggle
&:hover
background-color alpha($ui-dark-button--active-backgroundColor, 20%)
transition 0.15s
color $ui-dark-text-color

View File

@@ -5,7 +5,6 @@
height $statusBar-height height $statusBar-height
background-color $ui-noteDetail-backgroundColor background-color $ui-noteDetail-backgroundColor
display flex display flex
box-shadow $note-detail-box-shadow
.blank .blank
flex 1 flex 1
@@ -44,6 +43,10 @@ body[data-theme="dark"]
.zoom .zoom
border-color $ui-dark-borderColor border-color $ui-dark-borderColor
&:hover
background-color alpha($ui-dark-button--active-backgroundColor, 20%)
transition 0.15s
color $ui-dark-text-color
.help .help
navButtonColor() navButtonColor()

View File

@@ -145,7 +145,7 @@ body[data-theme="dark"]
.control-search-optionList-item .control-search-optionList-item
border-color $ui-dark-borderColor border-color $ui-dark-borderColor
&:hover &:hover
background-color lighten($ui-dark-button--hover-backgroundColor, 15%) background-color alpha($ui-dark-button--active-backgroundColor, 20%)
.control-search-optionList-item-folder .control-search-optionList-item-folder
color $ui-dark-text-color color $ui-dark-text-color
.control-search-optionList-item-folder-surfix .control-search-optionList-item-folder-surfix
@@ -160,10 +160,14 @@ body[data-theme="dark"]
color $ui-inactive-text-color color $ui-inactive-text-color
.control-newPostButton .control-newPostButton
colorDarkDefaultButton() color $ui-inactive-text-color
border-color $ui-dark-borderColor border-color $ui-dark-borderColor
background-color $ui-dark-noteList-backgroundColor background-color $ui-dark-noteList-backgroundColor
&:hover
transition 0.15s
color $ui-dark-text-color
&:active &:active
background-color alpha($ui-dark-button--active-backgroundColor, 20%)
border-color $ui-dark-button--active-backgroundColor border-color $ui-dark-button--active-backgroundColor
.control-newPostButton-tooltip .control-newPostButton-tooltip

View File

@@ -127,15 +127,15 @@ navButtonColor()
border none border none
color $ui-button-color color $ui-button-color
background-color transparent background-color transparent
transition color background-color 0.15s transition 0.15s
&:hover &:hover
background-color alpha($ui-button--active-backgroundColor, 20%) background-color alpha($ui-button--active-backgroundColor, 20%)
transition color background-color 0.15s transition 0.15s
color $ui-text-color color $ui-text-color
&:active, &:active:hover &:active, &:active:hover
background-color $ui-button--active-backgroundColor background-color $ui-button--active-backgroundColor
color $ui-text-color color $ui-text-color
transition color background-color 0.15s transition 0.15s
/** /**
* # Modal Stuff * # Modal Stuff
* These will be moved lib/modal * These will be moved lib/modal
@@ -217,12 +217,14 @@ navDarkButtonColor()
border none border none
color $ui-dark-button-color color $ui-dark-button-color
background-color transparent background-color transparent
transition color background-color 0.15s transition 0.15s
&:hover &:hover
color $ui-dark-text-color color $ui-dark-text-color
background-color $ui-dark-button--hover-backgroundColor background-color $ui-dark-button--hover-backgroundColor
transition 0.15s
&:active &:active
&:active:hover &:active:hover
transition 0.15s
color $ui-dark-text-color color $ui-dark-text-color
topBarButtonDark() topBarButtonDark()