X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b507f6c8873760a02afc9b05c3ed3e999055ee90..4a26107560d5115bdebb40c8fc180e421314f977:/app/assets/stylesheets/common.css.scss?ds=sidebyside

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index b1f494b7f..8f500acea 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -10,6 +10,7 @@ body {
   background-color: #fff;
   margin: 0px;
   padding: 0px;
+  text-align: left;
 }
 
 body.slim {
@@ -48,20 +49,27 @@ h2 {
 
 #left {
   position: absolute;
-  top: 0px;
+  top: 30px;
+  bottom: 0;
   width: 185px;
   font-size: 11px;
   line-height: 12px;
+  border-right: 1px solid #ccc;
 }
 
 /* Rules for the OpenStreetMap logo in the top left corner */
 
 #logo {
+  display: block;
   width: 170px;
   min-width: 170px;
   padding: 5px;
   text-align: center;
-  margin: 25px 0 5px 0;
+  margin: auto;
+}
+
+#logo img {
+  border: 0px;
 }
 
 #logo h1 {
@@ -83,10 +91,14 @@ h2 {
   display: none;
 }
 
+#small-title img {
+  border: 0px;
+}
+
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 .sidebar-copy {
-  padding: 0px 10px;
+  padding: 5px 10px;
 }
 
 .sidebar-copy p {
@@ -142,38 +154,35 @@ h2 {
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {
+  left: 0px;
+  margin: 0;
   padding: 5px 10px;
-  margin: 4px 0;
+  line-height: 15px;
+  font-size: 12px;
+  list-style-type: none;
+  border-bottom: 1px solid #ccc;
   border-top: 1px solid #ccc;
-  line-height: 20px;
-  font-size: 14px;
-  font-weight: bold;
-}
-
-.left_menu h1 {
-  font-style: normal;
-  font-size: 15px;
 }
 
 .left_menu ul {
-  margin: 0px;
-  list-style-type: none;
+  padding: 0;
+  margin: 0;
 }
 
 .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;
+  margin: 0;
 }
 
-.left_menu a {
-  color: #000;
+.left_menu li:last-child h4 {
+  padding-top: 0;
 }
 
 /* Rules for SOTM advert */
@@ -197,8 +206,10 @@ h2 {
  */
 
 .optionalbox {
+  left: 0px;
   padding: 5px 10px;
-  margin: 4px 0;
+  margin: 5px 0;
+  text-align: left;
 }
 
 .optionalbox h1 {
@@ -215,21 +226,21 @@ h2 {
 }
 
 #search_field form {
-  width: 100%;
+  width: 165px;
   margin: 0px;
   padding: 0px;
 }
 
 #search_field {
-  position:relative;
+  position: relative;
 }
 
 #search_field input[type="text"] {
   width: 165px;
-  padding: 5px;
   font-size: 14px;
   line-height: 15px;
   height: 25px;
+  padding: 2px 0px 2px 5px;
   box-shadow: inset #DDD 0px 1px 3px;
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
@@ -245,19 +256,21 @@ h2 {
 #search_field input[type="submit"] {
   width: 15px;
   height: 15px;
-  border:0;
-  text-indent:-1000px;
+  border: 0px;
+  text-indent: -1000px;
+  overflow: hidden;
+  text-transform: capitalize;
   padding-left: 0px;
   padding-right: 0px;
-  background: url(sprite.png);
-  position:absolute;
-  right:2px;
-  top:5px;
-  cursor:pointer;
+  background: image-url("sprite.png");
+  position: absolute;
+  top: 5px;
+  right: 4px;
+  cursor: pointer;
 }
 
 .search_help {
-  margin:0;
+  margin: 5px 0 0 0;
 }
 
 .deemphasize {
@@ -271,8 +284,10 @@ h2 {
 /* Rules for donation request box */
 
 .donate {
+  display: block;
+  position: relative;
   width: 153px;
-  margin: 10px 10px;
+  margin: 10px 10px 0px 10px;
   padding: 5px;
   border: 1px solid #AED1A0;
   background: #cbeea7;
@@ -281,10 +296,29 @@ h2 {
   font-size: 14px;
   border-radius: 2px;
   -moz-border-radius: 2px;
+  color: #222;
 }
 
-.donate a {
-  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;
+  left: 17px;
 }
 
 /* Rules for Creative Commons logo button */
@@ -297,8 +331,13 @@ h2 {
 /* Rules for tabbed navigation bar */
 
 #top-bar {
-  border-bottom: 1px solid #ccc;
+  position: absolute;
+  top: 0;
+  left: 185px;
+  right: 0;
   height: 29px;
+  border-bottom: 1px solid #ccc;
+  background: white;
 }
 
 #tabnav {
@@ -315,11 +354,13 @@ h2 {
 }
 
 #tabnav a, #tabnav a:link, #tabnav a:visited {
+  float: left;
   background: #fff;
   font-size: 14px;
   line-height: 19px;
   font-weight: bold;
   padding: 5px 10px;
+  margin-right: 1px;
   text-decoration: none;
   color: #333;
   -webkit-transition: color 200ms ease-in;
@@ -368,8 +409,10 @@ body.site-export #tabnav a#exportanchor {
 /* Rules for greeting bar in the top right corner */
 
 #greeting {
+  float: right;
   height: 28px;
   margin: 0px;
+  padding-right: 10px;
   font-size: 13px;
   line-height: 28px;
 }
@@ -384,9 +427,10 @@ body.site-export #tabnav a#exportanchor {
   z-index: 20000000;
   position: absolute;
   top: 15px;
+  left: 15px;
 }
 
-/* Rules for OpenLayers maps */
+/* Rules for Leaflet maps */
 
 #map {
   margin: 0px;
@@ -394,13 +438,6 @@ body.site-export #tabnav a#exportanchor {
   padding: 0px;
 }
 
-.olControlAttribution {
-  bottom: 15px !important;
-  left: 0px !important;
-  right: 0px !important;
-  text-align: center;
-}
-
 #permalink {
   z-index: 10000;
   position: absolute;
@@ -416,6 +453,20 @@ body.site-export #tabnav a#exportanchor {
   padding: 5px;
 }
 
+.site-index .leaflet-top,
+.site-export .leaflet-top {
+  top: 10px !important;
+
+  .leaflet-control {
+    margin-top: 0px !important;
+  }
+}
+
+.site-index #map .olControlScaleLine,
+.site-export #map .olControlScaleLine {
+  left: 10px !important;
+}
+
 /* Rules for edit menu */
 
 .menuicon {
@@ -455,20 +506,30 @@ body.site-export #tabnav a#exportanchor {
   display: none;
 }
 
+.attribution_license {
+  text-align: left;
+}
+
 .attribution_notice {
   text-align: center;
 }
 
+.attribution_project {
+  text-align: right;
+}
+
 /* Rules for the popout map sidebar */
 
 #sidebar {
   display: none;
   position: absolute;
-  margin: 0px;
+  margin: 30px 0px 0px 0px;
   padding: 0px;
+  border-right: 1px solid #ccc;
   width: 30%;
   top: 0px;
   bottom: 0px;
+  left: 0px;
 }
 
 #sidebar #sidebar_content {
@@ -488,7 +549,15 @@ body.site-export #tabnav a#exportanchor {
   height: 29px;
   font-size: 14px;
   line-height: 15px;
-  background: #bbb;
+  background: #ccc;
+}
+
+#sidebar #sidebar_title {
+  text-align: left;
+}
+
+#sidebar #sidebar_close {
+  text-align: right;
 }
 
 /* Rules for the map key which appears in the popout sidebar */
@@ -600,16 +669,20 @@ body.site-export #tabnav a#exportanchor {
 /* Rules for the main content area */
 
 #content {
-  padding: 10px;
-  margin: 0px;
-  position: absolute;
-  bottom: 0px;
+  padding: 20px;
+  margin: 30px 0px 0px 185px;
+  border-left: 1px solid #ccc;
+  text-align: left;
 }
 
-.site-index #content,
 .site-edit #content,
+.site-index #content,
 .site-export #content {
-  border: 0px;
+  position: fixed;
+  left: 0px;
+  right: 0px;
+  top: 0px;
+  bottom: 0px;
   padding: 0px;
 }
 
@@ -642,6 +715,13 @@ body.site-export #tabnav a#exportanchor {
 #slim_header img {
   vertical-align: middle;
   margin-bottom: 5px;
+  margin-right: 5px;
+}
+
+/* Rules for text content pages */
+
+.wide-table {
+  width: 100%;
 }
 
 /* Rules for the home page */
@@ -686,6 +766,7 @@ body.site-export #tabnav a#exportanchor {
   border-width: 0px;
   margin-top: 1px;
   margin-bottom: 1px;
+  text-align: left;
 }
 
 #changeset_list td {
@@ -712,8 +793,10 @@ body.site-export #tabnav a#exportanchor {
 
 #changeset_list_map {
   position: absolute;
+  float: right;
   top: 0px;
   bottom: 0px;
+  right: 0px;
   width: 49%;
   min-height: 400px;
   border: solid 1px black;
@@ -722,7 +805,9 @@ body.site-export #tabnav a#exportanchor {
 /* Rules for the data browser */
 
 #browse_navigation {
+  float: right;
   width: 250px;
+  margin-left: 10px;
   text-align: center;
 }
 
@@ -731,7 +816,10 @@ table.browse_details th {
 }
 
 #browse_map {
+  float: right;
   width: 250px;
+  text-align: right;
+  margin-left: 10px;
 }
 
 #browse_map #small_map {
@@ -750,6 +838,7 @@ table.browse_details th {
   font-size: small;
   border-collapse: collapse;
   border-width: 0px;
+  text-align: right;
 }
 
 #trace_list .trace_summary {
@@ -794,9 +883,30 @@ table.browse_details th {
 }
 
 #user_list_actions {
+  float: right;
   margin-top: 10px;
 }
 
+/* Rules for the diary list */
+
+.diary_entry-list img.user_image {
+  float: right;
+}
+
+.diary_entry-list img.user_thumbnail {
+  float: right;
+}
+
+/* Rules for the diary entry view */
+
+.diary_entry-view img.user_image {
+  float: right;
+}
+
+.diary_entry-view img.user_thumbnail {
+  float: right;
+}
+
 /* Rules for the new diary entry page */
 
 .diary_entry div#map {
@@ -885,6 +995,14 @@ form#termsForm {
   margin-bottom: 3em;
 }
 
+form#termsForm div#buttons {
+  float: right;
+}
+
+form#termsForm input#agree {
+  margin-left: 50px;
+}
+
 div#slim_content form#termsForm {
   width: auto;
 }
@@ -910,12 +1028,23 @@ p#contributorGuidance {
 #accountForm .user_map {
   position: relative;
   width: 500px;
-  height: 400px; 
+  height: 400px;
   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 {
@@ -936,10 +1065,15 @@ p#contributorGuidance {
 
 /* Rules for the user view */
 
+.user-view img.user_image {
+  float: right;
+}
+
 .user-view .user_map {
+  float: right;
   position: relative;
   width: 400px;
-  height: 400px; 
+  height: 400px;
   border: 1px solid #ccc;
 }
 
@@ -954,16 +1088,21 @@ p#contributorGuidance {
 
 /* Rules for the user map */
 
-.user_map .olControlSimplePanZoom {
+.user_map .leaflet-control-pan,
+.user_map .leaflet-control-zoomslider {
   display: none;
 }
 
-.user_map .olControlZoom {
+.user_map .leaflet-control-zoom {
   display: block;
 }
 
 /* Rules for user popups on maps */
 
+.user_popup {
+  min-width: 200px;
+}
+
 .user_popup p {
   padding-top: 3px;
   padding-bottom: 3px;
@@ -979,18 +1118,48 @@ p#contributorGuidance {
 
 /* 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;
 }
@@ -1046,9 +1215,11 @@ p#contributorGuidance {
 #errorExplanation h2 {
   font-weight: bold;
   font-size: 12px;
+  padding: 5px 5px 5px 15px;
   margin: -7px;
   background-color: #c00;
   color: #fff;
+  text-align: left;
 }
 
 #errorExplanation p {
@@ -1069,6 +1240,11 @@ p#contributorGuidance {
   font-weight: bold;
   font-size: 12px;
   line-height: 20px;
+  text-align: right;
+}
+
+.submitButton {
+  text-align: right;
 }
 
 .minorNote {
@@ -1083,18 +1259,29 @@ textarea {
   border: 1px solid #ccc;
 }
 
+input.openid_url {
+  background: image-url('openid_input.png') repeat-y left white;
+  padding-left: 16px;
+}
+
 /* Rules for user images */
 
 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;
-  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 */
@@ -1166,6 +1353,7 @@ abbr.geo {
     display: inline-block;
     vertical-align: top;
     background-color: #ddd;
+    margin-left: 15px;
     padding: 5px 10px 10px 10px;
     font-size: 12px;
 
@@ -1175,9 +1363,12 @@ abbr.geo {
 
     th {
       vertical-align: top;
+      text-align: left;
+      padding: 0px 15px 0px 0px !important;
     }
 
     td {
+      text-align: left;
       font-family: fixed;
       line-height: 16px;
       padding: 0px !important;
@@ -1185,10 +1376,12 @@ abbr.geo {
 
     input.richtext_doedit {
       margin-top: 5px !important;
+      margin-right: 10px !important;
     }
 
     input.richtext_dopreview {
       margin-top: 5px !important;
+      margin-left: 10px !important;
     }
   }
 }