Don't try and add a note when the control is disabled

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

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 606cdd47da9dbc294c33532263e0791fb68b9d13..96856228c0b1b23acde7a14cf42853bc8a574469 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -10,6 +10,7 @@ body {
   background-color: #fff;
   margin: 0px;
   padding: 0px;
   background-color: #fff;
   margin: 0px;
   padding: 0px;

+  text-align: left;

 }
 
 body.slim {
 }
 
 body.slim {


@@ -53,6 +54,7 @@ h2 {
   width: 185px;
   font-size: 11px;
   line-height: 12px;
   width: 185px;
   font-size: 11px;
   line-height: 12px;

+  border-right: 1px solid #ccc;

 }
 
 /* Rules for the OpenStreetMap logo in the top left corner */
 }
 
 /* Rules for the OpenStreetMap logo in the top left corner */


@@ -152,6 +154,7 @@ h2 {
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {

+  left: 0px;

   margin: 0;
   padding: 5px 10px;
   line-height: 15px;
   margin: 0;
   padding: 5px 10px;
   line-height: 15px;


@@ -203,8 +206,10 @@ h2 {
  */
 
 .optionalbox {
  */
 
 .optionalbox {

+  left: 0px;

   padding: 5px 10px;
   margin: 5px 0;
   padding: 5px 10px;
   margin: 5px 0;

+  text-align: left;

 }
 
 .optionalbox h1 {
 }
 
 .optionalbox h1 {


@@ -227,7 +232,7 @@ h2 {
 }
 
 #search_field {
 }
 
 #search_field {

-  position:relative;
+  position: relative;

 }
 
 #search_field input[type="text"] {
 }
 
 #search_field input[type="text"] {


@@ -235,6 +240,7 @@ h2 {
   font-size: 14px;
   line-height: 15px;
   height: 25px;
   font-size: 14px;
   line-height: 15px;
   height: 25px;

+  padding: 2px 0px 2px 5px;

   box-shadow: inset #DDD 0px 1px 3px;
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
   box-shadow: inset #DDD 0px 1px 3px;
   box-sizing: border-box;
   -webkit-box-sizing: border-box;


@@ -259,6 +265,7 @@ h2 {
   background: image-url("sprite.png");
   position: absolute;
   top: 5px;
   background: image-url("sprite.png");
   position: absolute;
   top: 5px;

+  right: 4px;

   cursor: pointer;
 }
 
   cursor: pointer;
 }
 


@@ -311,6 +318,7 @@ h2 {
   background: image-url("sprite.png") 0 -30px no-repeat;
   position: absolute;
   top: 8px;
   background: image-url("sprite.png") 0 -30px no-repeat;
   position: absolute;
   top: 8px;

+  left: 17px;

 }
 
 /* Rules for Creative Commons logo button */
 }
 
 /* Rules for Creative Commons logo button */


@@ -324,7 +332,10 @@ h2 {
 
 #top-bar {
   position: absolute;
 
 #top-bar {
   position: absolute;

+  z-index: 10000;

   top: 0;
   top: 0;

+  left: 185px;
+  right: 0;

   height: 29px;
   border-bottom: 1px solid #ccc;
   background: white;
   height: 29px;
   border-bottom: 1px solid #ccc;
   background: white;


@@ -344,11 +355,13 @@ h2 {
 }
 
 #tabnav a, #tabnav a:link, #tabnav a:visited {
 }
 
 #tabnav a, #tabnav a:link, #tabnav a:visited {

+  float: left;

   background: #fff;
   font-size: 14px;
   line-height: 19px;
   font-weight: bold;
   padding: 5px 10px;
   background: #fff;
   font-size: 14px;
   line-height: 19px;
   font-weight: bold;
   padding: 5px 10px;

+  margin-right: 1px;

   text-decoration: none;
   color: #333;
   -webkit-transition: color 200ms ease-in;
   text-decoration: none;
   color: #333;
   -webkit-transition: color 200ms ease-in;


@@ -397,8 +410,10 @@ body.site-export #tabnav a#exportanchor {
 /* Rules for greeting bar in the top right corner */
 
 #greeting {
 /* Rules for greeting bar in the top right corner */
 
 #greeting {

+  float: right;

   height: 28px;
   margin: 0px;
   height: 28px;
   margin: 0px;

+  padding-right: 10px;

   font-size: 13px;
   line-height: 28px;
 }
   font-size: 13px;
   line-height: 28px;
 }


@@ -413,6 +428,7 @@ body.site-export #tabnav a#exportanchor {
   z-index: 20000000;
   position: absolute;
   top: 15px;
   z-index: 20000000;
   position: absolute;
   top: 15px;

+  left: 15px;

 }
 
 /* Rules for Leaflet maps */
 }
 
 /* Rules for Leaflet maps */


@@ -438,6 +454,12 @@ body.site-export #tabnav a#exportanchor {
   padding: 5px;
 }
 
   padding: 5px;
 }
 

+.leaflet-control-attribution a.disabled {
+  color: #99c9dc;
+  cursor: default;
+  text-decoration: none;
+}
+

 .site-index .leaflet-top,
 .site-export .leaflet-top {
   top: 40px !important;
 .site-index .leaflet-top,
 .site-export .leaflet-top {
   top: 40px !important;


@@ -447,6 +469,17 @@ body.site-export #tabnav a#exportanchor {
   }
 }
 
   }
 }
 

+.site-index #map .olControlScaleLine,
+.site-export #map .olControlScaleLine {
+  left: 10px !important;
+}
+
+.leaflet-popup-scrolled {
+  padding-right: 20px;
+  border-bottom: 0px !important;
+  border-top: 0px !important;
+}
+

 /* Rules for edit menu */
 
 .menuicon {
 /* Rules for edit menu */
 
 .menuicon {


@@ -486,10 +519,18 @@ body.site-export #tabnav a#exportanchor {
   display: none;
 }
 
   display: none;
 }
 

+.attribution_license {
+  text-align: left;
+}
+

 .attribution_notice {
   text-align: center;
 }
 
 .attribution_notice {
   text-align: center;
 }
 

+.attribution_project {
+  text-align: right;
+}
+

 /* Rules for the popout map sidebar */
 
 #sidebar {
 /* Rules for the popout map sidebar */
 
 #sidebar {


@@ -497,9 +538,11 @@ body.site-export #tabnav a#exportanchor {
   position: absolute;
   margin: 30px 0px 0px 0px;
   padding: 0px;
   position: absolute;
   margin: 30px 0px 0px 0px;
   padding: 0px;

+  border-right: 1px solid #ccc;

   width: 30%;
   top: 0px;
   bottom: 0px;
   width: 30%;
   top: 0px;
   bottom: 0px;

+  left: 0px;

 }
 
 #sidebar #sidebar_content {
 }
 
 #sidebar #sidebar_content {


@@ -522,6 +565,14 @@ body.site-export #tabnav a#exportanchor {
   background: #ccc;
 }
 
   background: #ccc;
 }
 

+#sidebar #sidebar_title {
+  text-align: left;
+}
+
+#sidebar #sidebar_close {
+  text-align: right;
+}
+

 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey h3 {
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey h3 {


@@ -632,7 +683,9 @@ body.site-export #tabnav a#exportanchor {
 
 #content {
   padding: 20px;
 
 #content {
   padding: 20px;

-  margin: 30px 0px 0px 0px;
+  margin: 30px 0px 0px 185px;
+  border-left: 1px solid #ccc;
+  text-align: left;

 }
 
 .site-edit #content,
 }
 
 .site-edit #content,


@@ -680,6 +733,7 @@ body.site-export #tabnav a#exportanchor {
 #slim_header img {
   vertical-align: middle;
   margin-bottom: 5px;
 #slim_header img {
   vertical-align: middle;
   margin-bottom: 5px;

+  margin-right: 5px;

 }
 
 /* Rules for text content pages */
 }
 
 /* Rules for text content pages */


@@ -730,6 +784,7 @@ body.site-export #tabnav a#exportanchor {
   border-width: 0px;
   margin-top: 1px;
   margin-bottom: 1px;
   border-width: 0px;
   margin-top: 1px;
   margin-bottom: 1px;

+  text-align: left;

 }
 
 #changeset_list td {
 }
 
 #changeset_list td {


@@ -756,8 +811,10 @@ body.site-export #tabnav a#exportanchor {
 
 #changeset_list_map {
   position: absolute;
 
 #changeset_list_map {
   position: absolute;

+  float: right;

   top: 0px;
   bottom: 0px;
   top: 0px;
   bottom: 0px;

+  right: 0px;

   width: 49%;
   min-height: 400px;
   border: solid 1px black;
   width: 49%;
   min-height: 400px;
   border: solid 1px black;


@@ -766,7 +823,9 @@ body.site-export #tabnav a#exportanchor {
 /* Rules for the data browser */
 
 #browse_navigation {
 /* Rules for the data browser */
 
 #browse_navigation {

+  float: right;

   width: 250px;
   width: 250px;

+  margin-left: 10px;

   text-align: center;
 }
 
   text-align: center;
 }
 


@@ -774,8 +833,33 @@ table.browse_details th {
   white-space: nowrap;
 }
 
   white-space: nowrap;
 }
 

+td.browse_comments {
+  padding: 0px;
+
+  table {
+    border-collapse: collapse;
+
+    td {
+      padding-bottom: 10px;
+
+      p {
+        margin-top: 0px;
+        margin-bottom: 0px;
+      }
+
+      span.by {
+        font-size: small;
+        color: #999999;
+      }
+    }
+  }
+}
+

 #browse_map {
 #browse_map {

+  float: right;

   width: 250px;
   width: 250px;

+  text-align: right;
+  margin-left: 10px;

 }
 
 #browse_map #small_map {
 }
 
 #browse_map #small_map {


@@ -794,6 +878,7 @@ table.browse_details th {
   font-size: small;
   border-collapse: collapse;
   border-width: 0px;
   font-size: small;
   border-collapse: collapse;
   border-width: 0px;

+  text-align: right;

 }
 
 #trace_list .trace_summary {
 }
 
 #trace_list .trace_summary {


@@ -838,9 +923,30 @@ table.browse_details th {
 }
 
 #user_list_actions {
 }
 
 #user_list_actions {

+  float: right;

   margin-top: 10px;
 }
 
   margin-top: 10px;
 }
 

+/* Rules for the diary list */
+
+.diary_entry-list img.user_image {
+  float: right;
+}
+
+.diary_entry-list img.user_thumbnail {
+  float: right;
+}
+
+/* Rules for the diary entry view */
+
+.diary_entry-view img.user_image {
+  float: right;
+}
+
+.diary_entry-view img.user_thumbnail {
+  float: right;
+}
+

 /* Rules for the new diary entry page */
 
 .diary_entry div#map {
 /* Rules for the new diary entry page */
 
 .diary_entry div#map {


@@ -929,6 +1035,14 @@ form#termsForm {
   margin-bottom: 3em;
 }
 
   margin-bottom: 3em;
 }
 

+form#termsForm div#buttons {
+  float: right;
+}
+
+form#termsForm input#agree {
+  margin-left: 50px;
+}
+

 div#slim_content form#termsForm {
   width: auto;
 }
 div#slim_content form#termsForm {
   width: auto;
 }


@@ -991,7 +1105,12 @@ p#contributorGuidance {
 
 /* Rules for the user view */
 
 
 /* Rules for the user view */
 

+.user-view img.user_image {
+  float: right;
+}
+

 .user-view .user_map {
 .user-view .user_map {

+  float: right;

   position: relative;
   width: 400px;
   height: 400px;
   position: relative;
   width: 400px;
   height: 400px;


@@ -1136,9 +1255,11 @@ p#contributorGuidance {
 #errorExplanation h2 {
   font-weight: bold;
   font-size: 12px;
 #errorExplanation h2 {
   font-weight: bold;
   font-size: 12px;

+  padding: 5px 5px 5px 15px;

   margin: -7px;
   background-color: #c00;
   color: #fff;
   margin: -7px;
   background-color: #c00;
   color: #fff;

+  text-align: left;

 }
 
 #errorExplanation p {
 }
 
 #errorExplanation p {


@@ -1159,6 +1280,11 @@ p#contributorGuidance {
   font-weight: bold;
   font-size: 12px;
   line-height: 20px;
   font-weight: bold;
   font-size: 12px;
   line-height: 20px;

+  text-align: right;
+}
+
+.submitButton {
+  text-align: right;

 }
 
 .minorNote {
 }
 
 .minorNote {


@@ -1173,6 +1299,11 @@ textarea {
   border: 1px solid #ccc;
 }
 
   border: 1px solid #ccc;
 }
 

+input.openid_url {
+  background: image-url('openid_input.png') repeat-y left white;
+  padding-left: 16px;
+}
+

 /* Rules for user images */
 
 img.user_image {
 /* Rules for user images */
 
 img.user_image {


@@ -1262,6 +1393,7 @@ abbr.geo {
     display: inline-block;
     vertical-align: top;
     background-color: #ddd;
     display: inline-block;
     vertical-align: top;
     background-color: #ddd;

+    margin-left: 15px;

     padding: 5px 10px 10px 10px;
     font-size: 12px;
 
     padding: 5px 10px 10px 10px;
     font-size: 12px;
 


@@ -1271,9 +1403,12 @@ abbr.geo {
 
     th {
       vertical-align: top;
 
     th {
       vertical-align: top;

+      text-align: left;
+      padding: 0px 15px 0px 0px !important;

     }
 
     td {
     }
 
     td {

+      text-align: left;

       font-family: fixed;
       line-height: 16px;
       padding: 0px !important;
       font-family: fixed;
       line-height: 16px;
       padding: 0px !important;


@@ -1281,10 +1416,31 @@ abbr.geo {
 
     input.richtext_doedit {
       margin-top: 5px !important;
 
     input.richtext_doedit {
       margin-top: 5px !important;

+      margin-right: 10px !important;

     }
 
     input.richtext_dopreview {
       margin-top: 5px !important;
     }
 
     input.richtext_dopreview {
       margin-top: 5px !important;

+      margin-left: 10px !important;
+    }
+  }
+}
+
+/* Rules for the notes interface */
+
+.note {
+  .comment_body {
+    margin-top: 4px;
+    margin-bottom: 4px;
+
+    p {
+      margin-top: 0px;
+      margin-bottom: 0px;

     }
   }
     }
   }

+
+  .buttons {
+    margin-top: 5px;
+    text-align: right;
+  }

 }
 }