Skip to content

Commit 08b0c43

Browse files
committed
fix button tooltip & popup menu style
1 parent 4e0e11a commit 08b0c43

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

browser/main/HomePage/ArticleDetail/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ othersMenu.append(new MenuItem({
3535
}))
3636

3737
const BRAND_COLOR = '#18AF90'
38+
const OSX = global.process.platform === 'darwin'
3839

3940
const editDeleteTutorialElement = (
4041
<svg width='300' height='500' className='tutorial'>
@@ -318,6 +319,7 @@ export default class ArticleDetail extends React.Component {
318319
disabled={!isUnsaved}
319320
>
320321
<i className='fa fa-fw fa-save'/>&nbsp;Save
322+
<span className='tooltip' children={`Save Post (${OSX ? '⌘' : '^'} + S)`}/>
321323
</button>
322324
</div>
323325

browser/main/HomePage/ArticleNavigator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ export default class ArticleNavigator extends React.Component {
186186
<div className='title'>Folders</div>
187187
<button onClick={e => this.handleNewFolderButton(e)} className='addBtn'>
188188
<i className='fa fa-fw fa-plus'/>
189-
<span className='tooltip'>Create a new folder ({OSX === 'darwin' ? '⌘' : '^'} + Shift + n)</span>
189+
<span className='tooltip'>Create a new folder ({OSX ? '⌘' : '^'} + Shift + n)</span>
190190
</button>
191191

192192
{status.isTutorialOpen ? newFolderTutorialElement : null}

browser/styles/main/ArticleDetail.styl

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,13 @@ infoButton()
110110
&:focus
111111
color white
112112
background-color lighten(brandColor, 15%)
113+
.tooltip
114+
tooltip()
115+
margin-top 30px
116+
margin-left -90px
117+
&:hover .tooltip
118+
opacity 1
119+
113120
.ShareButton-open-button .tooltip
114121
margin-left -40px
115122
.ShareButton-dropdown
@@ -121,7 +128,7 @@ infoButton()
121128
border-radius 5px
122129
right 5px
123130
top 95px
124-
box-shadow 0px 0px 10px 1px #c0c0c0
131+
box-shadow 0px 0px 10px 1px alpha(#bbb, 0.8)
125132
border 1px solid #bcbcbc
126133
&.hide
127134
display none
@@ -133,7 +140,7 @@ infoButton()
133140
padding-left 20px
134141
text-align left
135142
font-size 13px
136-
font-family 'Helvetica Neue'
143+
font-family '.HelveticaNeueDeskInterface-Regular'
137144
&:hover
138145
background-color #4297FE
139146
color white

0 commit comments

Comments
 (0)