Improve styling of alert boxes to match new sidebar styling

[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 d7424fb74cc3b5f3634201e8376ec3616e2c5b56..fe0e074b9fc35a522af3cfcdbfff1a40a76218e9 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -50,6 +50,8 @@ h2 {
   position: absolute;
   top: 0px;
   width: 185px;
   position: absolute;
   top: 0px;
   width: 185px;

+  font-size: 11px;
+  line-height: 12px;

 }
 
 /* Rules for the OpenStreetMap logo in the top left corner */
 }
 
 /* Rules for the OpenStreetMap logo in the top left corner */


@@ -83,13 +85,12 @@ h2 {
 
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 
 /* Rules for the introductory text displayed in the left sidebar to new users */
 

-#intro {
-  font-size: 11px;
-  line-height: 12px;
+.sidebar-copy {

   border-top: 1px solid #ccc;
   border-top: 1px solid #ccc;

+  padding: 0px 5px;

 }
 
 }
 

-#intro p {
+.sidebar-copy p {

   margin: 5px;
 }
 
   margin: 5px;
 }
 


@@ -99,16 +100,19 @@ h2 {
  * undergoing maintenance.
  */
 
  * 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: 0px 5px 0.1px 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;
+  }

 }
 
 /*
 }
 
 /*


@@ -132,7 +136,7 @@ h2 {
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {

-  padding: 10px;
+  padding: 5px 10px;

   margin: 4px 0;
   border-top: 1px solid #ccc;
   border-bottom: 1px solid #ccc;
   margin: 4px 0;
   border-top: 1px solid #ccc;
   border-bottom: 1px solid #ccc;


@@ -141,10 +145,6 @@ h2 {
   font-weight: bold;
 }
 
   font-weight: bold;
 }
 

-.left_menu td {
-  font-size: 12px;
-}
-

 .left_menu h1 {
   font-style: normal;
   font-size: 15px;
 .left_menu h1 {
   font-style: normal;
   font-size: 15px;


@@ -160,6 +160,13 @@ h2 {
   padding: 0px;
 }
 
   padding: 0px;
 }
 

+/* submenus */
+.left_menu ul li ul {
+  font-weight: normal;
+  line-height: 15px;
+  font-size: 12px;
+}
+

 .left_menu a {
   color: #000;
 }
 .left_menu a {
   color: #000;
 }


@@ -182,11 +189,9 @@ h2 {
  */
 
 .optionalbox {
  */
 
 .optionalbox {

-  padding: 5px;
+  padding: 5px 10px;

   margin: 4px 0;
   border-top: 1px solid #ccc;
   margin: 4px 0;
   border-top: 1px solid #ccc;

-  line-height: 15px;
-  font-size: 12px;

 }
 
 .optionalbox h1 {
 }
 
 .optionalbox h1 {


@@ -216,7 +221,7 @@ h2 {
 }
 
 #search_field input[type="text"] {
 }
 
 #search_field input[type="text"] {

-  width: 136px;
+  width: 130px;

 }
 
 #search_field input[type="submit"] {
 }
 
 #search_field input[type="submit"] {


@@ -226,8 +231,6 @@ h2 {
 }
 
 .search_help {
 }
 
 .search_help {

-  font-size: 10px;
-  line-height: 15px;

   margin-top: 2px;
   margin-bottom: 0px;
 }
   margin-top: 2px;
   margin-bottom: 0px;
 }


@@ -235,8 +238,8 @@ h2 {
 /* Rules for donation request box */
 
 .donate {
 /* Rules for donation request box */
 
 .donate {

-  width: 155px;
-  margin: 10px 5px;
+  width: 153px;
+  margin: 10px 10px;

   padding: 5px;
   border: 1px solid #ccc;
   background: #cbeea7;
   padding: 5px;
   border: 1px solid #ccc;
   background: #cbeea7;


@@ -256,11 +259,15 @@ h2 {
 
 /* Rules for tabbed navigation bar */
 
 
 /* Rules for tabbed navigation bar */
 

+#top-bar {
+  border-bottom: 1px solid #ccc;
+  height: 29px;
+}
+

 #tabnav {
 #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 {
 }
 
 #tabnav li {


@@ -271,47 +278,47 @@ h2 {
 }
 
 #tabnav a, #tabnav a:link, #tabnav a:visited {
 }
 
 #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;
   font-weight: bold;

-  padding: 2px 10px;
-  border: 1px solid #ccc;
+  padding: 5px 10px;

   text-decoration: none;
   color: #333;
   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 {
 }
 
 #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 {
   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 {
 }
 
 #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 {
 }
 
 /* Rules for greeting bar in the top right corner */
 
 #greeting {

-  height: 20px;
+  height: 28px;

   margin: 0px;
   margin: 0px;

-  padding-top: 5px;

   font-size: 13px;
   font-size: 13px;

-  line-height: 15px;
-  background: image-url('tab_bottom.gif') repeat-x bottom;
+  line-height: 28px;

 }
 
 .greeting-bar-unread {
 }
 
 .greeting-bar-unread {


@@ -352,7 +359,7 @@ h2 {
 }
 
 #permalink a {
 }
 
 #permalink a {

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

 }
 
 /* Rules for edit menu */
 }
 
 /* Rules for edit menu */


@@ -392,7 +399,6 @@ h2 {
 #sidebar {
   display: none;
   position: absolute;
 #sidebar {
   display: none;
   position: absolute;

-  border: 1px solid #888;

   margin: 0px;
   padding: 0px;
   width: 30%;
   margin: 0px;
   padding: 0px;
   width: 30%;


@@ -413,11 +419,10 @@ h2 {
 
 #sidebar .sidebar_title {
   margin: 0px;
 
 #sidebar .sidebar_title {
   margin: 0px;

-  padding: 3px 6px;
+  padding: 3px 6px 4px 6px;

   height: 29px;
   font-size: 14px;
   line-height: 15px;
   height: 29px;
   font-size: 14px;
   line-height: 15px;

-  border-bottom: 1px solid #888;

   background: #bbb;
 }
 
   background: #bbb;
 }
 


@@ -450,14 +455,14 @@ h2 {
 
 .search_results_heading {
   margin: 0px;
 
 .search_results_heading {
   margin: 0px;

-  padding: 3px 6px;
-  border: 1px solid #ccc;
-  background: #ddd;
+  padding: 2px 5px;
+  border-bottom: 1px solid #ccc;
+  font-weight: bold;

 }
 
 .search_results_entry {
   margin: 0px;
 }
 
 .search_results_entry {
   margin: 0px;

-  padding: 2px 6px;
+  padding: 2px 5px;

 }
 
 .search_results_error {
 }
 
 .search_results_error {


@@ -526,13 +531,6 @@ h2 {
 
 /* Rules for the main content area */
 
 
 /* Rules for the main content area */
 

-body.site #content {
-  padding: 0px;
-  margin: 0px;
-  position: absolute;
-  bottom: 0px;
-}
-

 #content {
   padding: 10px;
   margin: 0px;
 #content {
   padding: 10px;
   margin: 0px;


@@ -540,6 +538,13 @@ body.site #content {
   bottom: 0px;
 }
 
   bottom: 0px;
 }
 

+#content.site_index,
+#content.site_edit,
+#content.site_export {
+  border: 0px;
+  padding: 0px;
+}
+

 #slim_container {
   width: 100%;
 }
 #slim_container {
   width: 100%;
 }


@@ -729,6 +734,7 @@ table.browse_details th {
   position: relative;
   width: 90%;
   height: 400px;
   position: relative;
   width: 90%;
   height: 400px;

+  border: 1px solid #ccc;

   display: none;
 }
 
   display: none;
 }
 


@@ -832,6 +838,7 @@ p#contributorGuidance {
   position: relative;
   width: 500px;
   height: 400px; 
   position: relative;
   width: 500px;
   height: 400px; 

+  border: 1px solid #ccc;

 }
 
 #accountImage td {
 }
 
 #accountImage td {


@@ -860,6 +867,7 @@ p#contributorGuidance {
   position: relative;
   width: 400px;
   height: 400px; 
   position: relative;
   width: 400px;
   height: 400px; 

+  border: 1px solid #ccc;

 }
 
 .user_view .user_map p#no_home_location {
 }
 
 .user_view .user_map p#no_home_location {


@@ -1043,3 +1051,67 @@ abbr.geo {
   vertical-align: text-bottom;
   border: 0;
 }
   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;
+    margin-left: 15px;
+    padding: 5px 10px 10px 10px;
+    font-size: 12px;
+
+    p {
+      margin: 0px;
+    }
+
+    th {
+      vertical-align: top;
+      padding: 0px 15px 0px 0px !important;
+    }
+
+    td {
+      font-family: fixed;
+      line-height: 16px;
+      padding: 0px !important;
+    }
+
+    input.richtext_doedit {
+      margin-top: 5px !important;
+      margin-right: 10px !important;
+    }
+
+    input.richtext_dopreview {
+      margin-top: 5px !important;
+      margin-left: 10px !important;
+    }
+  }
+}