Fix browse overlay status messages

[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 c97870954c89dcd570d191e755ceef22a29e7426..451d4594859fe1531738372de40726b877f2ec89 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -115,6 +115,7 @@ body {
   margin: 0px;
   padding: 0px;
   text-align: left;
   margin: 0px;
   padding: 0px;
   text-align: left;

+  height: 100%;

 }
 
 body.slim {
 }
 
 body.slim {


@@ -145,6 +146,8 @@ small, aside {
   font-size: 12px;
 }
 
   font-size: 12px;
 }
 

+#container { position: relative; }
+

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


@@ -181,6 +184,7 @@ small, aside {
 .icon.clipboard   { background-position: -160px 0; }
 .icon.link        { background-position: -180px 0; }
 .icon.close       { background-position: -200px 0; }
 .icon.clipboard   { background-position: -160px 0; }
 .icon.link        { background-position: -180px 0; }
 .icon.close       { background-position: -200px 0; }

+.icon.close:hover { background-position: -200px -20px; }

 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
 .icon.gear        { background-position: -260px 0; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
 .icon.gear        { background-position: -260px 0; }


@@ -236,10 +240,21 @@ table {
 
 /* Rules for the header */
 
 
 /* Rules for the header */
 

+#menu-icon { 
+  display: none !important;
+  float: right;
+  background: image-url("menu-icon.png") no-repeat;
+  background-size: 30px 30px;
+  display: block;
+  width: 30px;
+  height: 30px;
+  margin: 14px 10px 0 0;
+  opacity: 0.6;
+}
+

 header {
   height: $headerHeight;
   position: relative;
 header {
   height: $headerHeight;
   position: relative;

-  // border-bottom: $keyline;

   z-index: 1001;
   font-size: 13px;
 
   z-index: 1001;
   font-size: 13px;
 


@@ -286,11 +301,10 @@ nav.primary {
 
     > li {
       border-right: $border;
 
     > li {
       border-right: $border;

+      float: left;

       &:last-child { 
         border-right: 0;
       &:last-child { 
         border-right: 0;

-        > a { border-radius: 0 $border-radius $border-radius 0; } 

       }
       }

-      &:first-child > a { border-radius: $border-radius 0 0 $border-radius; }

       > a:hover { background: lighten($green, 30%); }
       &.current > a:hover { background: $green; }
       &.disabled > a:hover { background: lighten($green, 38%); }
       > a:hover { background: lighten($green, 30%); }
       &.current > a:hover { background: $green; }
       &.disabled > a:hover { background: lighten($green, 38%); }


@@ -344,14 +358,16 @@ nav.secondary {
   position: absolute;
   right: 0;
 
   position: absolute;
   right: 0;
 

-  > ul a,
-  .dropdown-toggle {
-    display: inline-block;
-    text-decoration: none;
-    color: $darkgrey;
-    padding: 5px;
+  > ul {
+    vertical-align: middle;
+    a, .dropdown-toggle {
+      display: inline-block;
+      text-decoration: none;
+      color: $darkgrey;
+      padding: 5px;

 
 

-    &:hover { color: darken($darkgrey, 10%); }
+      &:hover { color: darken($darkgrey, 10%); }
+    }

   }
 
   > ul li.current a {
   }
 
   > ul li.current a {


@@ -368,6 +384,7 @@ nav.secondary {
 
     > li {
       border-right: $border;
 
     > li {
       border-right: $border;

+      float: left;

       &:last-child { 
         border-right: 0;
 
       &:last-child { 
         border-right: 0;
 


@@ -381,6 +398,7 @@ nav.secondary {
 
     a {
       padding: 5px 15px;
 
     a {
       padding: 5px 15px;

+

     }
 
     &.logged-in > a {
     }
 
     &.logged-in > a {


@@ -388,7 +406,9 @@ nav.secondary {
       > .user-button {
         padding: 5px 10px 5px 6px;
         display: inline-block;
       > .user-button {
         padding: 5px 10px 5px 6px;
         display: inline-block;

+        color: $darkgrey;

       }
       }

+      &:hover > .user-button { color: darken($darkgrey, 5%); }

     }
   }
 
     }
   }
 


@@ -417,7 +437,8 @@ nav.secondary {
 
   .dropdown-menu {
     left: auto;
 
   .dropdown-menu {
     left: auto;

-    right: 0;
+    right: -1px;
+    border-radius: 3px 0 3px 3px;

 
     .count-number {
       float: right;
 
     .count-number {
       float: right;


@@ -427,12 +448,30 @@ nav.secondary {
   }
 }
 
   }
 }
 

+#compact-secondary-nav {
+  display: none;
+  ul li a {
+    width: 100%;
+    color: #333;
+    &:hover { color: #fff; }
+  }
+}
+
+@media only screen and (max-width:960px) {
+  #compact-secondary-nav {
+    display: inline-block;
+  }
+  .compact-hide {
+    display: none;
+  }
+}
+

 /* Utility for styling notification numbers */
 
 .count-number {
   padding: 2px $lineheight/4;
   border-radius: 2px;
 /* Utility for styling notification numbers */
 
 .count-number {
   padding: 2px $lineheight/4;
   border-radius: 2px;

-  background: #d7d7ff;
+  background: lighten($green, 30%);

   margin: 0 2px;
   font-size: 11px;
   color: #333;
   margin: 0 2px;
   font-size: 11px;
   color: #333;


@@ -599,6 +638,7 @@ nav.secondary {
   #sidebar {
     float: left;
     width: $sidebarWidth;
   #sidebar {
     float: left;
     width: $sidebarWidth;

+    background: #fff;

 
     h2, h3, h4 {
       padding: $lineheight $lineheight $lineheight/2;
 
     h2, h3, h4 {
       padding: $lineheight $lineheight $lineheight/2;


@@ -613,42 +653,42 @@ nav.secondary {
     .icon.close {
       position: absolute;
       right: $lineheight;
     .icon.close {
       position: absolute;
       right: $lineheight;

+      cursor: pointer;

     }
 
     }
 

-    .footer {
-      position: absolute;
-      bottom: 0;
-    }
-
-    p.credits {
-      font-size: 11px;
-      color: #999;
-
-      a {
-        color: #666;
-      }
-    }
-
-    p.large-text {
-      font-size: 1.7em;
-      line-height: 1.4em;
-      font-weight: 300;
-    }
+    -webkit-transition: margin 300ms linear;
+       -moz-transition: margin 300ms linear;
+            transition: margin 300ms linear;

   }
 
   }
 

-  #sidebar.minimized {
+  .overlay-sidebar #sidebar {

     position: absolute;
     z-index: 1000;
     height: auto;
     position: absolute;
     z-index: 1000;
     height: auto;

-    border-right: none;
+    border-radius: 5px;
+    overflow: hidden;
+    margin-top: $typeheight;
+    margin-left: $typeheight;
+  }

 
 

-    #sidebar_content {
-      display: none;
+  .welcome {
+    p {
+      padding: $lineheight/2 $lineheight $lineheight;
+      font-size: 110%;
+      font-weight: 300;

     }
 
     }
 

-    #search_form {
-      background: none;
-      width: 78%;
+    .button {
+      width: 50%;
+      float: left;
+      margin: 0;
+      border-radius: 0;
+      font-weight: 400;
+      padding: .6em;
+
+      &.learn-more {
+        border-right: 1px solid #fff;
+      }

     }
   }
 
     }
   }
 


@@ -707,23 +747,22 @@ nav.secondary {
       
       label {
         position: absolute;
       
       label {
         position: absolute;

-        top: 10px;
-        left: 8px;
+        top: 0;
+        left: 0;

         padding: 2px 6px;
         padding: 2px 6px;

-        border-radius: 3px;
+        border-bottom-right-radius: 3px;

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

-        background: rgba(255,255,255,.8);
+        background: rgba(255,255,255,.9);

         text-shadow:
          -2px -2px 1px #fff,  
           2px -2px 1px #fff,
           -2px 2px 1px #fff,
            2px 2px 1px #fff;
         input[type="radio"] {
         text-shadow:
          -2px -2px 1px #fff,  
           2px -2px 1px #fff,
           -2px 2px 1px #fff,
            2px 2px 1px #fff;
         input[type="radio"] {

-          vertical-align: middle;
-          margin-bottom: 4px;
+          display: none;

         }
       }
 
         }
       }
 


@@ -798,7 +837,7 @@ nav.secondary {
   }
 }
 
   }
 }
 

-.leaflet-top.leaflet-right {
+.leaflet-top {

   top: $lineheight !important;
   .leaflet-control {
     margin-right: 0px !important;
   top: $lineheight !important;
   .leaflet-control {
     margin-right: 0px !important;


@@ -832,6 +871,8 @@ nav.secondary {
   text-align: center;
 }
 
   text-align: center;
 }
 

+.donate-attr { color: darken($green, 10%) !important; }
+

 /* Rules for the sidebar */
 
 .sidebar_heading {
 /* Rules for the sidebar */
 
 .sidebar_heading {


@@ -846,13 +887,13 @@ nav.secondary {
   }
 }
 
   }
 }
 

-#sidebar_content {
-  position: absolute;
-  top: 50px;
-  bottom: 0;
-  width: 100%;
-  overflow-y: auto;
+#browse_status {
+  p {
+    padding: $lineheight;
+  }
+}

 
 

+#sidebar_content {

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


@@ -866,7 +907,7 @@ nav.secondary {
 
 #search_form {
   position: relative;
 
 #search_form {
   position: relative;

-  padding: $lineheight/2 $lineheight;
+  padding: $lineheight/2;

   background-color: $lightgrey;
 
   #query_wrapper {
   background-color: $lightgrey;
 
   #query_wrapper {


@@ -1023,7 +1064,17 @@ a.donate {
     border-bottom: $keyline;
     cursor: pointer;
 
     border-bottom: $keyline;
     cursor: pointer;
 

-    &.selected { background: lighten($green, 35%); }
+    &.selected { background: #FFFFE6; }
+    /* color is derived from changeset bbox fillColor in history.js */
+
+    h4 {
+      padding: 0;
+    }
+  }
+
+  .comment a {
+    font-weight: 500;
+    color: #000;

   }
 }
 
   }
 }
 


@@ -1036,6 +1087,13 @@ a.donate {
     h4 {
       padding: 0;
     }
     h4 {
       padding: 0;
     }

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

   }
 
   .paginate ul, .note-comments ul {
   }
 
   .paginate ul, .note-comments ul {


@@ -1064,12 +1122,15 @@ a.donate {
   }
 
   .browse-tag-list {
   }
 
   .browse-tag-list {

-    border: 1px solid #CCC;
-    border-radius: 4px;
+    background-color: #F6F6F6;
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;

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

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

 
     li {
 
     li {

-      border-bottom: 1px solid #CCC;
+      border-bottom: 1px solid #ddd;

     }
 
     li:last-child {
     }
 
     li:last-child {


@@ -1080,40 +1141,25 @@ a.donate {
     .browse-tag-v {
       display: inline-block;
       width: 50%;
     .browse-tag-v {
       display: inline-block;
       width: 50%;

-      height: 30px;

       float: left;
       float: left;

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

     }
 
     .browse-tag-k {
       font-weight: 500;
       background-color: #F6F6F6;
     }
 
     .browse-tag-k {
       font-weight: 500;
       background-color: #F6F6F6;

-      border-radius: 4px 0 0 4px;

     }
 
     .browse-tag-v {
     }
 
     .browse-tag-v {

-      border-left: 1px solid #CCC;
-    }
-  }
-}
-
-/* Rules for the changeset details */
-
-#sidebar_content {
-  .browse-section.header {
-    padding: 20px;
-    border-bottom: 1px solid #ccc;
-
-    h2 {
-      padding: 0 0 5px 0;
-      border-bottom: none;
+      border-left: 1px solid #ddd;
+      background-color: #fff;

     }
   }
 }
 
 /* Rules for export information which appears in the popout sidebar */
 
     }
   }
 }
 
 /* Rules for export information which appears in the popout sidebar */
 

-.export_bounds {
+.export_bounds, .export_button {

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


@@ -1238,12 +1284,6 @@ a.donate {
   }
 }
 
   }
 }
 

-@media only screen and (max-width:900px) {
-  .header-illustration.new-user-arm {
-    display: none;
-  }
-}
-

 #content.maximised {
   top: 0;
   left: 0;
 #content.maximised {
   top: 0;
   left: 0;


@@ -2279,6 +2319,7 @@ a.button {
   list-style: none;
   background-color: #ffffff;
   border: 1px solid #ccc;
   list-style: none;
   background-color: #ffffff;
   border: 1px solid #ccc;

+  border-radius: 0 3px 3px;

   *border-right-width: 2px;
   *border-bottom-width: 2px;
   -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
   *border-right-width: 2px;
   *border-bottom-width: 2px;
   -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);


@@ -2444,7 +2485,8 @@ a.button {
 }
 
 .site-about #content {
 }
 
 .site-about #content {

-  background-color: #000;
+  //background-color: #000;
+  background-color: #eee;

   background-position: 50% 50%;
   background-repeat: no-repeat;
   background-size: cover;
   background-position: 50% 50%;
   background-repeat: no-repeat;
   background-size: cover;


@@ -2577,9 +2619,16 @@ a.button {
     &.local        { background-position: 0px    0px; }
     &.community    { background-position: 0px  -40px; }
     &.open         { background-position: 0px  -80px; }
     &.local        { background-position: 0px    0px; }
     &.community    { background-position: 0px  -40px; }
     &.open         { background-position: 0px  -80px; }

-    &.contributors { background-position: 0px -120px; }
+    &.partners     { background-position: 0px -120px; }

     &.infringement { background-position: 0px -160px; }
   }
 }
 
 @import 'browse';
     &.infringement { background-position: 0px -160px; }
   }
 }
 
 @import 'browse';

+
+@media only screen and (max-width:960px) {
+  .header-illustration.new-user-arm {
+    display: none;
+  }
+}
+