Add cascade font-weights

[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 2fda3a53daff75240c7f033050fa667b64cbfebb..9f6be1979a0c26cc98dc9a768288374cd4aed159 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -36,7 +36,10 @@ abbr, acronym {
   cursor: help;
 }
 
   cursor: help;
 }
 

-strong { font-weight: 500; }
+strong {
+  font-weight: bold;
+  font-weight: 500;
+}

 
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 
 
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 


@@ -107,11 +110,15 @@ body.slim {
 }
 
 h1, h2, h3 {
 }
 
 h1, h2, h3 {

+  font-weight: bold;

   font-weight: 500;
   line-height: 1.2;
 }
 
   font-weight: 500;
   line-height: 1.2;
 }
 

-h4, h5 { font-weight: 500; }
+h4, h5 {
+  font-weight: bold;
+  font-weight: 500;
+}

 
 h1 {
   font-size: 18px;
 
 h1 {
   font-size: 18px;


@@ -176,7 +183,7 @@ small, aside {
 /* Rules for links */
 
 a {
 /* Rules for links */
 
 a {

-  color: #00f;
+  color: #24d;

   text-decoration: none;
   -webkit-appearance: none;
   outline: 0;
   text-decoration: none;
   -webkit-appearance: none;
   outline: 0;


@@ -205,6 +212,7 @@ table {
     line-height: $lineheight;
   }
   th {
     line-height: $lineheight;
   }
   th {

+    font-weight: bold;

     font-weight: 500;
     vertical-align: top;
   }
     font-weight: 500;
     vertical-align: top;
   }


@@ -302,6 +310,7 @@ nav.primary {
   a.tab,
   .dropdown-toggle {
     display: inline-block;
   a.tab,
   .dropdown-toggle {
     display: inline-block;

+    font-weight: bold;

     font-weight: 500;
     color: $green;
     padding: 5px 15px;
     font-weight: 500;
     color: $green;
     padding: 5px 15px;


@@ -360,7 +369,7 @@ nav.secondary {
 
   .user-menu {
     $border: 1px solid $grey;
 
   .user-menu {
     $border: 1px solid $grey;

-
+    font-weight: bold;

     font-weight: 500;
     border: $border;
     border-radius: $border-radius;
     font-weight: 500;
     border: $border;
     border-radius: $border-radius;


@@ -624,15 +633,15 @@ nav.secondary {
     float: left;
     width: $sidebarWidth;
     background: #fff;
     float: left;
     width: $sidebarWidth;
     background: #fff;

+    font-size: 13px;

 
 

-    h2, h3, h4 {
+    h2 {

       padding: $lineheight $lineheight $lineheight/2;
     }
 
       padding: $lineheight $lineheight $lineheight/2;
     }
 

-    h4 {
-      font-weight: normal;
-      color: #666;
-      font-size: 12px;
+    h3, h4 {
+      margin-top: $lineheight;
+      margin-bottom: $lineheight/2;

     }
 
     .icon.close {
     }
 
     .icon.close {


@@ -653,6 +662,7 @@ nav.secondary {
     p {
       padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;
     p {
       padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;

+      font-weight: normal;

       font-weight: 300;
     }
 
       font-weight: 300;
     }
 


@@ -661,7 +671,7 @@ nav.secondary {
       float: left;
       margin: 0;
       border-radius: 0;
       float: left;
       margin: 0;
       border-radius: 0;

-      font-weight: 400;
+      font-weight: normal;

       padding: .6em;
 
       &.learn-more {
       padding: .6em;
 
       &.learn-more {


@@ -730,6 +740,7 @@ nav.secondary {
         padding: 2px 6px;
         border-bottom-right-radius: 3px;
         cursor: pointer;
         padding: 2px 6px;
         border-bottom-right-radius: 3px;
         cursor: pointer;

+        font-weight: bold;

         font-weight: 500;
         font-size: 16px;
         text-stroke: 2px #fff;
         font-weight: 500;
         font-size: 16px;
         text-stroke: 2px #fff;


@@ -866,7 +877,8 @@ nav.secondary {
   }
 }
 
   }
 }
 

-#sidebar_content {
+#sidebar {
+  #sidebar_loader,

   .loader,
   .load_more {
     text-align: center;
   .loader,
   .load_more {
     text-align: center;


@@ -924,48 +936,6 @@ header .search_form {
   }
 }
 
   }
 }
 

-/* Rules for donation request box */
-
-a.donate {
-  display: block;
-  padding: $lineheight/4 $lineheight;
-  border: 1px solid $green;
-  font-size: $typeheight;
-  line-height: 1.4;
-  text-align: center;
-  border-radius: 2px;
-  color: #222;
-  margin: $lineheight/2 $lineheight;
-
-  &:hover {
-    background: $green;
-    text-decoration: none;
-  }
-}
-
-/* Rules for rotating sidebar ads */
-
-.ad-container {
-  display: block;
-  height: 120px;
-  margin: auto;
-  overflow: hidden;
-  position: relative;
-  border-bottom: 1px solid #ccc;
-
-  a {
-    display: block;
-    width: 165px;
-    margin: auto;
-  }
-
-  .ad {
-    height: 100px;
-    border: 0;
-    background: #fff;
-  }
-}
-

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


@@ -979,7 +949,7 @@ a.donate {
   }
 }
 
   }
 }
 

-/* Rules for search results which appear in the popout sidebar */
+/* Rules for search sidebar */

 
 .search_results_entry {
   ul li {
 
 .search_results_entry {
   ul li {


@@ -1000,28 +970,8 @@ a.donate {
   color: #f00;
 }
 
   color: #f00;
 }
 

-/* Rules for data browser information which appears in the popout sidebar */
-
-#browse_content {
-  position: relative;
-  .browse_show_list.button {
-    position: absolute;
-    left: $lineheight;
-    right: $lineheight;
-    bottom: -40px;
-    margin-bottom: 0;
-  }
-  a.more-details {
-    position: absolute;
-    top: 0;
-    right: $lineheight;
-  }
-  ul li {
-    margin-bottom: 0;
-  }
-}
-

 /* Rules for entity history */
 /* Rules for entity history */

+

 #sidebar_content {
   .browse_details {
     position: relative;
 #sidebar_content {
   .browse_details {
     position: relative;


@@ -1033,7 +983,7 @@ a.donate {
   display: none;
 }
 
   display: none;
 }
 

-/* Rules for the changeset list shown by the history tab */
+/* Rules for the history sidebar */

 
 #sidebar .changesets {
   li {
 
 #sidebar .changesets {
   li {


@@ -1043,34 +993,32 @@ a.donate {
 
     &.selected { background: #FFFFE6; }
     /* color is derived from changeset bbox fillColor in history.js */
 
     &.selected { background: #FFFFE6; }
     /* color is derived from changeset bbox fillColor in history.js */

-
-    h4 {
-      padding: 0;
-    }

   }
 
   }
 

-  .comment a {
-    font-weight: 500;
-    color: #000;
+  h4 {
+    margin-top: 0;
+    a {
+      color: #000;
+    }

   }
 }
 
   }
 }
 

-/* Rules for the data browser */
+/* Rules for the browse sidebar */

 
 #sidebar_content {
   .browse-section {
 
 #sidebar_content {
   .browse-section {

-    padding: 10px 20px;
+    padding: $lineheight/2 $lineheight;

 
 

-    h4 {
-      padding: 0;
+    h4:first-child {
+      margin-top: 0;

     }
     }

+  }

 
 

-    .paginate {
-      float: right;
-      padding: 1px 6px;
-      border: 1px solid #eee;
-      border-radius: 3px;
-    }
+  .paginate {
+    float: right;
+    padding: 1px 6px;
+    border: 1px solid #eee;
+    border-radius: 3px;

   }
 
   .paginate ul {
   }
 
   .paginate ul {


@@ -1100,11 +1048,9 @@ a.donate {
 
   .browse-tag-list {
     background-color: #F6F6F6;
 
   .browse-tag-list {
     background-color: #F6F6F6;

-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
+    border: 1px solid #ddd;
+    border-radius: 3px;

     font-size: 12px;
     font-size: 12px;

-    margin-left: -$lineheight;
-    margin-right: -$lineheight;

 
     li {
       border-bottom: 1px solid #ddd;
 
     li {
       border-bottom: 1px solid #ddd;


@@ -1119,10 +1065,11 @@ a.donate {
       display: inline-block;
       width: 50%;
       float: left;
       display: inline-block;
       width: 50%;
       float: left;

-      padding: 6px 10px 6px $lineheight;
+      padding: 6px 10px;

     }
 
     .browse-tag-k {
     }
 
     .browse-tag-k {

+      font-weight: bold;

       font-weight: 500;
       background-color: #F6F6F6;
     }
       font-weight: 500;
       background-color: #F6F6F6;
     }


@@ -1132,38 +1079,46 @@ a.donate {
       background-color: #fff;
     }
   }
       background-color: #fff;
     }
   }

-}

 
 

-/* Rules for export information which appears in the popout sidebar */
+  .warning {
+    margin: $lineheight/2 0;
+    padding: $lineheight/2;
+    font-size: 90%;
+  }

 
 

-.export_bounds, .export_button {
-  text-align: center;
+  .note-comments li {
+    margin: $lineheight/2 0;
+  }

 }
 
 }
 

-.export_area_inputs {
-  margin-bottom: $lineheight/2;
-  input[type="text"] {
-    width: 80px;
-    margin-bottom: 5px;
+/* Rules for export sidebar */
+
+.export_form {
+  padding: $lineheight;
+
+  .export_area_inputs,
+  .export_button {
+    text-align: center;

   }
   }

-}

 
 

-.export_bound {
-  margin: $lineheight/4;
-}
+  .export_area_inputs {
+    margin-bottom: $lineheight/2;
+    input[type="text"] {
+      width: 80px;
+      margin-bottom: 5px;
+    }
+  }

 
 

-#export_osm {
-  span.small-title { 
-    font-weight: 500;
-    display: block;
-    font-size: 14px;
-    padding-bottom: 5px; 
+  .export_bound {
+    margin: $lineheight/4;
+  }
+
+  .export_button {
+    margin-top: $lineheight;

   }
 
   dl {
   }
 
   dl {

-    padding-left: 30px;
-    font-size: 13px;
-    color: #666;
+    padding-left: $lineheight/2;

     dd {
       margin-left: 0;
       margin-bottom: 10px;
     dd {
       margin-left: 0;
       margin-bottom: 10px;


@@ -1741,6 +1696,7 @@ a.donate {
   h2 {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
   h2 {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;

+    font-weight: bold;

     font-weight: 500;
     font-size: 12px;
     background-color: #c00;
     font-weight: 500;
     font-size: 12px;
     background-color: #c00;


@@ -1774,6 +1730,7 @@ a.donate {
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;

+    font-weight: bold;

     font-weight: 500;
     line-height: 1.5;
   }
     font-weight: 500;
     line-height: 1.5;
   }


@@ -2185,66 +2142,6 @@ a.button {
   }
 }
 
   }
 }
 

-/* Rules for the notes interface */
-
-.leaflet-popup-content .note {
-  padding-top: $lineheight/2;
-}
-
-.leaflet-popup-content .note {
-  h2 {
-    margin-bottom: $lineheight/2;
-  }
-
-  div {
-    margin-top: $lineheight/2;
-  }
-
-  .permalink {
-    position: absolute;
-    top: $lineheight/4;
-    left: $lineheight/4;
-    min-width: 15px;
-    min-height: 15px;
-  }
-
-  .permalink span {
-    display: none;
-    padding-left: $lineheight;
-  }
-
-  .permalink:hover span {
-    display: block;
-  }
-
-  .warning {
-    display: block;
-    background-color: #ffe0cc;
-    padding: 4px 6px;
-    margin-bottom: $lineheight/2;
-  }
-
-  .comment_body {
-    margin-top: 2px;
-    margin-bottom: 2px;
-
-    p {
-      margin-top: 0px;
-      margin-bottom: 0px;
-    }
-  }
-
-  .comment {
-    width: 100%;
-    height: 100px;
-  }
-
-  .buttons {
-    margin-top: $lineheight/4;
-    text-align: right;
-  }
-}
-

 /* Rules for the iD editor */
 
 .id-embed {
 /* Rules for the iD editor */
 
 .id-embed {


@@ -2541,6 +2438,7 @@ a.button {
     h1 {
       display: block;
       color: white;
     h1 {
       display: block;
       color: white;

+      font-weight: normal;

       font-weight: 300;
       font-size: 34px;
       span {
       font-weight: 300;
       font-size: 34px;
       span {