Merge branch 'master' into openstreetbugs

[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 1c8f72c242e0fa34e666d55fb4e9cbfbeb8cd6a7..f2f16ec85ec93e70a05bbada359a9f38229fcee0 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -3,8 +3,10 @@
 /* Default rules for the body of every page */
 
 body {
 /* Default rules for the body of every page */
 
 body {

-  font-family: Arial,sans-serif;
-  color: #000;
+  font-family: 'Helvetica Neue',Arial,sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  color: #222;

   background-color: #fff;
   margin: 0px;
   padding: 0px;
   background-color: #fff;
   margin: 0px;
   padding: 0px;


@@ -34,12 +36,22 @@ hr {
   height: 1px;
 }
 
   height: 1px;
 }
 

+/* Default rules for headings */
+
+h2 {
+  margin: 5px 0;
+  font-size: 25px;
+  line-height: 30px;
+}
+

 /* Rules for the whole left sidebar, including the logo */
 
 #left {
   position: absolute;
   top: 0px;
 /* Rules for the whole left sidebar, including the logo */
 
 #left {
   position: absolute;
   top: 0px;

-  min-width: 170px;
+  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 */


@@ -48,22 +60,20 @@ hr {
   width: 170px;
   min-width: 170px;
   padding: 5px;
   width: 170px;
   min-width: 170px;
   padding: 5px;

-  margin: 5px;
-  height: 150px;
-  background: #fff;
-  border: 1px solid #ccd;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+  text-align: center;
+  margin: 25px 0 5px 0;

 }
 
 #logo h1 {
 }
 
 #logo h1 {

-  font-size: 14px;
+  font-size: 18px;
+  line-height: 20px;

   text-align: center;
   margin: 0px;
 }
 
 #logo h2 {
   font-size: 10px;
   text-align: center;
   margin: 0px;
 }
 
 #logo h2 {
   font-size: 10px;

+  line-height: 15px;

   margin: 0px;
 }
 
   margin: 0px;
 }
 


@@ -75,18 +85,17 @@ hr {
 
 /* 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 {
-  width: 170px;
-  padding: 5px;
-  margin: 5px;
-  border: 1px solid #ccc;
-  font-size: 11px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+.sidebar-copy {
+  padding: 0px 10px;

 }
 
 }
 

-#intro p {
-  margin: 5px;
+.sidebar-copy p {
+  margin: 5px 0;
+}
+
+.sidebar-copy.intro {
+  margin-top: -1px;
+  border-top: 1px solid #ccc;

 }
 
 /*
 }
 
 /*


@@ -95,16 +104,19 @@ hr {
  * 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: 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;
+  }

 }
 
 /*
 }
 
 /*


@@ -113,36 +125,29 @@ hr {
  * donation drives.
  */
 
  * 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;
   background: #ea0;

-  line-height: 1.2em;
-  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 {
 }
 
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {

-  width: 170px;
-  min-width: 170px;
-  margin: 5px;
-  padding: 5px;
-  border: 1px solid #ccc;
-  background: #ddd;
-  line-height: 1.2em;
+  padding: 5px 10px;
+  margin: 4px 0;
+  border-top: 1px solid #ccc;
+  line-height: 20px;

   font-size: 14px;
   font-weight: bold;
   font-size: 14px;
   font-weight: bold;

-  border-radius: 5px;
-  -moz-border-radius: 5px;
-}
-
-.left_menu td {
-  font-size: 12px;

 }
 
 .left_menu h1 {
 }
 
 .left_menu h1 {


@@ -160,6 +165,13 @@ hr {
   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;
 }


@@ -167,14 +179,17 @@ hr {
 /* Rules for SOTM advert */
 
 #sotm {
 /* Rules for SOTM advert */
 
 #sotm {

-  width: 180px;
-  min-width: 180px;
-  margin: 5px;
+  width: 165px;
+  margin: 10px;

   padding: 0px;
   border: 0px;
   background: #fff;
 }
 
   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
 /*
  * Rules for "optional boxes" which appear in the left sidebar on
  * certain pages. Current users are the seach box on the main page


@@ -182,22 +197,14 @@ hr {
  */
 
 .optionalbox {
  */
 
 .optionalbox {

-  width: 170px;
-  min-width: 170px;
-  margin: 5px;
-  padding: 5px;
-  border: 1px solid #ccc;
-  line-height: 1.2em;
-  font-size: 12px;
-  background: #eee;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+  padding: 5px 10px;
+  margin: 4px 0;

 }
 
 .optionalbox h1 {
   font-size: 14px;
   font-weight: bold;
 }
 
 .optionalbox h1 {
   font-size: 14px;
   font-weight: bold;

-  line-height: 22px;
+  line-height: 20px;

   margin: 0px;
   vertical-align: bottom;
 }
   margin: 0px;
   vertical-align: bottom;
 }


@@ -205,13 +212,6 @@ hr {
 /* Rules for the search box */
 
 .whereami {
 /* Rules for the search box */
 
 .whereami {

-  line-height: 22px;
-  vertical-align: bottom;
-}
-
-.search_container {
-  height: 16px;
-  padding-bottom: 6px;

 }
 
 #search_field form {
 }
 
 #search_field form {


@@ -220,36 +220,71 @@ hr {
   padding: 0px;
 }
 
   padding: 0px;
 }
 

+#search_field {
+  position:relative;
+}
+

 #search_field input[type="text"] {
 #search_field input[type="text"] {

-  width: 136px;
+  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"] {
 }
 
 #search_field input[type="submit"] {

-  width: 26px;
+  width: 15px;
+  height: 15px;
+  border:0;
+  text-indent:-1000px;

   padding-left: 0px;
   padding-right: 0px;
   padding-left: 0px;
   padding-right: 0px;

+  background: url(sprite.png);
+  position:absolute;
+  right:2px;
+  top:5px;
+  cursor:pointer;

 }
 
 .search_help {
 }
 
 .search_help {

-  font-size: 10px;
-  line-height: 1em;
-  margin-top: 3px;
-  margin-bottom: 0px;
+  margin:0;
+}
+
+.deemphasize {
+  color: #999;
+}
+
+.deemphasize a {
+  color: #7092FF;

 }
 
 /* Rules for donation request box */
 
 .donate {
 }
 
 /* Rules for donation request box */
 
 .donate {

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

   padding: 5px;
   padding: 5px;

-  border: 1px solid #ccc;
+  border: 1px solid #AED1A0;

   background: #cbeea7;
   background: #cbeea7;

-  line-height: 1.2em;
+  line-height: 20px;

   text-align: center;
   font-size: 14px;
   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 */
 }
 
 /* Rules for Creative Commons logo button */


@@ -261,66 +296,75 @@ hr {
 
 /* Rules for tabbed navigation bar */
 
 
 /* Rules for tabbed navigation bar */
 

-#tabnav
-{
-  height: 20px;
-  margin: 0px;
-  padding-top: 5px;
-  background: image-url('tab_bottom.gif') repeat-x bottom;
+#top-bar {
+  border-bottom: 1px solid #ccc;
+  height: 29px;
+}
+
+#tabnav {
+  padding: 0;
+  margin: 0;
+  overflow:hidden;

 }
 
 }
 

-#tabnav li
-{
-  margin: 0px; 
+#tabnav li {
+  margin: 0px;

   padding: 0px;
   display: inline;
   list-style-type: none;
 }
 
   padding: 0px;
   display: inline;
   list-style-type: none;
 }
 

-#tabnav a, #tabnav a:link, #tabnav a:visited 
-{
-  background: #f3f3f3;
-  font-size: 13px;
-  line-height: 14px;
+#tabnav a, #tabnav a:link, #tabnav a:visited {
+  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
-{
-  border-bottom: 1px solid #fff;
-  background: #fff;
+#tabnav a:link.active, #tabnav a:visited.active {
+  border-bottom: 1px solid #aaa;
+  background: #9ed485;

   color: #000;
 }
 
   color: #000;
 }
 

-#tabnav a:link:hover, #tabnav a:visited:hover
-{
-  background: #fff;
+#tabnav a:link:hover, #tabnav a:visited:hover {
+  text-decoration:underline;
+}
+
+#tabnav a:link.disabled,
+#tabnav a:visited.disabled,
+#tabnav a:link:hover.disabled,
+#tabnav a:visited:hover.disabled {
+  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;

 }
 
 }
 

-#tabnav a:link.disabled, #tabnav a:visited.disabled,
-#tabnav a:link:hover.disabled, #tabnav a:visited:hover.disabled
-{
-  background: #bbbbbb;
-  color: white
+.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 {
 }
 
 /* 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: 14px;
-  background: image-url('tab_bottom.gif') repeat-x bottom;
+  line-height: 28px;

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


@@ -338,43 +382,62 @@ hr {
 /* Rules for OpenLayers maps */
 
 #map {
 /* Rules for OpenLayers maps */
 
 #map {

-  border: 1px solid black;
-  margin: 0px; 
+  margin: 0px;

   padding: 0px;
 }
 
 .olControlAttribution {
   padding: 0px;
 }
 
 .olControlAttribution {

-  display: none !important;
+  bottom: 15px !important;
+  left: 0px !important;
+  right: 0px !important;
+  text-align: center;

 }
 
 #permalink {
   z-index: 10000;
   position: absolute;
 }
 
 #permalink {
   z-index: 10000;
   position: absolute;

-  bottom: 15px;
-  right: 15px;
+  bottom: 0px;
+  right: 0px;
+  padding: 5px;
+  background:#fff;

   text-align: right;
   text-align: right;

-  font-size: smaller;
+  font-size: 12px;
+}
+
+#permalink a {
+  padding: 5px;

 }
 
 /* Rules for edit menu */
 
 }
 
 /* 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;
 .menu {
   display: none;
   z-index: 10000;
   position: absolute;
   background-color: #ffffff;

-  border: 1px solid black;
+  border: 1px solid #cccccc;
+  border-top: 0px;

 }
 
 .menu ul {
 }
 
 .menu ul {

-  margin-top: 10px;
-  margin-bottom: 10px;
-  padding-left: 10px;
-  padding-right: 10px;
+  margin: 0px;
+  padding: 0px;

 }
 
 .menu li {
 }
 
 .menu li {

+  padding: 2px 5px;
+  margin: 0px;

   list-style-type: none;
   list-style-type: none;

+  border-top: 1px solid #eee;

   white-space: nowrap;
 }
 
   white-space: nowrap;
 }
 


@@ -393,7 +456,6 @@ hr {
 #sidebar {
   display: none;
   position: absolute;
 #sidebar {
   display: none;
   position: absolute;

-  border: 1px solid black;

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


@@ -405,7 +467,7 @@ hr {
   overflow: auto;
   position: absolute;
   font-size: 13px;
   overflow: auto;
   position: absolute;
   font-size: 13px;

-  line-height: 14px;
+  line-height: 15px;

   top: 29px;
   bottom: 0px;
   left: 0px;
   top: 29px;
   bottom: 0px;
   left: 0px;


@@ -414,11 +476,10 @@ hr {
 
 #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 black;

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


@@ -451,14 +512,14 @@ hr {
 
 .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 {


@@ -485,9 +546,9 @@ hr {
 
 .export_heading {
   margin: 0px;
 
 .export_heading {
   margin: 0px;

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

 }
 
 .export_bounds {
 }
 
 .export_bounds {


@@ -528,11 +589,17 @@ hr {
 /* Rules for the main content area */
 
 #content {
 /* Rules for the main content area */
 
 #content {

-  padding: 0px;
+  padding: 10px;

   margin: 0px;
   margin: 0px;

-  position: absolute; 
-  bottom: 10px;
-  line-height: 1.2em;
+  position: absolute;
+  bottom: 0px;
+}
+
+#content.site_index,
+#content.site_edit,
+#content.site_export {
+  border: 0px;
+  padding: 0px;

 }
 
 #slim_container {
 }
 
 #slim_container {


@@ -651,6 +718,23 @@ table.browse_details th {
   white-space: nowrap;
 }
 
   white-space: nowrap;
 }
 

+td.browse_comments {
+  padding: 0px;
+}
+
+td.browse_comments table {
+  border-collapse: collapse;
+}
+
+td.browse_comments table td {
+  padding-bottom: 10px;
+}
+
+td.browse_comments table td span.by {
+  font-size: small;
+  color: #999999;
+}
+

 #browse_map {
   width: 250px;
 }
 #browse_map {
   width: 250px;
 }


@@ -724,6 +808,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;
 }
 


@@ -819,6 +904,10 @@ p#contributorGuidance {
 
 /* Rules for the account settings page */
 
 
 /* Rules for the account settings page */
 

+#accountForm {
+  margin-top: 20px;
+}
+

 #accountForm td {
   padding-bottom: 10px;
 }
 #accountForm td {
   padding-bottom: 10px;
 }


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

+  border: 1px solid #ccc;

 }
 
 #accountImage td {
 }
 
 #accountImage td {


@@ -855,6 +945,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 {


@@ -868,11 +959,11 @@ p#contributorGuidance {
 
 /* Rules for the user map */
 
 
 /* Rules for the user map */
 

-.user_map .olControlPanZoomBar {
+.user_map .olControlSimplePanZoom {

   display: none;
 }
 
   display: none;
 }
 

-.user_map .olControlPanZoom {
+.user_map .olControlZoom {

   display: block;
 }
 
   display: block;
 }
 


@@ -901,6 +992,14 @@ p#contributorGuidance {
   font-weight: bold;
 }
 
   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 {
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 #error {


@@ -973,18 +1072,20 @@ p#contributorGuidance {
 .fieldName {
   vertical-align: top;
   font-weight: bold;
 .fieldName {
   vertical-align: top;
   font-weight: bold;

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

 }
 
 .minorNote {
   font-size: 0.8em;
 }
 
 }
 
 .minorNote {
   font-size: 0.8em;
 }
 

-input[type="text"], input[type="password"], textarea {
-  border: 1px solid black;
-}
-
-input[type="submit"] {
-  border: 1px solid black;
+input[type="text"],
+input[type="email"],
+input[type="url"],
+input[type="password"],
+textarea {
+  border: 1px solid #ccc;

 }
 
 /* Rules for user images */
 }
 
 /* Rules for user images */


@@ -1022,11 +1123,11 @@ abbr.geo {
 
 /* Rules for doing distinct colour of alternate table rows */
 
 
 /* Rules for doing distinct colour of alternate table rows */
 

-.table0 { 
+.table0 {

   background: #f6f6f6;
 }
 
   background: #f6f6f6;
 }
 

-.table1 { 
+.table1 {

   background: #fff;
 }
 
   background: #fff;
 }
 


@@ -1036,3 +1137,63 @@ 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;
+    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;
+    }
+  }
+}