Rebase to current master

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 462cc50a71c5a55e10f47c414e1d13cee93ace93..eb7cbf84545d7053271448bf4ff364e20ef0b2bb 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -938,8 +938,8 @@ header .search_forms,
     border-radius: 0 2px 2px 0;
   }
 
-  input.highlight_error {
-    background-color: rgba(255, 0, 0, 0.5);
+  input.error {
+    background-color: rgba($red, 0.4);
   }
 
   select {
@@ -1028,7 +1028,7 @@ header .search_forms,
 
 /* Rules for search sidebar */
 
-.search_results_entry {
+#sidebar .search_results_entry {
   ul li {
     border-bottom: $keyline;
     cursor: pointer;
@@ -1036,12 +1036,9 @@ header .search_forms,
     &.selected { background: $list-highlight; }
   }
 
-  .search_details {
-    display: block;
-    float: right;
-    text-align: right;
-    margin-top: 0.2em;
-    margin-left: 0.5em;
+  .search_more .loader {
+    display: none;
+    width: 100%;
   }
 }
 
@@ -1131,6 +1128,11 @@ tr.turn:hover {
   .comments-0 {
     opacity: 0.5;
   }
+
+  .changeset_more .loader {
+    display: none;
+    width: 100%;
+  }
 }
 
 /* Rules for the browse sidebar */
@@ -1668,10 +1670,6 @@ tr.turn:hover {
   }
 }
 
-.content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div
-  display: inline;
-}
-
 .pagination {
   padding-top: $lineheight;
 }