Disabled OutputSafety rubocop rule just for the line, not whole browse_helper.rb

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 47e76fceb9598fce175a109cd2c8be32362cd9b2..0ec99266e1a6a6b728ad9b3f1b3c8b277a3f25d4 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -38,7 +38,7 @@ textarea,
 body { font: #{$typeheight}/#{$lineheight} "Helvetica Neue",Arial,sans-serif; }
 
 abbr, acronym {
 body { font: #{$typeheight}/#{$lineheight} "Helvetica Neue",Arial,sans-serif; }
 
 abbr, acronym {

-  border-bottom: .1em dotted;
+  text-decoration: underline dotted;

   cursor: help;
 }
 
   cursor: help;
 }
 


@@ -163,24 +163,24 @@ small, aside {
   overflow: hidden;
 }
 
   overflow: hidden;
 }
 

-.icon.search      { background-position: 0 0; }
-.icon.donate      { background-position: -20px 0; }
-.icon.zoomin      { background-position: -40px 0; }
-.icon.zoomout     { background-position: -60px 0; }
-.icon.geolocate   { background-position: -80px 0; }
-.active .icon.geolocate   { background-position: -80px -20px; }
-.icon.layers      { background-position: -100px 0; }
-.icon.key         { background-position: -120px 0; }
-.icon.share       { background-position: -140px 0; }
-.icon.clipboard   { background-position: -160px 0; }
-.icon.link        { background-position: -180px 0; }
-.icon.close       { background-position: -200px 0; }
+.icon.search      { /* no-r2 */ background-position: 0 0; }
+.icon.donate      { /* no-r2 */ background-position: -20px 0; }
+.icon.zoomin      { /* no-r2 */ background-position: -40px 0; }
+.icon.zoomout     { /* no-r2 */ background-position: -60px 0; }
+.icon.geolocate   { /* no-r2 */ background-position: -80px 0; }
+.active .icon.geolocate   { /* no-r2 */ background-position: -80px -20px; }
+.icon.layers      { /* no-r2 */ background-position: -100px 0; }
+.icon.key         { /* no-r2 */ background-position: -120px 0; }
+.icon.share       { /* no-r2 */ background-position: -140px 0; }
+.icon.clipboard   { /* no-r2 */ background-position: -160px 0; }
+.icon.link        { /* no-r2 */ background-position: -180px 0; }
+.icon.close       { /* no-r2 */ background-position: -200px 0; }

 .close-wrap:hover .icon.close,
 .close-wrap:hover .icon.close,

-.icon.close:hover { background-position: -200px -20px; }
-.icon.check       { background-position: -220px 0; }
-.icon.note        { background-position: -240px 0; }
-.icon.note.grey   { background-position: -240px -20px; }
-.icon.query       { background-position: -260px 0; }
+.icon.close:hover { /* no-r2 */ background-position: -200px -20px; }
+.icon.check       { /* no-r2 */ background-position: -220px 0; }
+.icon.note        { /* no-r2 */ background-position: -240px 0; }
+.icon.note.grey   { /* no-r2 */ background-position: -240px -20px; }
+.icon.query       { /* no-r2 */ background-position: -260px 0; }

 
 /* Rules for links */
 
 
 /* Rules for links */
 


@@ -550,6 +550,10 @@ body.compact {
     background: #fff;
     font-size: 12px;
 
     background: #fff;
     font-size: 12px;
 

+    #sidebar_loader {
+      display: none;
+    }
+

     > div {
       position: relative;
       float: left;
     > div {
       position: relative;
       float: left;


@@ -588,10 +592,16 @@ body.compact {
       cursor: pointer;
     }
 
       cursor: pointer;
     }
 

-    p.error {
-      background-color: #ff7070;
-      padding: 10px;
-      font-weight: bold;
+    .flash {
+      padding: 15px;
+
+      picture {
+        margin-right: -25px;
+      }
+
+      div.message {
+        margin-left: 30px;
+      }

     }
   }
 
     }
   }
 


@@ -606,7 +616,7 @@ body.compact {
       display: block;
     }
 
       display: block;
     }
 

-    #sidebar_loader, #sidebar_content {
+    #sidebar_content {

       display: none;
     }
   }
       display: none;
     }
   }


@@ -992,6 +1002,11 @@ header .search_forms,
       vertical-align: middle;
     }
   }
       vertical-align: middle;
     }
   }

+
+  a.reverse_directions {
+    cursor: pointer;
+    margin: 0px 0px 5px 25px;
+  }

 }
 
 /* Rules for the map key which appears in the popout sidebar */
 }
 
 /* Rules for the map key which appears in the popout sidebar */


@@ -1196,12 +1211,20 @@ tr.turn:hover {
       border-left: 1px solid #ddd;
       background-color: #fff;
     }
       border-left: 1px solid #ddd;
       background-color: #fff;
     }

+
+    .colour-preview-box {
+      float: right;
+      width: 20px;
+      height: 20px;
+      margin: 0px;
+      border: 1px solid rgba(0, 0, 0, .1); 
+      // add color via inline css on element: background-color: <tag value>;
+    }

   }
 
   .warning {
   }
 
   .warning {

-    margin: $lineheight/2 0;
-    padding: $lineheight/2;
-    font-size: 90%;
+    margin: 0 0 $lineheight/2 0;
+    padding: 0 $lineheight/2;

   }
 
   .note-comments li, .changeset-comments li {
   }
 
   .note-comments li, .changeset-comments li {


@@ -1654,6 +1677,10 @@ tr.turn:hover {
   display: inline;
 }
 
   display: inline;
 }
 

+.pagination {
+  padding-top: $lineheight;
+}
+

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


@@ -2766,12 +2793,30 @@ input.richtext_title[type="text"] {
     vertical-align: middle;
     background: 40px 40px image-url('about/sprite.png') no-repeat;
 
     vertical-align: middle;
     background: 40px 40px image-url('about/sprite.png') no-repeat;
 

-    &.local        { background-position: 0px    0px; }
-    &.community    { background-position: 0px  -40px; }
-    &.open         { background-position: 0px  -80px; }
-    &.partners     { background-position: 0px -120px; }
-    &.infringement { background-position: 0px -160px; }
-    &.legal        { background-position: -45px -160px; }
+    &.local {
+      /* no-r2 */
+      background-position: 0px 0px;
+    }
+    &.community {
+      /* no-r2 */
+      background-position: 0px -40px;
+    }
+    &.open {
+      /* no-r2 */
+      background-position: 0px -80px;
+    }
+    &.partners {
+      /* no-r2 */
+      background-position: 0px -120px;
+    }
+    &.infringement {
+      /* no-r2 */
+      background-position: 0px -160px;
+    }
+    &.legal {
+      /* no-r2 */
+      background-position: -45px -160px;
+    }

   }
 }
 
   }
 }