Add bootstrap 4

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 71df217b3b5426a2ce5271d13ffdc1a5225b2166..0e42eb9000e959e505b2b379fcd8be00cffc4960 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,4 +1,5 @@
 @import "parameters";
+@import "bootstrap";
 
 /* Styles common to large and small screens */
 
@@ -1230,6 +1231,15 @@ tr.turn:hover {
       border-left: 1px solid #ddd;
       background-color: #fff;
     }
+
+    .colour-preview-box {
+      float: right;
+      width: 12px;
+      height: 12px;
+      margin: 4px 0px;
+      border: 1px solid rgba(0, 0, 0, .1);
+      // add color via inline css on element: background-color: <tag value>;
+    }
   }
 
   .warning {
@@ -1664,10 +1674,18 @@ tr.turn:hover {
 
 .diary_post {
   position: relative;
-  margin-top: $lineheight/2;
   padding-top: $lineheight;
+  padding-bottom: $lineheight/2;
   border-top: 1px solid #ccc;
 
+  &:first-of-type {
+    margin-top: $lineheight/2;
+  }
+
+  &.deemphasize {
+    background-color: #fee;
+  }
+
   .post_heading {
     margin-bottom: $lineheight;
 
@@ -1712,14 +1730,17 @@ tr.turn:hover {
     max-width: 740px;
   }
   .diary-comment {
-    margin-top: $lineheight/2;
     border-top: 1px dashed #ccc;
     padding-top: $lineheight/2;
+    padding-bottom: $lineheight/2;
     &:first-child {
-      margin-top: $lineheight;
+      margin-top: $lineheight/2;
       padding-top: $lineheight;
       border-top: 1px solid #ccc;
     }
+    &.deemphasize {
+      background-color: #fee;
+    }
     p {
       margin-bottom: $lineheight/2;
     }