Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed ToggleMode button overlapping CSS issue #1567

Merged
merged 1 commit into from
Feb 24, 2018
Merged

Fixed ToggleMode button overlapping CSS issue #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions browser/main/Detail/MarkdownNoteDetail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,12 +362,10 @@ class MarkdownNoteDetail extends React.Component {
value={this.state.note.tags}
onChange={this.handleUpdateTag.bind(this)}
/>

<ToggleModeButton onClick={(e) => this.handleSwitchMode(e)} editorType={editorType} />

<TodoListPercentage percentageOfTodo={getTodoPercentageOfCompleted(note.content)} />
</div>
<div styleName='info-right'>
<ToggleModeButton onClick={(e) => this.handleSwitchMode(e)} editorType={editorType} />
<StarButton
onClick={(e) => this.handleStarButtonClick(e)}
isActive={note.isStarred}
Expand Down
3 changes: 2 additions & 1 deletion browser/main/Detail/MarkdownNoteDetail.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
background-color $ui-noteDetail-backgroundColor
box-shadow none
padding 20px 40px
overflow hidden

.lock-button
padding-bottom 3px
Expand Down Expand Up @@ -44,7 +45,7 @@
margin 0 30px
.body-noteEditor
absolute top bottom left right

body[data-theme="white"]
.root
box-shadow $note-detail-box-shadow
Expand Down
6 changes: 3 additions & 3 deletions browser/main/Detail/ToggleModeButton.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
width 52px
display flex
align-items center
position absolute
right 165px
position: relative
top 2px
.active
background-color #1EC38B
width 33px
Expand Down Expand Up @@ -55,4 +55,4 @@ body[data-theme="solarized-dark"]
background-color #002B36
.active
background-color #1EC38B
box-shadow 2px 0px 7px #222222
box-shadow 2px 0px 7px #222222