Use the asset pipeline to load the sprite

[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 8a848e9ee58395b9640346230c17ec6c4fed9c2f..ecdb40b44854783e7d69edda16d9695904fd335c 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -48,7 +48,8 @@ h2 {
 
 #left {
   position: absolute;
 
 #left {
   position: absolute;

-  top: 0px;
+  top: 30px;
+  bottom: 0;

   width: 185px;
   font-size: 11px;
   line-height: 12px;
   width: 185px;
   font-size: 11px;
   line-height: 12px;


@@ -57,11 +58,16 @@ h2 {
 /* Rules for the OpenStreetMap logo in the top left corner */
 
 #logo {
 /* Rules for the OpenStreetMap logo in the top left corner */
 
 #logo {

+  display: block;

   width: 170px;
   min-width: 170px;
   padding: 5px;
   text-align: center;
   width: 170px;
   min-width: 170px;
   padding: 5px;
   text-align: center;

-  margin: 25px 0 5px 0;
+  margin: auto;
+}
+
+#logo img {
+  border: 0px;

 }
 
 #logo h1 {
 }
 
 #logo h1 {


@@ -83,15 +89,23 @@ h2 {
   display: none;
 }
 
   display: none;
 }
 

+#small-title img {
+  border: 0px;
+}
+

 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 .sidebar-copy {
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 .sidebar-copy {

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

 }
 
 .sidebar-copy p {
 }
 
 .sidebar-copy p {

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

 }
 
 /*
 }
 
 /*


@@ -138,52 +152,50 @@ h2 {
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {

+  margin: 0;

   padding: 5px 10px;
   padding: 5px 10px;

-  margin: 4px 0;
-  border-top: 1px solid #ccc;
+  line-height: 15px;
+  font-size: 12px;
+  list-style-type: none;

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

-  line-height: 20px;
-  font-size: 14px;
-  font-weight: bold;
-}
-
-.left_menu h1 {
-  font-style: normal;
-  font-size: 15px;
+  border-top: 1px solid #ccc;

 }
 
 .left_menu ul {
 }
 
 .left_menu ul {

-  margin: 0px;
-  list-style-type: none;
+  padding: 0;
+  margin: 0;

 }
 
 .left_menu li {
 }
 
 .left_menu li {

-  margin: 0px;
-  padding: 0px;
+  list-style-type: none;
+  padding: 0;
+  margin: 0;

 }
 
 }
 

-/* submenus */
-.left_menu ul li ul {
-  font-weight: normal;
-  line-height: 15px;
+.left_menu h4 {
+  padding: 5px 0 5px 0;

   font-size: 12px;
   font-size: 12px;

+  margin: 0;

 }
 
 }
 

-.left_menu a {
-  color: #000;
+.left_menu li:last-child h4 {
+  padding-top: 0;

 }
 
 /* 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


@@ -192,8 +204,7 @@ h2 {
 
 .optionalbox {
   padding: 5px 10px;
 
 .optionalbox {
   padding: 5px 10px;

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

 }
 
 .optionalbox h1 {
 }
 
 .optionalbox h1 {


@@ -207,44 +218,99 @@ h2 {
 /* Rules for the search box */
 
 .whereami {
 /* Rules for the search box */
 
 .whereami {

-  line-height: 20px;
-  vertical-align: bottom;

 }
 
 #search_field form {
 }
 
 #search_field form {

-  width: 100%;
+  width: 165px;

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

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

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

-  width: 130px;
+  width: 165px;
+  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: 0px;
+  text-indent: -1000px;
+  overflow: hidden;
+  text-transform: capitalize;

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

+  background: image-url("sprite.png");
+  position: absolute;
+  top: 5px;
+  cursor: pointer;

 }
 
 .search_help {
 }
 
 .search_help {

-  margin-top: 2px;
-  margin-bottom: 0px;
+  margin: 5px 0 0 0;
+}
+
+.deemphasize {
+  color: #999;
+}
+
+.deemphasize a {
+  color: #7092FF;

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

+  display: block;
+  position: relative;

   width: 153px;
   width: 153px;

-  margin: 10px 10px;
+  margin: 10px 10px 0px 10px;

   padding: 5px;
   padding: 5px;

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

   background: #cbeea7;
   line-height: 20px;
   text-align: center;
   font-size: 14px;
   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;
+  color: #222;
+}
+
+.donate:hover {
+  background: #9ed485;
+  text-decoration: none;
+}
+
+.donate p {
+  text-indent: 20px;
+  margin: 0;
+}
+
+.donate .donate-icon {
+  width: 15px;
+  height: 15px;
+  border: 0px;
+  padding-left: 0px;
+  padding-right: 0px;
+  background: image-url("sprite.png") 0 -30px no-repeat;
+  position: absolute;
+  top: 8px;

 }
 
 /* Rules for Creative Commons logo button */
 }
 
 /* Rules for Creative Commons logo button */


@@ -257,8 +323,11 @@ h2 {
 /* Rules for tabbed navigation bar */
 
 #top-bar {
 /* Rules for tabbed navigation bar */
 
 #top-bar {

-  border-bottom: 1px solid #ccc;
+  position: absolute;
+  top: 0;

   height: 29px;
   height: 29px;

+  border-bottom: 1px solid #ccc;
+  background: white;

 }
 
 #tabnav {
 }
 
 #tabnav {


@@ -282,9 +351,16 @@ h2 {
   padding: 5px 10px;
   text-decoration: none;
   color: #333;
   padding: 5px 10px;
   text-decoration: none;
   color: #333;

+  -webkit-transition: color 200ms ease-in;
+  -moz-transition: color 200ms ease-in;
+  -o-transition: color 200ms ease-in;
+  transition: color 200ms ease-in;

 }
 
 }
 

-#tabnav a:link.active, #tabnav a:visited.active {
+body.site-index #tabnav a#viewanchor,
+body.site-edit #tabnav a#editanchor,
+body.changeset-list #tabnav a#historyanchor,
+body.site-export #tabnav a#exportanchor {

   border-bottom: 1px solid #aaa;
   background: #9ed485;
   color: #000;
   border-bottom: 1px solid #aaa;
   background: #9ed485;
   color: #000;


@@ -343,6 +419,7 @@ h2 {
 
 #map {
   margin: 0px;
 
 #map {
   margin: 0px;

+  border: 0px;

   padding: 0px;
 }
 
   padding: 0px;
 }
 


@@ -368,6 +445,13 @@ h2 {
   padding: 5px;
 }
 
   padding: 5px;
 }
 

+.site-index #map .SimpleLayerSwitcher,
+.site-index #map .olControlSimplePanZoom,
+.site-export #map .SimpleLayerSwitcher,
+.site-export #map .olControlSimplePanZoom {
+  top: 40px !important;
+}
+

 /* Rules for edit menu */
 
 .menuicon {
 /* Rules for edit menu */
 
 .menuicon {


@@ -416,7 +500,7 @@ h2 {
 #sidebar {
   display: none;
   position: absolute;
 #sidebar {
   display: none;
   position: absolute;

-  margin: 0px;
+  margin: 30px 0px 0px 0px;

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


@@ -440,7 +524,7 @@ h2 {
   height: 29px;
   font-size: 14px;
   line-height: 15px;
   height: 29px;
   font-size: 14px;
   line-height: 15px;

-  background: #bbb;
+  background: #ccc;

 }
 
 /* Rules for the map key which appears in the popout sidebar */
 }
 
 /* Rules for the map key which appears in the popout sidebar */


@@ -456,7 +540,10 @@ h2 {
   padding-right: 5px;
 }
 
   padding-right: 5px;
 }
 

-#mapkey .mapkey-table-key {
+#mapkey .mapkey-table-key img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;

 }
 
 #mapkey .mapkey-table-value {
 }
 
 #mapkey .mapkey-table-value {


@@ -549,19 +636,26 @@ h2 {
 /* Rules for the main content area */
 
 #content {
 /* Rules for the main content area */
 
 #content {

-  padding: 10px;
-  margin: 0px;
-  position: absolute;
-  bottom: 0px;
+  padding: 20px;
+  margin: 30px 0px 0px 0px;

 }
 
 }
 

-#content.site_index,
-#content.site_edit,
-#content.site_export {
-  border: 0px;
+.site-edit #content,
+.site-index #content,
+.site-export #content {
+  position: fixed;
+  margin-top: 0px;
+  left: 0px;
+  right: 0px;
+  top: 0px;
+  bottom: 0px;

   padding: 0px;
 }
 
   padding: 0px;
 }
 

+.site-edit #content {
+  top: 30px;
+}
+

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


@@ -593,9 +687,15 @@ h2 {
   margin-bottom: 5px;
 }
 
   margin-bottom: 5px;
 }
 

+/* Rules for text content pages */
+
+.wide-table {
+  width: 100%;
+}
+

 /* Rules for the home page */
 
 /* Rules for the home page */
 

-.site_index #map {
+.site-index #map {

   position: absolute;
   top: 0px;
   bottom: 0px;
   position: absolute;
   top: 0px;
   bottom: 0px;


@@ -603,7 +703,7 @@ h2 {
   right: 0px;
 }
 
   right: 0px;
 }
 

-.site_export #map {
+.site-export #map {

   position: absolute;
   top: 0px;
   bottom: 0px;
   position: absolute;
   top: 0px;
   bottom: 0px;


@@ -613,12 +713,13 @@ h2 {
 
 /* Rules for the edit page */
 
 
 /* Rules for the edit page */
 

-.site_edit #map {
+.site-edit #map {

   position: absolute;
   top: 0px;
   bottom: 0px;
   left: 0px;
   right: 0px;
   position: absolute;
   top: 0px;
   bottom: 0px;
   left: 0px;
   right: 0px;

+  overflow: hidden;

 }
 
 /* Rules for the changeset list shown by the history tab etc */
 }
 
 /* Rules for the changeset list shown by the history tab etc */


@@ -847,6 +948,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;
 }


@@ -854,12 +959,23 @@ p#contributorGuidance {
 #accountForm .user_map {
   position: relative;
   width: 500px;
 #accountForm .user_map {
   position: relative;
   width: 500px;

-  height: 400px; 
+  height: 400px;

   border: 1px solid #ccc;
 }
 
   border: 1px solid #ccc;
 }
 

-#accountImage td {
-  padding-bottom: 0px;
+#accountForm td.accountImage {
+  img {
+    vertical-align: top;
+    margin-top: 3px;
+  }
+
+  table {
+    display: inline-block;
+
+    td {
+      padding-bottom: 0px;
+    }
+  }

 }
 
 .nohome .location {
 }
 
 .nohome .location {


@@ -880,14 +996,14 @@ p#contributorGuidance {
 
 /* Rules for the user view */
 
 
 /* Rules for the user view */
 

-.user_view .user_map {
+.user-view .user_map {

   position: relative;
   width: 400px;
   position: relative;
   width: 400px;

-  height: 400px; 
+  height: 400px;

   border: 1px solid #ccc;
 }
 
   border: 1px solid #ccc;
 }
 

-.user_view .user_map p#no_home_location {
+.user-view .user_map p#no_home_location {

   position: absolute;
   top: 0px;
   bottom: 0px;
   position: absolute;
   top: 0px;
   bottom: 0px;


@@ -898,7 +1014,7 @@ p#contributorGuidance {
 
 /* Rules for the user map */
 
 
 /* Rules for the user map */
 

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

   display: none;
 }
 
   display: none;
 }
 


@@ -923,12 +1039,50 @@ p#contributorGuidance {
 
 /* Rules for message in/out box page */
 
 
 /* Rules for message in/out box page */
 

-#messages {
-  border: 1px solid #ccc;
+.messages {
+  width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0px;
+  border-width: 0px;

 }
 
 }
 

-.inbox-row-unread .inbox-subject {
-  font-weight: bold;
+.messages tbody tr {
+  border-top: 1px solid #ccc;
+}
+
+.messages .inbox-row {
+  background: #eee;
+}
+
+.messages tr td,
+.messages tr th {
+  padding: 0px 5px;
+}
+
+.inbox-row .inbox-mark-read {
+  display: none;
+}
+
+.info-line {
+  border-bottom: 1px solid #ccc;
+  padding: 5px 0px 4px 0px;
+}
+
+.info-line form,
+.info-line form div {
+  display: inline;
+}
+
+.info-line .user_thumbnail_tiny {
+  vertical-align: middle;
+}
+
+.right {
+  float: right;
+}
+
+.inbox-row-unread .inbox-mark-unread {
+  display: none;

 }
 
 /* Rules for "flash" notice boxes shown at the top of the content area */
 }
 
 /* Rules for "flash" notice boxes shown at the top of the content area */


@@ -1016,7 +1170,7 @@ input[type="email"],
 input[type="url"],
 input[type="password"],
 textarea {
 input[type="url"],
 input[type="password"],
 textarea {

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

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


@@ -1024,13 +1178,19 @@ textarea {
 img.user_image {
   max-width: 100px;
   max-height: 100px;
 img.user_image {
   max-width: 100px;
   max-height: 100px;

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

 }
 
 img.user_thumbnail {
   max-width: 50px;
   max-height: 100px;
 }
 
 img.user_thumbnail {
   max-width: 50px;
   max-height: 100px;

-  border: 1px solid black;
+  border: 1px solid #ccc;
+}
+
+img.user_thumbnail_tiny {
+  max-width: 25px;
+  max-height: 25px;
+  border: 1px solid #ccc;

 }
 
 /* Rule for "nowrap" class that can be applied to anything to stop wrapping */
 }
 
 /* Rule for "nowrap" class that can be applied to anything to stop wrapping */