From d493df429505d93b6a619e6dcd6889f9ea8ee85f Mon Sep 17 00:00:00 2001
From: bimlas <bimbalaszlo@gmail.com>
Date: Mon, 26 Mar 2018 14:47:57 +0200
Subject: [PATCH] Move selector next to title

---
 browser/main/SideNav/SideNav.styl | 67 +++++++++++++------------------
 browser/main/SideNav/index.js     | 34 ++++++++--------
 2 files changed, 44 insertions(+), 57 deletions(-)

diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl
index b5b6378b..666ae0cd 100644
--- a/browser/main/SideNav/SideNav.styl
+++ b/browser/main/SideNav/SideNav.styl
@@ -8,29 +8,6 @@
   display: flex
   flex-direction column
 
-.control
-  user-select none
-  height $control-height
-  font-size 12px
-  line-height 25px
-  display flex
-  color $ui-inactive-text-color
-
-.control-sortTagsBy
-  flex 1
-  padding-left 15px
-
-.control-sortTagsBy-select
-  appearance: none;
-  margin-left 5px
-  color $ui-inactive-text-color
-  padding 0
-  border none
-  background-color transparent
-  outline none
-  cursor pointer
-  font-size 12px
-
 .top
   padding-bottom 15px
 
@@ -53,11 +30,33 @@
   display flex
   flex-direction column
 
-.tag-title
-  padding-left 15px
-  padding-bottom 13px
-  p
-    color $ui-button-default-color
+.tag-control
+  display flex
+  height 30px
+  line-height 25px
+  overflow hidden
+  .tag-control-title
+    padding-left 15px
+    padding-bottom 13px
+    flex 1
+    p
+      color $ui-button-default-color
+  .tag-control-sortTagsBy
+    user-select none
+    font-size 12px
+    color $ui-inactive-text-color
+    margin-left 12px
+    margin-right 12px
+    .tag-control-sortTagsBy-select
+      appearance: none;
+      margin-left 5px
+      color $ui-inactive-text-color
+      padding 0
+      border none
+      background-color transparent
+      outline none
+      cursor pointer
+      font-size 12px
 
 .tagList
   overflow-y auto
@@ -105,10 +104,6 @@ body[data-theme="white"]
     background-color #f9f9f9
     color $ui-text-color
 
-  .control
-    background-color $ui-white-backgroundColor
-    border-color $ui-white-borderColor
-
 body[data-theme="dark"]
   .root, .root--folded
     border-right 1px solid $ui-dark-borderColor
@@ -118,15 +113,7 @@ body[data-theme="dark"]
   .top
     border-color $ui-dark-borderColor
 
-  .control
-    background-color $ui-dark-backgroundColor
-    border-color $ui-dark-borderColor
-
 body[data-theme="solarized-dark"]
   .root, .root--folded
     background-color $ui-solarized-dark-backgroundColor
     border-right 1px solid $ui-solarized-dark-borderColor
-
-  .control
-    background-color $ui-solarized-dark-backgroundColor
-    border-color $ui-solarized-dark-borderColor
diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js
index c3739412..a20fe665 100644
--- a/browser/main/SideNav/index.js
+++ b/browser/main/SideNav/index.js
@@ -115,25 +115,25 @@ class SideNav extends React.Component {
     } else {
       component = (
         <div styleName='tabBody'>
-          <div styleName='tag-title'>
-            <p>{i18n.__('Tags')}</p>
+          <div styleName='tag-control'>
+            <div styleName='tag-control-title'>
+              <p>{i18n.__('Tags')}</p>
+            </div>
+            <div styleName='tag-control-sortTagsBy'>
+              <i className='fa fa-angle-down' />
+              <select styleName='tag-control-sortTagsBy-select'
+                title={i18n.__('Select filter mode')}
+                value={config.sortTagsBy}
+                onChange={(e) => this.handleSortTagsByChange(e)}
+              >
+                <option title='Sort alphabetically'
+                  value='ALPHABETICAL'>{i18n.__('Alphabetically')}</option>
+                <option title='Sort by update time'
+                  value='COUNTER'>{i18n.__('Counter')}</option>
+              </select>
+            </div>
           </div>
           <div styleName='tagList'>
-            <div styleName='control'>
-              <div styleName='control-sortTagsBy'>
-                <i className='fa fa-angle-down' />
-                <select styleName='control-sortTagsBy-select'
-                  title={i18n.__('Select filter mode')}
-                  value={config.sortTagsBy}
-                  onChange={(e) => this.handleSortTagsByChange(e)}
-                >
-                  <option title='Sort alphabetically'
-                    value='ALPHABETICAL'>{i18n.__('Alphabetically')}</option>
-                  <option title='Sort by update time'
-                    value='COUNTER'>{i18n.__('Counter')}</option>
-                </select>
-              </div>
-            </div>
             {this.tagListComponent(data)}
           </div>
         </div>