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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index a13f73d7a8ba0a2aa7228b927da1ea54e664f968..7c4053c4f48b722b3b74a6b05a70845bae9d668c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -30,20 +30,11 @@ small, aside {
 
 #container { position: relative; }
 
 
 #container { position: relative; }
 

-.column-1 {
-  width: 50%;
-  margin: 0 0 $lineheight/2 0;
-}
-

 .small_icon {
   vertical-align: middle;
   margin-right: $lineheight/4;
 }
 
 .small_icon {
   vertical-align: middle;
   margin-right: $lineheight/4;
 }
 

-.red { color: $red; }
-
-.piwik { border: 0; }
-

 [dir=rtl] { /* no-r2 */ text-align: right; }
 
 [dir=ltr] { /* no-r2 */ text-align: left; }
 [dir=rtl] { /* no-r2 */ text-align: right; }
 
 [dir=ltr] { /* no-r2 */ text-align: left; }


@@ -85,7 +76,6 @@ small, aside {
 a {
   color: #24d;
   text-decoration: none;
 a {
   color: #24d;
   text-decoration: none;

-  -webkit-appearance: none;

   outline: 0;
   &:hover {
     text-decoration: underline;
   outline: 0;
   &:hover {
     text-decoration: underline;


@@ -101,6 +91,10 @@ a {
   }
 }
 
   }
 }
 

+.text-muted a {
+  color: $blue;
+}
+

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


@@ -272,7 +266,7 @@ nav.primary, nav.secondary {
   display: none;
 }
 
   display: none;
 }
 

-body.compact {
+body.compact-nav {

   #compact-secondary-nav {
     display: inline-block;
   }
   #compact-secondary-nav {
     display: inline-block;
   }


@@ -1196,16 +1190,6 @@ tr.turn:hover {
   background: $lightgrey;
 }
 
   background: $lightgrey;
 }
 

-.content-body {
-  h1, h2, h3, p, ul, ol {
-    margin-bottom: $lineheight;
-  }
-
-  h1, h2, h3 {
-    margin-top: $lineheight/2;
-  }
-}
-

 .content-inner {
   position: relative;
   max-width: 900px;
 .content-inner {
   position: relative;
   max-width: 900px;


@@ -1271,12 +1255,15 @@ tr.turn:hover {
 /* Rules for small maps in content areas */
 
 .content_map {
 /* Rules for small maps in content areas */
 
 .content_map {

-  position: relative;
-  width: 45%;
-  height: 400px;
+  height: 200px;

   border: 1px solid $grey;
   margin-bottom: $lineheight;
   border: 1px solid $grey;
   margin-bottom: $lineheight;

-  float: right;
+}
+
+@include media-breakpoint-up(md) {
+  .content_map {
+    height: 400px;
+  }

 }
 
 /* Rules for the new trace form */
 }
 
 /* Rules for the new trace form */


@@ -1306,21 +1293,14 @@ tr.turn:hover {
 /* Rules for the user profile page */
 
 #userinformation {
 /* Rules for the user profile page */
 
 #userinformation {

-

   min-height: 100px;
   .userinformation-inner {
     float: left;
   }
   min-height: 100px;
   .userinformation-inner {
     float: left;
   }

-  h2 {
-    margin-top: 0;
-  }

   .user-description {
     width: 100%;
     clear: both;
   }
   .user-description {
     width: 100%;
     clear: both;
   }

-  .deemphasize {
-    margin: 0;
-  }

 }
 
 .admin-user-info small {
 }
 
 .admin-user-info small {


@@ -1329,16 +1309,6 @@ tr.turn:hover {
   margin-right: $lineheight;
 }
 
   margin-right: $lineheight;
 }
 

-.activity-block {
-  clear: left;
-  border-bottom: 1px solid $grey;
-  padding-bottom: $lineheight;
-  float: left;
-  h3 {
-    margin-bottom: $lineheight/2;
-  }
-}
-

 .contact-activity {
   margin-top: $lineheight;
   width: 100%;
 .contact-activity {
   margin-top: $lineheight;
   width: 100%;


@@ -1417,7 +1387,7 @@ tr.turn:hover {
     margin-top: $lineheight/2;
   }
 
     margin-top: $lineheight/2;
   }
 

-  &.deemphasize {
+  &.deleted {

     background-color: #fee;
   }
 
     background-color: #fee;
   }
 


@@ -1472,7 +1442,7 @@ tr.turn:hover {
       padding-top: $lineheight;
       border-top: 1px solid $grey;
     }
       padding-top: $lineheight;
       border-top: 1px solid $grey;
     }

-    &.deemphasize {
+    &.deleted {

       background-color: #fee;
     }
     p {
       background-color: #fee;
     }
     p {


@@ -1536,13 +1506,6 @@ tr.turn:hover {
 
 /* Rules for the account settings page */
 
 
 /* Rules for the account settings page */
 

-#accountForm .user_map {
-  position: relative;
-  width: 500px;
-  height: 400px;
-  border: 1px solid $grey;
-}
-

 #accountForm .user_image {
   margin-bottom: 0;
 }
 #accountForm .user_image {
   margin-bottom: 0;
 }


@@ -1567,11 +1530,6 @@ tr.turn:hover {
   display: inline !important;
 }
 
   display: inline !important;
 }
 

-.content_map.settings_map {
-  width: 50%;
-  float: none;
-}
-

 /* Rules for the oauth settings page */
 
 .oauth_clients .buttons .oauth-edit {
 /* Rules for the oauth settings page */
 
 .oauth_clients .buttons .oauth-edit {


@@ -1640,17 +1598,6 @@ tr.turn:hover {
   display: none;
 }
 
   display: none;
 }
 

-.messages-show .message-buttons {
-  margin-top: $lineheight;
-  margin-bottom: $lineheight * 1.5;
-  padding-top: $lineheight;
-  border-top: 1px solid $lightgrey;
-}
-
-.messages-show .buttons .mark-unread-button {
-  border-radius: 0;
-}
-

 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {


@@ -2259,12 +2206,18 @@ input.richtext_title[type="text"] {
       display: block;
       color: white;
       font-weight: 300;
       display: block;
       color: white;
       font-weight: 300;

-      font-size: 34px;
+      font-size: 28px;

       span {
         color: $vibrant-green;
       }
     }
 
       span {
         color: $vibrant-green;
       }
     }
 

+    @include media-breakpoint-up(sm) {
+      h1 {
+        font-size: 34px;
+      }
+    }
+

     .user-image {
       position: absolute;
       top: 0px;
     .user-image {
       position: absolute;
       top: 0px;


@@ -2340,8 +2293,3 @@ input.richtext_title[type="text"] {
     display: none;
   }
 }
     display: none;
   }
 }

-
-.read-reports {
-  background: $lightgrey;
-  opacity: 0.7;
-}