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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 6ff46c07ce5be5304b8d42d0cfc777bef7974b85..dcbf00be85d4f86ccf00ed11c5bf20caca2a39ab 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -109,31 +109,14 @@ header {
     float: left;
   }
 
     float: left;
   }
 

-  a, a:hover {
-    text-decoration: none;
-  }
-

   img.logo {
   img.logo {

-    width: 30px;
-    height: 30px;

     margin-top: -2px;
     margin-top: -2px;

-    vertical-align: middle;

   }
 
   h1 {
     font-size: 18px;
   }
 
   h1 {
     font-size: 18px;

-    font-weight: 600;

     line-height: 1.2;
     line-height: 1.2;

-    margin: 0;

     padding-top: 15px;
     padding-top: 15px;

-
-    a {
-      color: #000;
-    }
-
-    a:hover {
-      color: #000;
-    }

   }
 
   .btn {
   }
 
   .btn {


@@ -187,22 +170,6 @@ nav.secondary {
     color: darken($darkgrey, 25%);
   }
 
     color: darken($darkgrey, 25%);
   }
 

-  .login-menu {
-    .btn-outline-secondary {
-      @include button-outline-variant($darkgrey, $color-hover: $white, $active-color: $white);
-    }
-  }
-
-  .user-menu {
-    .btn-outline-secondary {
-      @include button-outline-variant($darkgrey, $color-hover: $darkgrey, $active-background: white, $active-border: $darkgrey);
-      border-color: $grey;
-      &:hover {
-        border-color: $grey;
-      }
-    }
-  }
-

   #inboxanchor {
     background-color: lighten($grey, 10%);
   }
   #inboxanchor {
     background-color: lighten($grey, 10%);
   }


@@ -598,10 +565,6 @@ body.small-nav {
 
 /* Rules for attribution text under the main map shown on printouts */
 
 
 /* Rules for attribution text under the main map shown on printouts */
 

-#attribution {
-  display: none;
-}
-

 .donate-attr { color: darken($green, 10%) !important; }
 
 /* Rules for the sidebar */
 .donate-attr { color: darken($green, 10%) !important; }
 
 /* Rules for the sidebar */


@@ -671,9 +634,8 @@ header .search_forms,
 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {
 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {

-  ul li {
-    cursor: pointer;
-    &.selected { background: $list-highlight; }
+  ul li.selected {
+    background: $list-highlight;

   }
 
   .search_more .loader {
   }
 
   .search_more .loader {


@@ -681,11 +643,6 @@ header .search_forms,
   }
 }
 
   }
 }
 

-.search_results_error {
-  color: #f00;
-  padding: 10px 20px;
-}
-

 /* Rules for routing */
 
 div.direction {
 /* Rules for routing */
 
 div.direction {


@@ -699,8 +656,6 @@ div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
 }
 
 td.distance {
 }
 
 td.distance {

-    color: $darkgrey;
-    text-align: right;

     font-size: x-small;
 }
 tr.turn {
     font-size: x-small;
 }
 tr.turn {


@@ -796,12 +751,6 @@ tr.turn:hover {
     }
   }
 
     }
   }
 

-  .subscribe-buttons input {
-    font-size: 90%;
-    line-height: 15px;
-    min-height: 20px;
-  }
-

   span.action-button:hover {
     cursor: pointer;
     text-decoration: underline;
   span.action-button:hover {
     cursor: pointer;
     text-decoration: underline;


@@ -983,12 +932,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-/* Rules for the user list */
-
-#user_list {
-  width: 100%;
-}
-

 /* Rules for the diary entry page */
 
 .diary_entries {
 /* Rules for the diary entry page */
 
 .diary_entries {


@@ -1026,12 +969,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-/* Rules for the oauth authorization page */
-
-.oauth-authorize ul {
-  list-style: none;
-}
-

 /* Rules for messages pages */
 
 .messages {
 /* Rules for messages pages */
 
 .messages {


@@ -1039,7 +976,7 @@ tr.turn:hover {
     background: $offwhite;
   }
 
     background: $offwhite;
   }
 

-  .inbox-row-unread {
+  .inbox-row-unread td {

     background: #CBEEA7;
   }
 }
     background: #CBEEA7;
   }
 }