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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index d598d10e3aa996bc198569d3c8bd37e810056ce5..db03b94abe5602ed50b1ee6afd8720129d21fef2 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -66,16 +66,6 @@ time[title] {
   color: $blue;
 }
 
   color: $blue;
 }
 

-/* Rules for borders */
-/* These add additional colours to those provided by bootstrap */
-.border-grey {
-  border-color: $grey !important;
-}
-
-.border-lightgrey {
-  border-color: $lightgrey !important;
-}
-

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


@@ -331,7 +321,6 @@ body.small-nav {
   #sidebar {
     float: left;
     width: $sidebarWidth;
   #sidebar {
     float: left;
     width: $sidebarWidth;

-    background: #fff;

 
     #sidebar_loader {
       display: none;
 
     #sidebar_loader {
       display: none;


@@ -645,17 +634,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 {


@@ -833,14 +811,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;

   }
 }
 
   }
 }