public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2026-01-30 00:57:17 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into windows

Browse Source 
Conflicts:
	browser/main/HomePage.js
	browser/main/HomePage/ArticleNavigator.js
	webpack.config.js
This commit is contained in:
Dick Choi
2015-12-15 13:06:01 +09:00
parent 1318abd37e 6b66893ea4
commit 2499a05473
51 changed files with 1310 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
browser/styles/main/HomeContainer/components/ArticleDetail.styl
View File

@@ -284,7 +284,87 @@ iptFocusBorderColor = #369DCD
color noTagsColor
.right
z-index 30
button
div.share-dropdown
position absolute
right 5px
top 30px
background-color transparentify(invBackgroundColor, 80%)
padding 5px 0
width 200px
&.hide
display none
&>button
width 200px
text-align left
display block
height 33px
background-color transparent
color white
font-size 14px
padding 0 10px
border none
&:hover
background-color transparentify(lighten(invBackgroundColor, 30%), 80%)
&>.ShareButton-url
clearfix()
input.ShareButton-url-input
width 155px
margin 0 0 0 5px
height 25px
outline none
border none
border-top-left-radius 5px
border-bottom-left-radius 5px
float left
padding 5px
button.ShareButton-url-button
width 35px
height 25px
border none
margin 0 5px 0 0
outline none
border-top-right-radius 5px
border-bottom-right-radius 5px
background-color darken(white, 5%)
color inactiveTextColor
float right
div.ShareButton-url-button-tooltip
tooltip()
right 10px
&:hover
color textColor
div.ShareButton-url-button-tooltip
opacity 1
div.ShareButton-url-alert
float left
height 25px
line-height 25px
padding 0 15px
color white
.ShareButton
display inline-block
button.ShareButton-open-button
border-radius 16.5px
cursor pointer
height 33px
width 33px
border none
margin-right 5px
font-size 18px
color inactiveTextColor
background-color darken(white, 5%)
padding 0
.tooltip
tooltip()
margin-top 25px
margin-left -40px
&:hover
color textColor
.tooltip
opacity 1
&>button
border-radius 16.5px
cursor pointer
height 33px
@@ -323,7 +403,8 @@ iptFocusBorderColor = #369DCD
right 15px
font-size 24px
line-height 60px
white-space nowrap
overflow-x auto
overflow-y hidden
small
color #AAA

2
browser/styles/main/HomeContainer/components/ArticleList.styl
View File

@@ -48,6 +48,8 @@ articleItemColor = #777
left 19px
right 0
overflow ellipsis
small
color #AAA
.bottom
padding 5px 0
overflow-x auto

2
browser/styles/main/HomeContainer/components/ArticleNavigator.styl
View File

@@ -14,7 +14,7 @@ articleCount = #999
.userProfileName
color brandColor
font-size 28px
padding 6px 0 0 10px
padding 6px 37px 0 10px
white-space nowrap
text-overflow ellipsis
overflow hidden

33
browser/styles/main/HomeContainer/components/ArticleTopBar.styl
View File

@@ -62,6 +62,13 @@ infoBtnActiveBgColor = #3A3A3A
opacity 1
&.hide
opacity 0
ul
li:last-child
line-height 10px
margin-bottom 3px
small
font-size 10px
margin-left 15px
input
absolute top left
width 350px
@@ -140,17 +147,33 @@ infoBtnActiveBgColor = #3A3A3A
.tooltip
opacity 1
&>.logo
&>.linksBtn
display block
position absolute
top 8px
right 15px
opacity 0.7
.tooltip
tooltip()
margin-top 44px
margin-left -120px
&:hover
opacity 1
.tooltip
opacity 1
&>.links-dropdown
position fixed
z-index 50
right 10px
top 40px
background-color transparentify(invBackgroundColor, 80%)
padding 5px 0
.links-item
padding 0 10px
height 33px
width 100%
display block
line-height 33px
text-decoration none
color white
&:hover
background-color transparentify(lighten(invBackgroundColor, 30%), 80%)