Merge pull request #2336 from hypothesis/topbar-toolbar-harmony

Topbar toolbar harmony

h/static/scripts/directive/simple-search.coffee

 module.exports = ['$http', '$parse', ($http, $parse) ->
   link: (scope, elem, attr, ctrl) ->
+    button = elem.find('button')
+    input = elem.find('input')
+
+    button.on('click', -> input.focus())
+
     scope.reset = (event) ->
       event.preventDefault()
       scope.query = ''
@@ -30,12 +35,12 @@ module.exports = ['$http', '$parse', ($http, $parse) ->
               <input class="simple-search-input" type="text" ng-model="searchtext" name="searchText"
                      placeholder="{{loading && 'Loading' || 'Search'}}…"
                      ng-disabled="loading" />
-              <span class="simple-search-icon" ng-hide="loading">
-                <i class="h-icon-search"></i>
-              </span>
-              <span class="simple-search-icon" ng-show="loading">
-                <i class="spinner"></i>
-              </span>
+              <button class="simple-search-icon btn btn-clean" ng-hide="loading">
+                <i class="h-icon-search btn-icon"></i>
+              </button>
+              <button class="simple-search-icon btn btn-clean" ng-show="loading" disabled>
+                <span class="btn-icon"><span class="spinner"></span></span>
+              </button>
             </form>
             '''
 ]

h/static/styles/common.scss

@@ -110,22 +110,6 @@ html {
   }
 }
 
-
-// Share this view /////////////////////
-.share-dialog-toggle {
-  top: 1px;
-  left: 8px;
-  position: relative;
-  cursor: pointer;
-  color: $gray-light;
-  float: left;
-  margin-right: 15px;
-
-  &:hover {
-    color: $gray-dark;
-  }
-}
-
 .share-links {
   a {
     font-size: 1.5em;

h/static/styles/forms.scss

@@ -238,7 +238,8 @@
 }
 
 .btn-clean {
-  &, &:focus, &:hover, &:active, &.js-hover, &.js-focus, &.js-active {
+  &, &:focus, &:hover, &:active, &[disabled],
+  &.js-hover, &.js-focus, &.js-active, &.js-disabled {
     @include box-shadow(none);
     padding-left: 0;
     padding-right: 0;
@@ -253,6 +254,10 @@
   &:active, &.js-active {
     color: $link-color-hover;
   }
+
+  &[disabled], &.js-disabled {
+    color: $text-color;
+  }
 }
 
 // Positions the icon nicely within the button.

h/static/styles/simple-search.scss

 @import "base.scss";
 @import "mixins/icons";
 
-.simple-search {
-  overflow: hidden;
-}
-
 .simple-search-form {
   @include clearfix;
   position: relative;
-  padding: 0 1.5385em;
-  color: $gray-darker;
-}
-
-.simple-search-form * {
-  line-height: inherit;
+  padding: 0 2em;
+  color: $gray-dark;
 }
 
 .simple-search-icon {
@@ -27,7 +19,6 @@
 }
 
 input.simple-search-input {
-  float: left;
   outline: none;
   color: $text-color;
   width: 100%;

h/static/styles/topbar.scss

@@ -6,42 +6,42 @@
   border: solid 1px $gray-lighter;
   border-style: solid none;
   height: 30px;
-  line-height: 28px;
   position: fixed;
   left: 0;
   right: 0;
   top: 0;
   z-index: 5;
 
-  .barbutton {
-    &:hover {
-      @include box-shadow(inset 0 1px 3px hsla(0, 0%, 0%, .1));
+  .inner {
+    * {
+      font-size: 14px;
+      line-height: 28px;
+
+      .btn-icon {
+        font-size: 18px;
+      }
     }
 
-    &:active {
-      @include box-shadow(inset 0 2px 3px hsla(0, 0%, 0%, .1));
+    @include respond-to(wide-handhelds handhelds) {
+      margin: 0 .72em;
     }
   }
+}
 
-  .inner {
-    margin: 0 auto;
-    max-width: $break-tablet;
-    padding: 0 4em;
-    position: relative;
+.topbar .btn {
+  color: $gray-light;
+  height: 28px;
+  min-width: 28px;
 
-    @include respond-to(wide-handhelds handhelds) {
-      padding-left: 0;
-      padding-right: 0;
-    }
+  border: 0;
+  padding: 0;
 
-    &.pull-right {
-      display: inline-block;
-      font-family: $sans-font-family;
-    }
+  &:active, .js-active {
+    @include single-transition(background-color, .25s);
+    background-color: $gray-light;
+  }
 
-    & > *:first-child, & > *:last-child {
-      line-height: 28px;
-      margin: 0 .72em;
-    }
+  &:focus, .js-focus, &:hover, .js-hover {
+    color: $gray-dark;
   }
 }