Merge branch 'redesign'

[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 ebc5109c6335b4825ff9aa3811467590aba547b4..56285564fdd9794b41e1e48d90a1da787de4252c 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -38,7 +38,6 @@ abbr, acronym {
 
 strong {
   font-weight: bold;
 
 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/ */


@@ -110,13 +109,11 @@ body.slim {
 }
 
 h1, h2, h3 {
 }
 
 h1, h2, h3 {

-  font-weight: bold;
-  font-weight: 500;
+  font-weight: 600;

   line-height: 1.2;
 }
 
 h4, h5 {
   line-height: 1.2;
 }
 
 h4, h5 {

-  font-weight: bold;

   font-weight: 500;
 }
 
   font-weight: 500;
 }
 


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

-    font-weight: bold;
-    font-weight: 500;
+    font-weight: 600;

     vertical-align: top;
   }
   td {
     vertical-align: top;
   }
   td {


@@ -310,7 +306,6 @@ 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;


@@ -357,7 +352,7 @@ nav.secondary {
       display: inline-block;
       text-decoration: none;
       color: $darkgrey;
       display: inline-block;
       text-decoration: none;
       color: $darkgrey;

-      padding: 3px 5px 5px 5px;
+      padding: 5px;

 
       &:hover { color: darken($darkgrey, 25%); }
     }
 
       &:hover { color: darken($darkgrey, 25%); }
     }


@@ -632,7 +627,7 @@ nav.secondary {
     float: left;
     width: $sidebarWidth;
     background: #fff;
     float: left;
     width: $sidebarWidth;
     background: #fff;

-    font-size: 13px;
+    font-size: 12px;

 
     h2 {
       padding: $lineheight $lineheight $lineheight/2;
 
     h2 {
       padding: $lineheight $lineheight $lineheight/2;


@@ -641,6 +636,7 @@ nav.secondary {
     h3, h4 {
       margin-top: $lineheight;
       margin-bottom: $lineheight/2;
     h3, h4 {
       margin-top: $lineheight;
       margin-bottom: $lineheight/2;

+      font-size: 13px;

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


@@ -671,7 +667,6 @@ 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;
     }
 


@@ -757,8 +752,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-weight: 600;

         font-size: 16px;
         text-stroke: 2px #fff;
         background: rgba(255,255,255,.9);
         font-size: 16px;
         text-stroke: 2px #fff;
         background: rgba(255,255,255,.9);


@@ -1034,7 +1028,7 @@ header .search_form {
     }
   }
 
     }
   }
 

-  :last-child {
+  .browse-section:last-of-type {

     border-bottom: none;
   }
 
     border-bottom: none;
   }
 


@@ -1093,7 +1087,6 @@ header .search_form {
     }
 
     .browse-tag-k {
     }
 
     .browse-tag-k {

-      font-weight: bold;

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


@@ -1119,6 +1112,7 @@ header .search_form {
   }
 
   .note-description {
   }
 
   .note-description {

+    overflow: hidden;

     margin: 0 0 10px 10px;
   }
 }
     margin: 0 0 10px 10px;
   }
 }


@@ -1188,6 +1182,7 @@ header .search_form {
 
   #map {
     height: 100%;
 
   #map {
     height: 100%;

+    overflow: hidden;

   }
 }
 
   }
 }
 


@@ -1746,7 +1741,6 @@ header .search_form {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
     font-weight: bold;
     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;
     color: #fff;
     font-size: 12px;
     background-color: #c00;
     color: #fff;


@@ -1780,7 +1774,6 @@ header .search_form {
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     font-weight: bold;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     font-weight: bold;

-    font-weight: 500;

     line-height: 1.5;
   }
   label.standard-label.secondary {
     line-height: 1.5;
   }
   label.standard-label.secondary {


@@ -2486,7 +2479,6 @@ 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 {