X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6a6814e41d1d6cd6545054cb37dc6820959c60fb..6b8beb7d1a0b5dfdf4f7c8409ee814f9cf870cfb:/public/stylesheets/common.css

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index c92d748e2..dd7265735 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -10,6 +10,10 @@ body {
   padding: 0px;
 }
 
+body.slim {
+  background-color: #f0f0f0;
+}
+
 /* Rules for links */
 
 a {
@@ -34,20 +38,22 @@ hr {
 
 #left {
   position: absolute;
-  top: -8px;
-  min-width: 150px;
+  top: 0px;
+  min-width: 170px;
 }
 
 /* Rules for the OpenStreetMap logo in the top left corner */
 
 #logo {
-  width: 150px;
-  min-width: 150px;
-  padding: 10px;
-  margin: 10px;
+  width: 170px;
+  min-width: 170px;
+  padding: 5px;
+  margin: 5px;
   height: 150px;
   background: #fff;
   border: 1px solid #ccd;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 #logo h1 {
@@ -61,16 +67,27 @@ hr {
   margin: 0px;
 }
 
+/* Rules for the site name */
+
+#small-title {
+  display: none;
+}
+
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 #intro {
   width: 170px;
-  margin: 10px;
+  padding: 5px;
+  margin: 5px;
   border: 1px solid #ccc;
   font-size: 11px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
-#intro p { margin: 10px; }
+#intro p {
+  margin: 5px;
+}
 
 /*
  * Rules for alert boxes shown in the left sidebar when important
@@ -79,14 +96,15 @@ hr {
  */
 
 #alert {
-  width: 150px;
-  margin: 10px;
-  padding: 10px;
+  width: 170px;
+  margin: 5px;
+  padding: 5px;
   border: 1px solid #ccc;
   background: #d00;
   line-height: 1.2em;
-  text-align: left;
   font-size: 14px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 /*
@@ -96,47 +114,45 @@ hr {
  */
 
 .notice {
-  width: 150px;
-  margin: 10px;
-  padding: 10px;
+  width: 170px;
+  margin: 5px;
+  padding: 5px;
   border: 1px solid #ccc;
   background: #ea0;
   line-height: 1.2em;
-  text-align: left;
   font-size: 14px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {
-  width: 150px;
-  min-width: 150px;
-  margin: 10px;
-  padding: 10px;
+  width: 170px;
+  min-width: 170px;
+  margin: 5px;
+  padding: 5px;
   border: 1px solid #ccc;
-  left: 0px;
   background: #ddd;
   line-height: 1.2em;
-  text-align: Left;
   font-size: 14px;
   font-weight: bold;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 .left_menu td {
   font-size: 12px;
-  padding-right: 4px;
 }
 
 .left_menu h1 {
   font-style: normal;
   font-size: 15px;
-  padding: 0em 0em 0em 1em;
-  text-align: left;
 }
 
 .left_menu ul {
-  padding-left: 10px;
   margin: 0px;
+  list-style-type: none;
 }
 
 .left_menu li {
@@ -144,10 +160,6 @@ hr {
   padding: 0px;
 }
 
-.left_menu img {
-  margin: 2px 8px 0px 0px;
-}
-
 .left_menu a {
   color: #000;
 }
@@ -155,8 +167,12 @@ hr {
 /* Rules for SOTM advert */
 
 #sotm {
-  width: 170px;
+  width: 180px;
+  min-width: 180px;
+  margin: 5px;
   padding: 0px;
+  border: 0px;
+  background: #fff;
 }
 
 /*
@@ -166,16 +182,16 @@ hr {
  */
 
 .optionalbox {
-  width: 150px;
-  min-width: 150px;
-  margin: 10px;
-  padding: 10px;
+  width: 170px;
+  min-width: 170px;
+  margin: 5px;
+  padding: 5px;
   border: 1px solid #ccc;
-  left: 0px;
   line-height: 1.2em;
-  text-align: left;
   font-size: 12px;
   background: #eee;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 .optionalbox h1 {
@@ -191,10 +207,9 @@ hr {
 .whereami {
   line-height: 22px;
   vertical-align: bottom;
-  float: right;
 }
 
-.search_form {
+.search_container {
   height: 16px;
   padding-bottom: 6px;
 }
@@ -206,11 +221,13 @@ hr {
 }
 
 #search_field input[type="text"] {
-  width: 116px;
+  width: 136px;
 }
 
 #search_field input[type="submit"] {
   width: 26px;
+  padding-left: 0px;
+  padding-right: 0px;
 }
 
 .search_help {
@@ -223,14 +240,16 @@ hr {
 /* Rules for donation request box */
 
 .donate {
-  width: 150px;
-  margin: 10px;
-  padding: 10px;
+  width: 170px;
+  margin: 5px;
+  padding: 5px;
   border: 1px solid #ccc;
   background: #cbeea7;
   line-height: 1.2em;
   text-align: center;
   font-size: 14px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 /* Rules for Creative Commons logo button */
@@ -246,7 +265,6 @@ hr {
 {
   height: 20px;
   margin: 0px;
-  padding-left: 215px;
   padding-top: 5px;
   background: url('../images/tab_bottom.gif') repeat-x bottom;
 }
@@ -261,16 +279,18 @@ hr {
 
 #tabnav a, #tabnav a:link, #tabnav a:visited 
 {
-  float: left;
   background: #f3f3f3;
   font-size: 13px;
   line-height: 14px;
   font-weight: bold;
   padding: 2px 10px;
-  margin-right: 4px;
   border: 1px solid #ccc;
   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
@@ -295,10 +315,8 @@ hr {
 /* Rules for greeting bar in the top right corner */
 
 #greeting {
-  float: right;
   height: 20px;
   margin: 0px;
-  padding-right: 10px;
   padding-top: 5px;
   font-size: 13px;
   line-height: 14px;
@@ -315,33 +333,46 @@ hr {
   z-index: 20000000;
   position: absolute;
   top: 15px;
-  left: 15px
 }
 
 /* Rules for OpenLayers maps */
 
 #map {
-  position: absolute;
   border: 1px solid black;
   margin: 0px; 
   padding: 0px;
-  left: 0px;
-  right: 2px;
-  top: 0px;
-  bottom: 0px;
 }
 
 .olControlAttribution {
   display: none !important;
 }
 
-#map #permalink {
-  z-index:10000;
-  position:absolute;
-  bottom:15px;
-  right:15px;
-  font-size:smaller;
-  text-align: right;
+#permalink {
+  z-index: 10000;
+  position: absolute;
+  bottom: 15px;
+  font-size: smaller;
+}
+
+/* Rules for edit menu */
+
+#editmenu {
+  display: none;
+  z-index: 10000;
+  position: absolute;
+  background-color: #ffffff;
+  border: 1px solid black;
+}
+
+#editmenu ul {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+#editmenu li {
+  list-style-type: none;
 }
 
 /* Rules for attribution text under the main map shown on printouts */
@@ -350,6 +381,10 @@ hr {
   display: none;
 }
 
+.attribution_notice {
+  text-align: center;
+}
+
 /* Rules for the popout map sidebar */
 
 #sidebar {
@@ -359,12 +394,11 @@ hr {
   margin: 0px;
   padding: 0px;
   width: 30%;
-  left: 0px;
   top: 0px;
   bottom: 0px;
 }
 
-#sidebar_content {
+#sidebar #sidebar_content {
   overflow: auto;
   position: absolute;
   font-size: 13px;
@@ -375,7 +409,7 @@ hr {
   right: 0px;
 }
 
-.sidebar_title {
+#sidebar .sidebar_title {
   margin: 0px;
   padding: 3px 6px;
   height: 29px;
@@ -388,21 +422,21 @@ hr {
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey h3 {
-    font-size: 110%;
-    font-weight: normal;
-    text-align: center;
+  font-size: 110%;
+  font-weight: normal;
+  text-align: center;
 }
 
 #mapkey .mapkey-table {
-    padding-left: 5px;
-    padding-right: 5px;
+  padding-left: 5px;
+  padding-right: 5px;
 }
 
 #mapkey .mapkey-table-key {
 }
 
 #mapkey .mapkey-table-value {
-    font-size: 90%;
+  font-size: 90%;
 }
 
 /* Rules for search results which appear in the popout sidebar */
@@ -494,20 +528,79 @@ hr {
   padding: 0px;
   margin: 0px;
   position: absolute; 
-  right: 10px;
   bottom: 10px;
   line-height: 1.2em;
-  text-align: left;
+}
+
+#slim_container {
+  width: 100%;
+}
+
+#slim_container_content {
+  max-width: 50em;
+  background-color: #FFFFFF;
+  margin: 10px auto;
+  padding: 3px;
+  border-radius: 25px;
+  -moz-border-radius: 25px;
+  border: 1px solid #e6e6e6;
+}
+
+#slim_content {
+  margin: 10px;
+  margin-top: 90px;
+  max-width: 50em;
+}
+
+#slim_header {
+  margin: 10px;
+  position: absolute;
+  top: 0px;
+}
+
+#slim_header img {
+  vertical-align: middle;
+  margin-bottom: 5px;
+}
+
+/* Rules for the home page */
+
+.site_index #map {
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+}
+
+/* Rules for the edit page */
+
+.site_edit #map {
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
 }
 
 /* Rules for the changeset list shown by the history tab etc */
 
-#changeset_list, #keyvalue {
-  width: 100%;
+#changeset_list_container {
+  position: relative;
+}
+
+#changeset_list {
+  width: 50%;
   font-size: small;
-  text-align: left;
   border-collapse: collapse;
   border-width: 0px;
+  margin-top: 1px;
+  margin-bottom: 1px;
+}
+
+#changeset_list td {
+  vertical-align: top;
+  padding: 3px;
 }
 
 #changeset_list .date {
@@ -522,24 +615,33 @@ hr {
   white-space: nowrap;
 }
 
-#changeset_list.th {
-  font-weight: bold;
+#changeset_list .selected {
+  background-color: rgb(255, 255, 160);
+  background-color: rgba(255, 255, 85, 0.5);
+}
+
+#changeset_list_map {
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  width: 49%;
+  min-height: 400px;
+  border: solid 1px black;
 }
 
 /* Rules for the data browser */
 
 #browse_navigation {
-  float: right;
   width: 250px;
   text-align: center;
-  margin-left: 10px;
+}
+
+table.browse_details th {
+  white-space: nowrap;
 }
 
 #browse_map {
-  float: right;
   width: 250px;
-  text-align: right;
-  margin-left: 10px;
 }
 
 #browse_map #small_map {
@@ -552,7 +654,6 @@ hr {
 
 #trace_list {
   font-size: small;
-  text-align: left;
   border-collapse: collapse;
   border-width: 0px;
 }
@@ -562,12 +663,157 @@ hr {
   color: gray;
 }
 
+#trace_list .trace_pending {
+  color: red;
+}
+
+#trace_list .trace_public {
+  color: green;
+}
+
+#trace_list .trace_identifiable {
+  color: green;
+}
+
+#trace_list .trace_trackable {
+  color: red;
+}
+
+#trace_list .trace_private {
+  color: red;
+}
+
+/* Rules for the user list */
+
+#user_list {
+  width: 100%;
+  font-size: small;
+}
+
+#user_list tr {
+  vertical-align: middle;
+}
+
+#user_list p {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
+#user_list_actions {
+  margin-top: 10px;
+}
+
+/* Rules for the new diary entry page */
+
+.diary_entry_new div#map {
+  position: relative;
+  width: 90%;
+  height: 400px;
+  display: none;
+}
+
+/* Rules for the login page */
+
+#login_wrapper div {
+  margin: 5px;
+  padding: 15px;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
+}
+
+#login_login {
+  background-color: #f5f5ff;
+  border: 1px solid #f3f3ff;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
+}
+
+#login_login h1 {
+  margin-top: 5px;
+}
+
+table#login_openid_buttons {
+  padding-bottom: 10px;
+}
+
+#login_openid_buttons td {
+  padding-left: 10px;
+  padding-right: 10px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+
+#login_openid_buttons img {
+  border: 0;
+}
+
+#login_signup form.button-to div {
+  margin: 0px;
+  padding: 0px;
+}
+
+/* Rules for the account confirmation page */
+
+div#contributorTerms {
+  border: 1px solid black;
+  padding: 4px;
+  overflow: auto;
+  width: 95%;
+  height: 400px;
+}
+
+div#slim_content div#contributorTerms {
+  width: auto;
+}
+
+div#contributorTerms p#first {
+  margin-top: 0px;
+}
+
+div#contributorTerms p#last {
+  margin-bottom: 0px;
+}
+
+div#contributorTerms ol {
+  margin-bottom: 0px;
+}
+
+div#contributorTerms img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 10%;
+}
+
+form#termsForm {
+  width: 95%;
+  margin-bottom: 3em;
+}
+
+div#slim_content form#termsForm {
+  width: auto;
+}
+
+p#contributorGuidance {
+  background-color: #f5f5ff;
+  border: 1px solid #f3f3ff;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
+  padding: 10px;
+}
+
 /* Rules for the account settings page */
 
 #accountForm td {
   padding-bottom: 10px;
 }
 
+#accountForm .user_map {
+  position: relative;
+  width: 500px;
+  height: 400px; 
+}
+
 #accountImage td {
   padding-bottom: 0px;
 }
@@ -584,6 +830,27 @@ hr {
   display: inline !important;
 }
 
+#accountForm input[type=submit] {
+  margin-top: 15px;
+}
+
+/* Rules for the user view */
+
+.user_view .user_map {
+  position: relative;
+  width: 400px;
+  height: 400px; 
+}
+
+.user_view .user_map p {
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  width: 90%;
+  height: 30%;
+  margin: auto 5%
+}
+
 /* Rules for the user map */
 
 .user_map .olControlPanZoomBar {
@@ -605,6 +872,10 @@ hr {
   margin-right: 2px;
 }
 
+.user_popup img.user_thumbnail {
+  float: left;
+}
+
 /* Rules for message in/out box page */
 
 #messages {
@@ -622,6 +893,8 @@ hr {
   padding: 7px;
   background-color: #fff0f0;
   margin-bottom: 20px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 #warning {
@@ -629,6 +902,8 @@ hr {
   padding: 7px;
   background-color: #fff6f0;
   margin-bottom: 20px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 #notice {
@@ -636,6 +911,8 @@ hr {
   padding: 7px;
   background-color: #f0fff0;
   margin-bottom: 20px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 /* Rules for highlighting fields with rails validation errors */
@@ -658,9 +935,7 @@ hr {
 }
 
 #errorExplanation h2 {
-  text-align: left;
   font-weight: bold;
-  padding: 5px 5px 5px 15px;
   font-size: 12px;
   margin: -7px;
   background-color: #c00;
@@ -681,7 +956,7 @@ hr {
 /* Rules for forms */
 
 .fieldName {
-  text-align: right;
+  vertical-align: top;
   font-weight: bold;
 }
 
@@ -740,23 +1015,9 @@ abbr.geo {
   background: #fff;
 }
 
-input.openid_url { 
-  background: url('../images/openid-inputicon.gif') repeat-y left;
-  padding-left: 16px;
-}
-
-/* Rules for Login page */
-.loginBox {
-  float: left;
-  width: 400px;
-  height: 200px;
-  margin-bottom: 40px;
-  border-style: solid;
-  border-width: 1px;
-  padding-left: 10px;
-  padding-right: 10px;
-}
+/* Rules for OpenID logo */
 
-.loginBox img {
+.openid_logo {
+  vertical-align: text-bottom;
   border: 0;
 }