public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +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

2
browser/styles/finder/index.styl
View File

@@ -16,6 +16,8 @@ body
width 100%
height 100%
overflow hidden
button, input
font-family "Lato"
.Finder
absolute top bottom left right

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%)

59
browser/styles/mixins/marked.styl
View File

@@ -1,36 +1,38 @@
marked()
h1, h2, h3, h4, h5, h6, p
&:first-child
margin-top 0
hr
border-top none
border-bottom solid 1px borderColor
margin 15px 0
h1, h2, h3, h4, h5, h6
margin 0 0 15px
font-weight 600
* + h1, * + h2, * + h3, * + h4, * + h5, * + h6
margin-top 25px
h1
font-size 2em
border-bottom solid 2px borderColor
margin 0.33em auto 0.67em
line-height 2.333em
h2
font-size 1.5em
margin 0.42em auto 0.83em
font-size 1.66em
line-height 2.07em
h3
font-size 1.17em
margin 0.5em auto 1em
font-size 1.33em
line-height 1.6625em
h4
font-size 1em
margin 0.67em auto 1.33em
font-size 1.15em
line-height 1.4375em
h5
font-size 0.83em
margin 0.84em auto 1.67em
font-size 1em
line-height 1.25em
h6
font-size 0.67em
margin 1.16em auto 2.33em
h1, h2, h3, h4, h5, h6
font-weight 700
line-height 1.8em
font-size 0.8em
line-height 1em
* + p, * + blockquote, * + ul, * + ol, * + pre
margin-top 15px
p
line-height 1.8em
margin 15px 0 25px
line-height 1.9em
margin 0 0 15px
img
max-width 100%
strong
@@ -41,15 +43,17 @@ marked()
text-decoration line-through
blockquote
border-left solid 4px brandBorderColor
margin 15px 0 25px
margin 0 0 15px
padding 0 25px
ul
list-style-type disc
padding-left 35px
margin-bottom 35px
margin-bottom 15px
li
display list-item
line-height 1.8em
&>li>ul, &>li>ol
margin 0
&>li>ul
list-style-type circle
&>li>ul
@@ -57,12 +61,14 @@ marked()
ol
list-style-type decimal
padding-left 35px
margin-bottom 35px
margin-bottom 15px
li
display list-item
line-height 1.8em
&>li>ul, &>li>ol
margin 0
code
font-family monospace
font-family Monaco, Menlo, 'Ubuntu Mono', Consolas, source-code-pro, monospace;
padding 2px 4px
border solid 1px borderColor
border-radius 4px
@@ -70,14 +76,19 @@ marked()
color black
text-decoration none
background-color #F6F6F6
margin-right 2px
* + code
margin-left 2px
pre
padding 5px
border solid 1px borderColor
border-radius 5px
overflow-x auto
margin 15px 0 25px
margin 0 0 15px
background-color #F6F6F6
line-height 1.35em
&>code
margin 0
padding 0
border none
border-radius 0