Merge pull request #1268 from ytk141/color-update

Color update

browser/main/Detail/InfoButton.styl

@@ -1,7 +1,6 @@
 .control-infoButton
   top 10px
-  margin-bottom 10px
-  topBarButtonLight()
+  topBarButtonRight()
 
 .infoButton
   padding 0px

browser/main/Detail/MarkdownNoteDetail.js

@@ -233,7 +233,7 @@ class MarkdownNoteDetail extends React.Component {
   }
 
   getToggleLockButton () {
-    return this.state.isLocked ? '../resources/icon/icon-lock.svg' : '../resources/icon/icon-unlock.svg'
+    return this.state.isLocked ? '../resources/icon/icon-edit-lock.svg' : '../resources/icon/icon-edit.svg'
   }
 
   handleDeleteKeyDown (e) {
@@ -392,8 +392,8 @@ class MarkdownNoteDetail extends React.Component {
         </div>
 
         <StatusBar
-          {..._.pick(this.props, ['config', 'location', 'dispatch'])}
-          date={note.updatedAt}
+            {..._.pick(this.props, ['config', 'location', 'dispatch'])}
+            date={note.updatedAt}
         />
       </div>
     )

browser/main/Detail/MarkdownNoteDetail.styl

@@ -12,9 +12,8 @@
   padding-bottom 3px
 
 .control-lockButton
-  top 160px
-  margin-bottom 10px
-  topBarButtonLight()
+  top 150px
+  topBarButtonRight()
 
 .trashed-infopanel
   top 40px
@@ -22,7 +21,7 @@
 
 .control-fullScreenButton
   top 80px
-  topBarButtonLight()
+  topBarButtonRight()
 
 .body
   absolute left right
@@ -43,7 +42,7 @@ body[data-theme="dark"]
   .root
     background-color $ui-dark-noteDetail-backgroundColor
     box-shadow none
-    border none
+    border-left 1px solid $ui-dark-borderColor
 
   .control-lockButton
     topBarButtonDark()

browser/main/Detail/SnippetNoteDetail.styl

@@ -69,7 +69,7 @@
 .control-fullScreenButton
   top 80px
   margin-bottom 10px
-  topBarButtonLight()
+  topBarButtonRight()
 
 body[data-theme="white"]
   .root

browser/main/Detail/StarButton.styl

@@ -1,6 +1,6 @@
 .root
   top 45px
-  topBarButtonLight()
+  topBarButtonRight()
   &:hover
     transition 0.2s
     color alpha($ui-favorite-star-button-color, 0.6)

browser/main/Detail/TrashButton.styl

@@ -1,11 +1,10 @@
 .control-trashButton
-  top 120px
-  margin-bottom 10px
-  topBarButtonLight()
+  top 115px
+  topBarButtonRight()
 
 .control-trashButton--in-trash
   top 60px
-  topBarButtonLight()
+  topBarButtonRight()
 
 .trashButton
   padding 0px