X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ad60ee5c9c9fbb760d54c94448ba96a790e78a71..f26e417cf4d2640b93e066c9138814e24c171ee4:/app/assets/stylesheets/common.css.scss?ds=inline

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 78126bb88..2adabb5e1 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -87,9 +87,6 @@ abbr, acronym {
 .margin11 { margin-left:91.6666%; }
 .margin12 { margin-left:100.0000%; }
 
-.pad1 { padding: $lineheight/2; }
-.pad2 { padding: $lineheight; }
-
 .fillL { background-color: white; }
 /* Default rules for the body of every page */
 
@@ -205,6 +202,7 @@ h6:first-child {
 .icon.close       { background-position: -200px 0; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
+.icon.gear        { background-position: -260px 0; }
 
 /* Rules for links */
 
@@ -475,7 +473,11 @@ a.donate {
   height: 30px;
   border-bottom: 1px solid #ccc;
   background: white;
-  z-index: 100;
+  z-index: 1001;
+
+  .caret {
+    margin-top: 10px;
+  }
 }
 
 .site-edit #top-bar,
@@ -489,47 +491,55 @@ a.donate {
 
 #tabnav {
   height: 29px;
-  margin-bottom:0;
-  overflow: hidden;
-  li {
-    display: inline;
-  }
-  a, a:link, a:visited {
+  margin-bottom: 0;
+
+  > li {
     float: left;
+
+    > * {
+      padding: 3px $lineheight/2;
+    }
+  }
+
+  a.tab {
+    display: inline-block;
     font-weight: bold;
-    padding: 3px $lineheight/2;
     text-decoration: none;
     color: #333;
-    float: left;
-    margin-right: 1px;
+
     -webkit-transition: color 200ms ease-in;
        -moz-transition: color 200ms ease-in;
          -o-transition: color 200ms ease-in;
             transition: color 200ms ease-in;
+
+    &:hover {
+      text-decoration: underline;
+    }
   }
-}
 
-.site-index #tabnav a#viewanchor,
-.site-edit #tabnav a#editanchor,
-.changeset-list #tabnav a#historyanchor {
-  border-bottom: 1px solid #aaa;
-  background: #9ed485;
-  color: #000;
-}
+  .disabled a {
+    color: #ccc;
+    cursor: default;
 
-#tabnav a:link:hover, #tabnav a:visited:hover {
-  text-decoration: underline;
-}
+    &:hover {
+      text-decoration: none;
+    }
 
-#tabnav a:link.disabled,
-#tabnav a:visited.disabled,
-#tabnav a:link:hover.disabled,
-#tabnav a:visited:hover.disabled {
-  color: #ccc;
-  cursor: default;
-  &:hover {
-    text-decoration: none;
+    .caret {
+      border-top-color: #ccc;
+    }
   }
+
+  .dropdown {
+    height: 29px;
+  }
+}
+
+.site-index #view_tab,
+.site-edit #edit_tab,
+.changeset-list #history_tab {
+  background: #9ed485;
+  color: #000;
 }
 
 /* Utility for styling notification numbers */
@@ -547,12 +557,52 @@ a.donate {
 
 #greeting {
   float: right;
-  padding-top: 3px;
-  margin-right: $lineheight/4;
-}
+  height: 100%;
 
-.greeting-bar-unread {
-  font-weight: bold;
+  &.secondary-actions {
+    padding: 3px $lineheight/2;
+  }
+
+  &.dropdown {
+    background-color: #EEE;
+    &:hover {
+      background-color: #CCC;
+    }
+  }
+
+  img {
+    vertical-align: top;
+    border-radius: 2px 0 0 2px;
+    margin-right: 5px;
+  }
+
+  #inboxanchor {
+    display: inline-block;
+    position: relative;
+    height: 20px;
+    top: -2px;
+    margin: 0 2px 0 0;
+    padding: 0 5px 0 0;
+    border-radius: 2px;
+  }
+
+  .dropdown-toggle {
+    display: block;
+    padding: 3px 7px;
+    color: #000;
+    text-decoration: none;
+  }
+
+  .dropdown-menu {
+    left: auto;
+    right: 0;
+
+    .count-number {
+      float: right;
+      padding: 0 5px;
+      margin: 0;
+    }
+  }
 }
 
 /* Rules for the message shown in place of the map when javascript is disabled */
@@ -909,7 +959,6 @@ a.donate {
 .sidebar_heading {
   position: relative;
   padding: $lineheight/2 $lineheight;
-  z-index: 9999;
   background: $offwhite;
   border-bottom: 1px solid #ccc;
   h4 {
@@ -1033,6 +1082,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 #content {
   position: relative;
+  padding: $lineheight;
 }
 
 .site-edit #content,
@@ -1046,45 +1096,66 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 /* Overrides for pages that use new layout conventions */
-.site-verifysignup,
+.user-new,
+.user-create,
+.user-terms,
+.user-confirm,
 .site-copyright,
 .site-welcome {
   #content {
     max-width: 740px;
   }
 }
-.user-new #content.pad2 {
-    padding: 0;
+
+.user-new,
+.user-create,
+.user-terms,
+.user-confirm {
+  .content-heading {
+    height: 200px;
   }
+}
 
-.user-new .content-heading {
-  height: 200px;  
+.user-new,
+.user-create,
+.user-terms {
+  #content {
+    padding: 0;
+  }
 }
 
-.header-illustration { 
+.header-illustration {
   background-position: 0 0;
   background-repeat: no-repeat;
   position: absolute;
-}
-
-.header-illustration.new-user-main {
   height: 200px;
   width: 100%;
   left: 0;
   bottom: 0;
-  background-image: image-url("sign-up-illustration.png");
-}
 
-.header-illustration.new-user-arm {
-  height: 110px;
-  width: 130px;
-  left: 260px;
-  top: 160px;
-  background-image: image-url("sign-up-illustration-arm.png");
+  &.new-user-main {
+    background-image: image-url("sign-up-illustration.png");
+  }
+
+  &.confirm-main {
+    background-image: image-url("confirm-illustration.png");
+  }
+
+  &.new-user-terms {
+    background-image: image-url("terms-illustration.png");
+  }
+
+  &.new-user-arm {
+    height: 110px;
+    width: 130px;
+    left: 260px;
+    top: 160px;
+    background-image: image-url("sign-up-illustration-arm.png");
+  }
 }
 
-@media only screen and (max-width:770px) {
-  .new-user-illustration.new-user-arm { display: none;}
+@media only screen and (max-width:900px) {
+  .header-illustration.new-user-arm { display: none;}
 }
 
 .wrapper {
@@ -1273,11 +1344,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
 }
 
-#browse_map .geolink {
-  display: none;
-}
-
 #browse_map .secondary-actions {
+  display: none;
   margin-bottom: $lineheight/2;
 }
 
@@ -1514,7 +1582,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Rules for the account confirmation page */
 
-#terms {
+.user-terms {
   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;
@@ -1536,27 +1604,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     }
   }
 
-  form.sign {
-    input[type=submit] {
-      float: left;
-    }
-    #decline {
-      background: $lightblue;
-      &:hover {
-        background: darken($lightblue, $hovercolor);
-      }
+  #decline {
+    background: $lightblue;
+    &:hover {
+      background: darken($lightblue, $hovercolor);
     }
   }
-  fieldset {
-    margin-bottom: $lineheight;
-  }
-  #contributorGuidance {
-    background-color: $offwhite;
-    border-radius: 4px;
-    -moz-border-radius: 4px;
-  }
-  .signing-buttons {
-    height: 50px;
+
+  .form-row {
+    margin: auto;
+    max-width: 370px;
   }
 }
 
@@ -1708,7 +1765,17 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .field_with_errors {
   padding: 2px;
   background-color: #ff7070;
-  display: table;
+  display: inline-block;
+}
+
+.formError {
+  display: inline-block;
+  padding: 5px 10px;
+  margin-top: 5px;
+  border-radius: 4px;
+  font-size: 12px;
+  color: #fff;
+  background-color: #ff7070;
 }
 
 /* Rules for rails validation error boxes */
@@ -1775,6 +1842,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     padding-top: $lineheight;
     border-top: 1px solid $lightgrey;
   }
+  .horizontal-list .form-row { 
+    float: left;
+    padding-right: 10px;
+  }
   .form-row {
     margin-bottom: $lineheight/2;
   }
@@ -1869,7 +1940,7 @@ ul.secondary-actions {
     display: inline-block;
     margin-right: 60px;
   }
-  li {
+  > li {
     display: block;
     float: left;
     list-style: none;
@@ -1884,6 +1955,10 @@ ul.secondary-actions {
       margin-right: 0px;
     }
   }
+  .dropdown-menu {
+    left: auto;
+    right: 0;
+  }
 }
 
 /* Utility for managing inner content areas */
@@ -1894,6 +1969,8 @@ ul.secondary-actions {
 
 .inner11 { padding: $lineheight/2;}
 
+.inner20 { padding: $lineheight 0;}
+
 .inner02 { padding: 0 $lineheight;}
 
 /* Utility for general button styles */
@@ -2268,23 +2345,132 @@ a.button {
   background: #fff;
 }
 
-/* Rules for the "Verify signup" page */
-.site-verifysignup .content-heading { 
-  height: 200px;  
+/* Rules for dropdown menus */
+
+.dropdown {
+  position: relative;
 }
 
-.header-illustration.verify-main { 
-  background-position: 0 0;
-  background-repeat: no-repeat;
-  position: absolute;
+.dropdown-toggle {
+  *margin-bottom: -3px;
 }
 
-.header-illustration.verify-main {
-  height: 200px;
-  width: 100%;
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+}
+
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
   left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 10px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+}
+
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  outline: 0;
+}
+
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
+}
+
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+  background-image: none;
+}
+
+.open {
+  *z-index: 1000;
+}
+
+.open > .dropdown-menu {
+  display: block;
+}
+
+.dropdown-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
   bottom: 0;
-  background-image: image-url("verify-illustration.png");
+  left: 0;
+  z-index: 990;
 }
 
 /* Rules for the "Welcome" page */
@@ -2297,10 +2483,6 @@ a.button {
     }
   }
 
-  .drop {
-    margin-top: 20px;
-  }
-
   .sprite {
     background-image: image-url("welcome-sprite.png");
     background-size: 500px 250px;
@@ -2310,8 +2492,8 @@ a.button {
 
   .icon-list { 
     padding-bottom: 20px;
-  div { 
-    margin-bottom: 10px;
+    div {
+      margin-bottom: 10px;
       p {
         padding-top: 10px;
       }
@@ -2339,7 +2521,7 @@ a.button {
     background-position: -150px 0;
   }
 
-  .sprite.changeset {
+  .sprite.tag {
     background-position: -200px 0;
   }
 
@@ -2361,6 +2543,12 @@ a.button {
   }
 
   .note-box {
+    margin-top: 20px;
     background-color: $offwhite;
   }
+
+  .icon.note {
+    background-color: #333;
+    border-radius: 4px;
+  }
 }