diff --git a/browser/main/Detail/InfoPanel.styl b/browser/main/Detail/InfoPanel.styl index 62ec529e..980df6d4 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 38px - margin-left -140px + right 0px position absolute padding 20px 25px 0 25px width 300px @@ -33,7 +33,7 @@ .control-infoButton-panel-trash z-index 200 margin-top 45px - margin-left -190px + right 0px position absolute padding 20px 25px 0 25px width 300px diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 600bfccd..186cd7ab 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -15,6 +15,7 @@ import _ from 'lodash' import { findNoteTitle } from 'browser/lib/findNoteTitle' import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' import TrashButton from './TrashButton' +import PermanentDeleteButton from './PermanentDeleteButton' import InfoButton from './InfoButton' import InfoPanel from './InfoPanel' import InfoPanelTrashed from './InfoPanelTrashed' @@ -285,7 +286,7 @@ class MarkdownNoteDetail extends React.Component { />
- this.handleTrashButtonClick(e)} /> + this.handleTrashButtonClick(e)} /> this.handleInfoButtonClick(e)} /> diff --git a/browser/main/Detail/MarkdownNoteDetail.styl b/browser/main/Detail/MarkdownNoteDetail.styl index dbfa53f8..f6708ce8 100644 --- a/browser/main/Detail/MarkdownNoteDetail.styl +++ b/browser/main/Detail/MarkdownNoteDetail.styl @@ -11,7 +11,7 @@ padding-bottom 3px .control-lockButton - top 120px + top 160px topBarButtonLight() .control-lockButton-tooltip @@ -26,6 +26,10 @@ opacity 0 transition 0.1s +.trashed-infopanel + top 40px + position relative + .control-fullScreenButton top 80px topBarButtonLight() diff --git a/browser/main/Detail/NoteDetailInfo.styl b/browser/main/Detail/NoteDetailInfo.styl index 502b6824..6ff65a94 100644 --- a/browser/main/Detail/NoteDetailInfo.styl +++ b/browser/main/Detail/NoteDetailInfo.styl @@ -62,7 +62,7 @@ $info-margin-under-border = 15px height 34px border-radius 17px font-size 14px - margin 15px 7px + margin 5px 0px border none color $ui-button-color display flex @@ -75,6 +75,7 @@ $info-margin-under-border = 15px border-color $ui-button--active-backgroundColor &:hover background-color alpha($ui-button--hover-backgroundColor, 60%) + transition 0.2s .control-lockButton-tooltip opacity 1