1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00

update tag and folder

This commit is contained in:
Yutaka Ishii
2017-11-23 19:25:29 +09:00
parent 3a836aaf34
commit 9cb086cbd9
10 changed files with 70 additions and 58 deletions

View File

@@ -1,5 +1,8 @@
.root .root
absolute top bottom right absolute top bottom right
display flex
align-items center
justify-content center
.empty .empty
height 320px height 320px
@@ -8,8 +11,9 @@
.empty-message .empty-message
width 100% width 100%
font-size 42px font-size 36px
line-height 72px font-weight 600
line-height 56px
text-align center text-align center
color $ui-inactive-text-color color $ui-inactive-text-color

View File

@@ -3,7 +3,7 @@
*/ */
// Margin on the left side and the right side for NoteDetail component. // Margin on the left side and the right side for NoteDetail component.
$note-detail-left-margin = 50px $note-detail-left-margin = 100px
$note-detail-right-margin = 70px $note-detail-right-margin = 120px
$note-detail-box-shadow = 2px 0 15px -8px #b1b1b1 inset $note-detail-box-shadow = 2px 0 15px -8px #b1b1b1 inset

View File

@@ -259,12 +259,11 @@ class FolderSelect extends React.Component {
{optionList} {optionList}
</div> </div>
</div> </div>
: <div styleName='idle'> : <div styleName='idle' style={{color: currentOption.folder.color}}>
<div styleName='idle-label'> <div styleName='idle-label'>
<span styleName='idle-label-name' <i className='fa fa-folder'></i>
style={{color: currentOption.folder.color}} <span styleName='idle-label-name'>
> {currentOption.folder.name}
{currentOption.folder.name} /
</span> </span>
</div> </div>
</div> </div>

View File

@@ -1,11 +1,11 @@
.root .root
position relative position relative
border solid 1px transparent border solid 1px transparent
line-height 26px
vertical-align middle vertical-align middle
border-radius 2px border-radius 2px
transition 0.15s transition 0.15s
user-select none user-select none
margin-right 10px
&:hover &:hover
background-color $ui-button--hover-backgroundColor background-color $ui-button--hover-backgroundColor
@@ -24,10 +24,13 @@
.idle-label .idle-label
right 20px right 20px
overflow ellipsis overflow ellipsis
display flex
align-items center
.idle-label-name .idle-label-name
font-size 14px font-size 13px
padding 2px font-weight 600
margin-left 4px
.idle-label-name-surfix .idle-label-name-surfix
font-size 10px font-size 10px

View File

@@ -6,6 +6,7 @@
border-left 1px solid alpha(#DEDEDE, 60%) border-left 1px solid alpha(#DEDEDE, 60%)
background-color $ui-noteDetail-backgroundColor background-color $ui-noteDetail-backgroundColor
box-shadow none box-shadow none
padding 20px 40px
.lock-button .lock-button
padding-bottom 3px padding-bottom 3px
@@ -25,10 +26,12 @@
.body .body
absolute left right absolute left right
left $note-detail-left-margin left 0
right $note-detail-right-margin right 0
top $info-height + $info-margin-under-border top $info-height + $info-margin-under-border
bottom $statusBar-height bottom $statusBar-height
max-width 600px
margin 0 auto
.body-noteEditor .body-noteEditor
absolute top bottom left right absolute top bottom left right

View File

@@ -1,35 +1,30 @@
@import('DetailVars') @import('DetailVars')
$info-height = 40px $info-height = 50px
$info-margin-under-border = 15px $info-margin-under-border = 30px
.info .info
absolute top left right absolute top left right
left $note-detail-left-margin left 0
right $note-detail-right-margin right 0
height $info-height height $info-height
border-bottom $ui-border border-bottom 1px solid #eee
background-color $ui-noteDetail-backgroundColor background-color $ui-noteDetail-backgroundColor
.info-left
float left
padding 0 7px
width 100% width 100%
display flex display flex
align-items center
.info-left
padding 0 10px
width 100%
display flex
align-items center
.info-left-top
display inline-block
height $info-height
line-height $info-height
.info-left-top-folderSelect .info-left-top-folderSelect
padding 0 3px
height 40px
line-height 40px
display flex display flex
align-items center align-items center
justify-content center justify-content center
border-radius 3px
.info-left-button .info-left-button
width 34px width 34px
@@ -51,9 +46,8 @@ $info-margin-under-border = 15px
.info-right .info-right
position absolute position absolute
right -20px right 40px
top 10px top 60px
background $ui-noteDetail-backgroundColor
bottom 1px bottom 1px
padding-left 30px padding-left 30px

View File

@@ -113,7 +113,7 @@ class TagSelect extends React.Component {
<button styleName='tag-removeButton' <button styleName='tag-removeButton'
onClick={(e) => this.handleTagRemoveButtonClick(tag)(e)} onClick={(e) => this.handleTagRemoveButtonClick(tag)(e)}
> >
<i className='fa fa-times fa-fw tag-removeButton-icon' /> <img className='tag-removeButton-icon' src='../resources/icon/icon-x.svg' width='8px'/>
</button> </button>
</span> </span>
) )

View File

@@ -1,8 +1,7 @@
.root .root
display inline-block display flex
align-items center
user-select none user-select none
line-height 50px
height 50px
vertical-align middle vertical-align middle
width 100% width 100%
overflow-x scroll overflow-x scroll
@@ -12,49 +11,42 @@
display none display none
.tag .tag
display inline-block display flex
align-items center
margin 0px 2px margin 0px 2px
background-color alpha($ui-tag-backgroundColor, 10%) padding 2px 4px
border-radius 3px background-color alpha($ui-tag-backgroundColor, 3%)
overflow hidden border-radius 4px
position relative
clearfix() clearfix()
.tag-removeButton .tag-removeButton
float right
height 20px
width 18px
margin 0 margin 0
padding 0 padding 0
border-style solid border-style solid
border-width 0 border-width 0
border-radius 20px border-radius 20px
line-height 18px
background-color transparent background-color transparent
color $ui-button-color color $ui-button-color
position absolute
right 6px
.tag-removeButton-icon .tag-removeButton-icon
width 5px width 5px
padding-right 4px padding-right 4px
.tag-label .tag-label
font-size 11px font-size 13px
font-weight 600 color: $ui-text-color
color: alpha($ui-text-color, 80%) padding 4px 16px 4px 8px
float left
height 20px
line-height 20px
padding 0 6px
.newTag .newTag
display inline-block
margin 2px 0 15px 2px
vertical-align middle
height 18px
box-sizing border-box box-sizing border-box
border none border none
background-color transparent background-color transparent
outline none outline none
padding 0 4px padding 0 4px
font-size 13px
body[data-theme="dark"] body[data-theme="dark"]
.tag .tag

View File

@@ -16,7 +16,7 @@ $ui-inactive-text-color = #939395
$ui-borderColor = #D1D1D1 $ui-borderColor = #D1D1D1
$ui-backgroundColor = #FFFFFF $ui-backgroundColor = #FFFFFF
$ui-noteList-backgroundColor = #FBFBFB $ui-noteList-backgroundColor = #FBFBFB
$ui-noteDetail-backgroundColor = #F8F8F8 $ui-noteDetail-backgroundColor = #FFFFFF
$ui-border = solid 1px $ui-borderColor $ui-border = solid 1px $ui-borderColor
$ui-active-color = #6AA5E9 $ui-active-color = #6AA5E9
$ui-tag-backgroundColor = rgba(0, 0, 0, 0.3) $ui-tag-backgroundColor = rgba(0, 0, 0, 0.3)

17
resources/icon/icon-x.svg Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
<title>x</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="Feather" transform="translate(-1910.000000, -644.000000)" stroke="#666666" stroke-width="2">
<g id="Group" transform="translate(175.000000, 332.000000)">
<g id="x" transform="translate(1736.000000, 313.000000)">
<path d="M12,0 L0,12" id="Shape"></path>
<path d="M0,0 L12,12" id="Shape"></path>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 917 B