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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 6a6e4518688774922ed490d1eb46914166a65ade..35c5ba845f0d0085b135d4efead8af8f71e89fa7 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -72,10 +72,6 @@ time[title] {
   border-color: $grey !important;
 }
 
   border-color: $grey !important;
 }
 

-.border-lightgrey {
-  border-color: $lightgrey !important;
-}
-

 /* Rules for the header */
 
 #menu-icon {
 /* Rules for the header */
 
 #menu-icon {


@@ -562,16 +558,6 @@ header .search_forms,
   display: none;
 }
 
   display: none;
 }
 

-/* Rules for the map key which appears in the popout sidebar */
-
-#mapkey {
- .mapkey-table-key img {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-  }
-}
-

 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {
 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {


@@ -655,17 +641,6 @@ tr.turn:hover {
     tr:last-child th, tr:last-child td {
       border-bottom: 0;
     }
     tr:last-child th, tr:last-child td {
       border-bottom: 0;
     }

-
-    .colour-preview-box {
-      width: 14px;
-      height: 14px;
-      // add color via inline css on element: background-color: <tag value>;
-    }
-  }
-
-  span.action-button:hover {
-    cursor: pointer;
-    text-decoration: underline;

   }
 
   .note-description {
   }
 
   .note-description {


@@ -843,14 +818,11 @@ tr.turn:hover {
     height: 400px;
     display: none;
   }
     height: 400px;
     display: none;
   }

-  .comments {
-    max-width: 740px;
+  .diary-comment .col-auto {
+    width: 62px;

   }
   }

-  .diary-comment {
-    border-top: 1px dashed $grey;
-    &:first-child {
-      border-top: 1px solid $grey;
-    }
+  .diary-comment .col {
+    max-width: 690px;

   }
 }
 
   }
 }