public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00
Code Issues Releases Wiki Activity

Fix right buttons layout in note detail

Browse Source
This commit is contained in:
Kazu Yokomizo
2017-11-14 20:28:51 +09:00
parent deade1f9f8
commit 2a2b662a6f
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
browser/main/Detail/InfoPanel.styl
View File

@@ -11,7 +11,7 @@
.control-infoButton-panel .control-infoButton-panel
z-index 200 z-index 200
margin-top 38px margin-top 38px
margin-left -140px right 0px
position absolute position absolute
padding 20px 25px 0 25px padding 20px 25px 0 25px
width 300px width 300px
@@ -33,7 +33,7 @@
.control-infoButton-panel-trash .control-infoButton-panel-trash
z-index 200 z-index 200
margin-top 45px margin-top 45px
margin-left -190px right 0px
position absolute position absolute
padding 20px 25px 0 25px padding 20px 25px 0 25px
width 300px width 300px

3
browser/main/Detail/MarkdownNoteDetail.js
View File

@@ -15,6 +15,7 @@ import _ from 'lodash'
import { findNoteTitle } from 'browser/lib/findNoteTitle' import { findNoteTitle } from 'browser/lib/findNoteTitle'
import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
import TrashButton from './TrashButton' import TrashButton from './TrashButton'
import PermanentDeleteButton from './PermanentDeleteButton'
import InfoButton from './InfoButton' import InfoButton from './InfoButton'
import InfoPanel from './InfoPanel' import InfoPanel from './InfoPanel'
import InfoPanelTrashed from './InfoPanelTrashed' import InfoPanelTrashed from './InfoPanelTrashed'
@@ -285,7 +286,7 @@ class MarkdownNoteDetail extends React.Component {
/> />
</div> </div>
<div styleName='info-right'> <div styleName='info-right'>
<TrashButton onClick={(e) => this.handleTrashButtonClick(e)} /> <PermanentDeleteButton onClick={(e) => this.handleTrashButtonClick(e)} />
<InfoButton <InfoButton
onClick={(e) => this.handleInfoButtonClick(e)} onClick={(e) => this.handleInfoButtonClick(e)}
/> />

6
browser/main/Detail/MarkdownNoteDetail.styl
View File

@@ -11,7 +11,7 @@
padding-bottom 3px padding-bottom 3px
.control-lockButton .control-lockButton
top 120px top 160px
topBarButtonLight() topBarButtonLight()
.control-lockButton-tooltip .control-lockButton-tooltip
@@ -26,6 +26,10 @@
opacity 0 opacity 0
transition 0.1s transition 0.1s
.trashed-infopanel
top 40px
position relative
.control-fullScreenButton .control-fullScreenButton
top 80px top 80px
topBarButtonLight() topBarButtonLight()

3
browser/main/Detail/NoteDetailInfo.styl
View File

@@ -62,7 +62,7 @@ $info-margin-under-border = 15px
height 34px height 34px
border-radius 17px border-radius 17px
font-size 14px font-size 14px
margin 15px 7px margin 5px 0px
border none border none
color $ui-button-color color $ui-button-color
display flex display flex
@@ -75,6 +75,7 @@ $info-margin-under-border = 15px
border-color $ui-button--active-backgroundColor border-color $ui-button--active-backgroundColor
&:hover &:hover
background-color alpha($ui-button--hover-backgroundColor, 60%) background-color alpha($ui-button--hover-backgroundColor, 60%)
transition 0.2s
.control-lockButton-tooltip .control-lockButton-tooltip
opacity 1 opacity 1