diff --git a/browser/main/Detail/FolderSelect.styl b/browser/main/Detail/FolderSelect.styl index 22b7b9b7..31930fe6 100644 --- a/browser/main/Detail/FolderSelect.styl +++ b/browser/main/Detail/FolderSelect.styl @@ -3,20 +3,14 @@ border solid 1px transparent vertical-align middle border-radius 2px + height 30px transition 0.15s user-select none margin-right 10px - &:hover - background-color $ui-button--hover-backgroundColor .root--search, .root--focus @extend .root - background-color $ui-noteDetail-backgroundColor = #fff border-color $ui-input--focus-borderColor - width 154px - height 30px - &:hover - border-color $ui-input--focus-borderColor = #fff .idle position relative diff --git a/browser/main/Detail/FullscreenButton.styl b/browser/main/Detail/FullscreenButton.styl index 7cee4faa..cc1a8dff 100644 --- a/browser/main/Detail/FullscreenButton.styl +++ b/browser/main/Detail/FullscreenButton.styl @@ -8,8 +8,8 @@ tooltip() position absolute pointer-events none - top 26px - right 0 + top 50px + right 70px z-index 200 padding 5px line-height normal diff --git a/browser/main/Detail/InfoButton.styl b/browser/main/Detail/InfoButton.styl index a1c302f0..d2a84708 100644 --- a/browser/main/Detail/InfoButton.styl +++ b/browser/main/Detail/InfoButton.styl @@ -8,8 +8,8 @@ tooltip() position absolute pointer-events none - top 26px - right 0 + top 50px + right 20px z-index 200 padding 5px line-height normal diff --git a/browser/main/Detail/InfoPanel.styl b/browser/main/Detail/InfoPanel.styl index 3baa7e1a..d90dea49 100644 --- a/browser/main/Detail/InfoPanel.styl +++ b/browser/main/Detail/InfoPanel.styl @@ -11,7 +11,7 @@ .control-infoButton-panel z-index 200 margin-top 0px - right 0 + right 25px position absolute padding 20px 25px 0 25px width 300px @@ -69,15 +69,16 @@ color $ui-text-color .infoPanel-sub - font-size 14px + font-size 12px + font-weight 600 color $ui-inactive-text-color padding-bottom 8px .infoPanel-noteLink padding-right 5px - width 200px + width 210px height 25px - margin-bottom 6px + margin 6px 0 .infoPanel-copyButton outline none diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 21c9a53f..d64e1817 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -367,10 +367,6 @@ class MarkdownNoteDetail extends React.Component {
- this.handleInfoButtonClick(e)} - /> - this.handleStarButtonClick(e)} isActive={note.isStarred} @@ -395,6 +391,10 @@ class MarkdownNoteDetail extends React.Component { this.handleTrashButtonClick(e)} /> + this.handleInfoButtonClick(e)} + /> +
- this.handleInfoButtonClick(e)} - /> - this.handleStarButtonClick(e)} isActive={note.isStarred} @@ -637,10 +633,16 @@ class SnippetNoteDetail extends React.Component { this.handleTrashButtonClick(e)} /> + + this.handleInfoButtonClick(e)} + /> + (
onClick('SPLIT')}> - +
onClick('EDITOR_PREVIEW')}> - +
Toggle Mode
diff --git a/browser/main/Detail/ToggleModeButton.styl b/browser/main/Detail/ToggleModeButton.styl index b9d3cc6c..c69401f8 100644 --- a/browser/main/Detail/ToggleModeButton.styl +++ b/browser/main/Detail/ToggleModeButton.styl @@ -1,24 +1,28 @@ .control-toggleModeButton - border 1px solid #eee - height 34px + height 25px + border-radius 50px + background-color #F4F4F4 + width 52px display flex align-items center + position absolute + right 165px + .active + background-color #1EC38B + width 33px + height 24px + box-shadow 2px 0px 7px #eee + z-index 1 div width 40px height 100% - background-color #f9f9f9 + border-radius 50% display flex align-items center justify-content center cursor pointer - &:first-child - border-right 1px solid #eee - .active - background-color #fff - box-shadow 2px 0px 7px #eee - z-index 1 &:hover .tooltip opacity 1 @@ -26,9 +30,10 @@ tooltip() position absolute pointer-events none - top 47px - right 11px + top 33px + left -10px z-index 200 + width 80px padding 5px line-height normal border-radius 2px @@ -40,22 +45,14 @@ body[data-theme="dark"] topBarButtonDark() .control-toggleModeButton - border 1px solid #444444 - div - background-color $ui-dark-noteDetail-backgroundColor - &:first-child - border-right 1px solid #444444 - .active background-color #3A404C + .active + background-color #1EC38B box-shadow 2px 0px 7px #444444 body[data-theme="solarized-dark"] .control-toggleModeButton - border 1px solid #586E75 - div - background-color $ui-solarized-dark-noteDetail-backgroundColor - &:first-child - border-right 1px solid #586E75 - .active background-color #002B36 + .active + background-color #1EC38B box-shadow 2px 0px 7px #222222 \ No newline at end of file diff --git a/browser/main/Detail/TrashButton.styl b/browser/main/Detail/TrashButton.styl index 455d36a6..7c7af878 100644 --- a/browser/main/Detail/TrashButton.styl +++ b/browser/main/Detail/TrashButton.styl @@ -8,8 +8,8 @@ tooltip() position absolute pointer-events none - top 26px - right 0 + top 50px + right 50px z-index 200 padding 5px line-height normal diff --git a/browser/main/StatusBar/StatusBar.styl b/browser/main/StatusBar/StatusBar.styl index 9f189fec..e055dc0d 100644 --- a/browser/main/StatusBar/StatusBar.styl +++ b/browser/main/StatusBar/StatusBar.styl @@ -21,19 +21,20 @@ color white .zoom - navButtonColor() - color rgba(0,0,0,.54) - height 20px - display flex - padding 0 - align-items center - background-color transparent - &:hover - color $ui-active-color - &:active - color $ui-active-color - span - margin-left 5px + display none + // navButtonColor() + // color rgba(0,0,0,.54) + // height 20px + // display flex + // padding 0 + // align-items center + // background-color transparent + // &:hover + // color $ui-active-color + // &:active + // color $ui-active-color + // span + // margin-left 5px .update navButtonColor() diff --git a/browser/main/global.styl b/browser/main/global.styl index 27d1ae73..1b40587c 100644 --- a/browser/main/global.styl +++ b/browser/main/global.styl @@ -97,7 +97,7 @@ body[data-theme="dark"] .CodeMirror font-family inherit !important line-height 1.4em - height 96% + height 100% .CodeMirror > div > textarea margin-bottom -1em .CodeMirror-focused .CodeMirror-selected diff --git a/browser/styles/index.styl b/browser/styles/index.styl index e8a70e1f..1bd183bf 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -188,7 +188,6 @@ modal() border-radius $modal-border-radius topBarButtonRight() - position absolute width 34px height 34px border-radius 17px diff --git a/resources/icon/icon-full.svg b/resources/icon/icon-full.svg index 621ebacc..6943bd7c 100644 --- a/resources/icon/icon-full.svg +++ b/resources/icon/icon-full.svg @@ -1,5 +1,5 @@ - + icon-full Created with Sketch. diff --git a/resources/icon/icon-info.svg b/resources/icon/icon-info.svg index 253b8cab..12fa696e 100644 --- a/resources/icon/icon-info.svg +++ b/resources/icon/icon-info.svg @@ -1,5 +1,5 @@ - + icon-info Created with Sketch. diff --git a/resources/icon/icon-mode-markdown-off-active.svg b/resources/icon/icon-mode-markdown-off-active.svg index 0159836b..c8ba30ce 100644 --- a/resources/icon/icon-mode-markdown-off-active.svg +++ b/resources/icon/icon-mode-markdown-off-active.svg @@ -1,5 +1,5 @@ - + icon-mode-markdown-off Created with Sketch. diff --git a/resources/icon/icon-mode-split-on-active.svg b/resources/icon/icon-mode-split-on-active.svg index 338d2bd7..ffb62b7c 100644 --- a/resources/icon/icon-mode-split-on-active.svg +++ b/resources/icon/icon-mode-split-on-active.svg @@ -1,5 +1,5 @@ - + icon-mode-split-on Created with Sketch. diff --git a/resources/icon/icon-star.svg b/resources/icon/icon-star.svg index da4abb3d..b62b1f93 100644 --- a/resources/icon/icon-star.svg +++ b/resources/icon/icon-star.svg @@ -1,5 +1,5 @@ - + icon-star Created with Sketch. diff --git a/resources/icon/icon-starred.svg b/resources/icon/icon-starred.svg index 68eb6f07..195351cf 100644 --- a/resources/icon/icon-starred.svg +++ b/resources/icon/icon-starred.svg @@ -1,5 +1,5 @@ - + icon-starred Created with Sketch. diff --git a/resources/icon/icon-trash.svg b/resources/icon/icon-trash.svg index 64dedb87..53fc7571 100644 --- a/resources/icon/icon-trash.svg +++ b/resources/icon/icon-trash.svg @@ -1,5 +1,5 @@ - + icon-trash Created with Sketch.