X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3d0101698055c2928ce2658c2d6f82326e9fa67e..888a0be7902750d9af2e5fb87812f9c8a40cf1b7:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 4d53bd2ac..b5e7af5dd 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -85,11 +85,12 @@ h2 {
 
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
-#intro {
+.sidebar-copy {
   border-top: 1px solid #ccc;
+  padding: 0px 5px;
 }
 
-#intro p {
+.sidebar-copy p {
   margin: 5px;
 }
 
@@ -99,16 +100,19 @@ h2 {
  * undergoing maintenance.
  */
 
-#alert {
-  width: 170px;
-  margin: 5px;
-  padding: 5px;
-  border: 1px solid #ccc;
-  background: #d00;
-  line-height: 1.2em;
-  font-size: 14px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+.sidebar-alert {
+  padding: 4px 5px 4px 5px;
+  border-top: 1px solid #ccc;
+  margin-top: 4px;
+  margin-bottom: -4px;
+  background: #e00;
+  font-size: 13px;
+  font-weight: bold;
+  line-height: 17px;
+
+  p {
+    margin: 5px;
+  }
 }
 
 /*
@@ -117,22 +121,24 @@ h2 {
  * donation drives.
  */
 
-.notice {
-  width: 170px;
-  margin: 5px;
-  padding: 5px;
-  border: 1px solid #ccc;
+.sidebar-notice {
+  padding: 4px 5px 4px 5px;
+  border-top: 1px solid #ccc;
+  margin-top: 4px;
+  margin-bottom: -4px;
   background: #ea0;
-  line-height: 20px;
-  font-size: 14px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+  font-size: 13px;
+  line-height: 17px;
+
+  p {
+    margin: 5px;
+  }
 }
 
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {
-  padding: 5px;
+  padding: 5px 10px;
   margin: 4px 0;
   border-top: 1px solid #ccc;
   border-bottom: 1px solid #ccc;
@@ -156,6 +162,13 @@ h2 {
   padding: 0px;
 }
 
+/* submenus */
+.left_menu ul li ul {
+  font-weight: normal;
+  line-height: 15px;
+  font-size: 12px;
+}
+
 .left_menu a {
   color: #000;
 }
@@ -178,7 +191,7 @@ h2 {
  */
 
 .optionalbox {
-  padding: 5px;
+  padding: 5px 10px;
   margin: 4px 0;
   border-top: 1px solid #ccc;
 }
@@ -198,11 +211,6 @@ h2 {
   vertical-align: bottom;
 }
 
-.search_container {
-  height: 15px;
-  padding-bottom: 5px;
-}
-
 #search_field form {
   width: 100%;
   margin: 0px;
@@ -210,7 +218,7 @@ h2 {
 }
 
 #search_field input[type="text"] {
-  width: 136px;
+  width: 130px;
 }
 
 #search_field input[type="submit"] {
@@ -227,8 +235,8 @@ h2 {
 /* Rules for donation request box */
 
 .donate {
-  width: 155px;
-  margin: 10px 5px;
+  width: 153px;
+  margin: 10px 10px;
   padding: 5px;
   border: 1px solid #ccc;
   background: #cbeea7;
@@ -248,11 +256,15 @@ h2 {
 
 /* Rules for tabbed navigation bar */
 
+#top-bar {
+  border-bottom: 1px solid #ccc;
+  height: 29px;
+}
+
 #tabnav {
-  height: 20px;
-  margin: 0px;
-  padding-top: 5px;
-  background: image-url('tab_bottom.gif') repeat-x bottom;
+  padding: 0;
+  margin: 0;
+  overflow:hidden;
 }
 
 #tabnav li {
@@ -263,47 +275,47 @@ h2 {
 }
 
 #tabnav a, #tabnav a:link, #tabnav a:visited {
-  background: #f3f3f3;
-  font-size: 13px;
-  line-height: 14px;
+  background: #fff;
+  font-size: 14px;
+  line-height: 19px;
   font-weight: bold;
-  padding: 2px 10px;
-  border: 1px solid #ccc;
+  padding: 5px 10px;
   text-decoration: none;
   color: #333;
-  border-top-right-radius: 5px;
-  -moz-border-radius-topright: 5px;
-  border-top-left-radius: 5px;
-  -moz-border-radius-topleft: 5px;
 }
 
 #tabnav a:link.active, #tabnav a:visited.active {
-  border-bottom: 1px solid #fff;
-  background: #fff;
+  border-bottom: 1px solid #aaa;
+  background: #9ed485;
   color: #000;
 }
 
 #tabnav a:link:hover, #tabnav a:visited:hover {
-  background: #fff;
+  text-decoration:underline;
 }
 
 #tabnav a:link.disabled,
 #tabnav a:visited.disabled,
 #tabnav a:link:hover.disabled,
 #tabnav a:visited:hover.disabled {
-  background: #bbbbbb;
-  color: white
+  color: #ccc;
+  cursor: default;
+}
+
+#tabnav a:link.disabled:hover,
+#tabnav a:visited.disabled:hover,
+#tabnav a:link:hover.disabled:hover,
+#tabnav a:visited:hover.disabled:hover {
+  text-decoration: none;
 }
 
 /* Rules for greeting bar in the top right corner */
 
 #greeting {
-  height: 20px;
+  height: 28px;
   margin: 0px;
-  padding-top: 5px;
   font-size: 13px;
-  line-height: 15px;
-  background: image-url('tab_bottom.gif') repeat-x bottom;
+  line-height: 28px;
 }
 
 .greeting-bar-unread {
@@ -349,23 +361,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;
 }
 
@@ -870,7 +893,7 @@ p#contributorGuidance {
   display: none;
 }
 
-.user_map .olControlPanZoom {
+.user_map .olControlZoom {
   display: block;
 }
 
@@ -1036,3 +1059,63 @@ abbr.geo {
   vertical-align: text-bottom;
   border: 0;
 }
+
+/* Rules for rich text editors */
+
+.richtext_container {
+  white-space: nowrap;
+
+  .richtext_content {
+    display: inline-block;
+    vertical-align: top;
+
+    .richtext_preview {
+      display: inline-block;
+      margin-top: 1px;
+      margin-bottom: 1px;
+      border: 4px solid #eee;
+      background-color: #eee;
+      white-space: normal;
+
+      &.loading {
+        background-image: image-url("loading.gif");
+        background-repeat: no-repeat;
+        background-position: center;
+      }
+
+      > :first-child {
+        margin-top: 0px;
+      }
+    }
+  }
+
+  .richtext_help {
+    display: inline-block;
+    vertical-align: top;
+    background-color: #ddd;
+    padding: 5px 10px 10px 10px;
+    font-size: 12px;
+
+    p {
+      margin: 0px;
+    }
+
+    th {
+      vertical-align: top;
+    }
+
+    td {
+      font-family: fixed;
+      line-height: 16px;
+      padding: 0px !important;
+    }
+
+    input.richtext_doedit {
+      margin-top: 5px !important;
+    }
+
+    input.richtext_dopreview {
+      margin-top: 5px !important;
+    }
+  }
+}