X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/66caf92bd923065064deec45cb325ee06e4131ab..0d34f27fd525def32c8809f0433f42132bd99c5e:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 735f36408..c32144128 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -86,12 +86,16 @@ h2 {
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 .sidebar-copy {
-  border-top: 1px solid #ccc;
-  padding: 0px 5px;
+  padding: 0px 10px;
 }
 
 .sidebar-copy p {
-  margin: 5px;
+  margin: 5px 0;
+}
+
+.sidebar-copy.intro {
+  margin-top: -1px;
+  border-top: 1px solid #ccc;
 }
 
 /*
@@ -101,7 +105,7 @@ h2 {
  */
 
 .sidebar-alert {
-  padding: 0px 5px 0.1px 5px;
+  padding: 4px 5px 4px 5px;
   border-top: 1px solid #ccc;
   margin-top: 4px;
   margin-bottom: -4px;
@@ -122,7 +126,7 @@ h2 {
  */
 
 .sidebar-notice {
-  padding: 0px 5px 0.1px 5px;
+  padding: 4px 5px 4px 5px;
   border-top: 1px solid #ccc;
   margin-top: 4px;
   margin-bottom: -4px;
@@ -141,7 +145,6 @@ h2 {
   padding: 5px 10px;
   margin: 4px 0;
   border-top: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
   line-height: 20px;
   font-size: 14px;
   font-weight: bold;
@@ -176,14 +179,17 @@ h2 {
 /* Rules for SOTM advert */
 
 #sotm {
-  width: 180px;
-  min-width: 180px;
-  margin: 5px;
+  width: 165px;
+  margin: 10px;
   padding: 0px;
   border: 0px;
   background: #fff;
 }
 
+#sotm img {
+  width: 165px;
+}
+
 /*
  * Rules for "optional boxes" which appear in the left sidebar on
  * certain pages. Current users are the seach box on the main page
@@ -193,7 +199,6 @@ h2 {
 .optionalbox {
   padding: 5px 10px;
   margin: 4px 0;
-  border-top: 1px solid #ccc;
 }
 
 .optionalbox h1 {
@@ -207,13 +212,6 @@ h2 {
 /* Rules for the search box */
 
 .whereami {
-  line-height: 20px;
-  vertical-align: bottom;
-}
-
-.search_container {
-  height: 15px;
-  padding-bottom: 5px;
 }
 
 #search_field form {
@@ -222,19 +220,52 @@ h2 {
   padding: 0px;
 }
 
+#search_field {
+  position:relative;
+}
+
 #search_field input[type="text"] {
-  width: 130px;
+  width: 165px;
+  padding: 5px;
+  font-size: 14px;
+  line-height: 15px;
+  height: 25px;
+  box-shadow: inset #DDD 0px 1px 3px;
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+}
+
+#search_field input[type="text"]:focus {
+  outline: none;
+  border: 1px solid #000;
 }
 
 #search_field input[type="submit"] {
-  width: 26px;
+  width: 15px;
+  height: 15px;
+  border:0;
+  text-indent:-1000px;
   padding-left: 0px;
   padding-right: 0px;
+  background: url(sprite.png);
+  position:absolute;
+  right:2px;
+  top:5px;
+  cursor:pointer;
 }
 
 .search_help {
-  margin-top: 2px;
-  margin-bottom: 0px;
+  margin:0;
+}
+
+.deemphasize {
+  color: #999;
+}
+
+.deemphasize a {
+  color: #7092FF;
 }
 
 /* Rules for donation request box */
@@ -243,13 +274,17 @@ h2 {
   width: 153px;
   margin: 10px 10px;
   padding: 5px;
-  border: 1px solid #ccc;
+  border: 1px solid #AED1A0;
   background: #cbeea7;
   line-height: 20px;
   text-align: center;
   font-size: 14px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+  border-radius: 2px;
+  -moz-border-radius: 2px;
+}
+
+.donate a {
+  color:#222;
 }
 
 /* Rules for Creative Commons logo button */
@@ -314,6 +349,15 @@ h2 {
   text-decoration: none;
 }
 
+.count-number {
+  padding: 2px 5px;
+  border-radius: 3px;
+  background: #eee;
+  margin: 0 2px;
+  font-size: 11px;
+  color: #333;
+}
+
 /* Rules for greeting bar in the top right corner */
 
 #greeting {
@@ -366,23 +410,34 @@ h2 {
 
 /* Rules for edit menu */
 
+.menuicon {
+  padding: 5px;
+
+  &:hover {
+    background: #eee;
+    text-decoration: none !important;
+  }
+}
+
 .menu {
   display: none;
   z-index: 10000;
   position: absolute;
   background-color: #ffffff;
-  border: 1px solid black;
+  border: 1px solid #cccccc;
+  border-top: 0px;
 }
 
 .menu ul {
-  margin-top: 10px;
-  margin-bottom: 10px;
-  padding-left: 10px;
-  padding-right: 10px;
+  margin: 0px;
+  padding: 0px;
 }
 
 .menu li {
+  padding: 2px 5px;
+  margin: 0px;
   list-style-type: none;
+  border-top: 1px solid #eee;
   white-space: nowrap;
 }
 
@@ -832,6 +887,10 @@ p#contributorGuidance {
 
 /* Rules for the account settings page */
 
+#accountForm {
+  margin-top: 20px;
+}
+
 #accountForm td {
   padding-bottom: 10px;
 }
@@ -883,11 +942,11 @@ p#contributorGuidance {
 
 /* Rules for the user map */
 
-.user_map .olControlPanZoomBar {
+.user_map .olControlSimplePanZoom {
   display: none;
 }
 
-.user_map .olControlPanZoom {
+.user_map .olControlZoom {
   display: block;
 }
 
@@ -916,6 +975,14 @@ p#contributorGuidance {
   font-weight: bold;
 }
 
+.inbox-row .inbox-mark-read {
+  display: none;
+}
+
+.inbox-row-unread .inbox-mark-unread {
+  display: none;
+}
+
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 #error {
@@ -1001,7 +1068,7 @@ input[type="email"],
 input[type="url"],
 input[type="password"],
 textarea {
-  border: 1px solid #888;
+  border: 1px solid #ccc;
 }
 
 /* Rules for user images */
@@ -1087,7 +1154,6 @@ abbr.geo {
     display: inline-block;
     vertical-align: top;
     background-color: #ddd;
-    margin-left: 15px;
     padding: 5px 10px 10px 10px;
     font-size: 12px;
 
@@ -1097,7 +1163,6 @@ abbr.geo {
 
     th {
       vertical-align: top;
-      padding: 0px 15px 0px 0px !important;
     }
 
     td {
@@ -1108,12 +1173,10 @@ abbr.geo {
 
     input.richtext_doedit {
       margin-top: 5px !important;
-      margin-right: 10px !important;
     }
 
     input.richtext_dopreview {
       margin-top: 5px !important;
-      margin-left: 10px !important;
     }
   }
 }