Merge remote-tracking branch 'upstream/pull/4108'

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 06f98cc57b02a2f211147827174fc62c5066a107..19cc8e5bed806b0fa2cd8de3c02ebdeea0ab0c83 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -80,11 +80,10 @@ small, aside {
 /* Rules for the header */
 
 #menu-icon {
-  display: none !important;
+  display: none;
   float: right;
   background: image-url("menu-icon.png") no-repeat;
   background-size: 30px 30px;
-  display: block;
   width: 30px;
   height: 30px;
   margin: 14px 10px 0 0;
@@ -244,7 +243,7 @@ body.compact-nav {
 
 body.small-nav {
   #menu-icon {
-    display: inline-block !important;
+    display: block;
   }
 
   nav.primary,
@@ -777,15 +776,6 @@ tr.turn:hover {
 
 .routing_marker { width: 15px; cursor: move; }
 
-/* Rules for entity history */
-
-#sidebar_content {
-  .browse_details {
-    position: relative;
-    border-bottom: $keyline;
-  }
-}
-
 .browse_status {
   display: none;
 }

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 4b5daf4d01d8cd91bd6adf56fd778265e8bcec5e..e0082a26aa0cf354564bfb1e734e740b00a88f9b 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -11,10 +11,8 @@ $vibrant-green: #76c551;
 $grey: #CCC;
 $lightgrey: #EEE;
 $darkgrey: #888;
-$hovercolor: 20%;
 $headerHeight: 55px;
 $sidebarWidth: 350px;
-$keyline: 1px solid $lightgrey;
 $list-highlight: #FFFFC0;
 $border: 1px solid $grey;