Merge branch 'master' into openid

[rails.git] / public / stylesheets / common.css

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 0282e47f315f99762d07c8218b3096fb286e2fa6..89fa39b31f59358d24247b552deaf27545f564c8 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -10,6 +10,10 @@ body {
   padding: 0px;
 }
 
   padding: 0px;
 }
 

+body.slim {
+  background-color: #f0f0f0;
+}
+

 /* Rules for links */
 
 a {
 /* Rules for links */
 
 a {


@@ -34,20 +38,22 @@ hr {
 
 #left {
   position: absolute;
 
 #left {
   position: absolute;

-  top: -8px;
-  min-width: 150px;
+  top: 0px;
+  min-width: 170px;

 }
 
 /* Rules for the OpenStreetMap logo in the top left corner */
 
 #logo {
 }
 
 /* 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;
   height: 150px;
   background: #fff;
   border: 1px solid #ccd;

+  border-radius: 5px;
+  -moz-border-radius: 5px;

 }
 
 #logo h1 {
 }
 
 #logo h1 {


@@ -61,16 +67,25 @@ hr {
   margin: 0px;
 }
 
   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;
 /* 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: 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
 
 /*
  * Rules for alert boxes shown in the left sidebar when important


@@ -79,14 +94,16 @@ hr {
  */
 
 #alert {
  */
 
 #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: 1px solid #ccc;
   background: #d00;
   line-height: 1.2em;
   text-align: left;
   font-size: 14px;

+  border-radius: 5px;
+  -moz-border-radius: 5px;

 }
 
 /*
 }
 
 /*


@@ -96,23 +113,25 @@ hr {
  */
 
 .notice {
  */
 
 .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: 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 {
 }
 
 /* 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;
   border: 1px solid #ccc;
   left: 0px;
   background: #ddd;


@@ -120,6 +139,8 @@ hr {
   text-align: Left;
   font-size: 14px;
   font-weight: bold;
   text-align: Left;
   font-size: 14px;
   font-weight: bold;

+  border-radius: 5px;
+  -moz-border-radius: 5px;

 }
 
 .left_menu td {
 }
 
 .left_menu td {


@@ -135,8 +156,9 @@ hr {
 }
 
 .left_menu ul {
 }
 
 .left_menu ul {

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

   margin: 0px;
   margin: 0px;

+  list-style-type: none;

 }
 
 .left_menu li {
 }
 
 .left_menu li {


@@ -155,8 +177,12 @@ hr {
 /* Rules for SOTM advert */
 
 #sotm {
 /* Rules for SOTM advert */
 
 #sotm {

-  width: 170px;
+  width: 180px;
+  min-width: 180px;
+  margin: 5px;

   padding: 0px;
   padding: 0px;

+  border: 0px;
+  background: #fff;

 }
 
 /*
 }
 
 /*


@@ -166,16 +192,18 @@ hr {
  */
 
 .optionalbox {
  */
 
 .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: 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 {
 }
 
 .optionalbox h1 {


@@ -194,7 +222,7 @@ hr {
   float: right;
 }
 
   float: right;
 }
 

-.search_form {
+.search_container {

   height: 16px;
   padding-bottom: 6px;
 }
   height: 16px;
   padding-bottom: 6px;
 }


@@ -206,11 +234,13 @@ hr {
 }
 
 #search_field input[type="text"] {
 }
 
 #search_field input[type="text"] {

-  width: 116px;
+  width: 136px;

 }
 
 #search_field input[type="submit"] {
   width: 26px;
 }
 
 #search_field input[type="submit"] {
   width: 26px;

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

 }
 
 .search_help {
 }
 
 .search_help {


@@ -223,14 +253,16 @@ hr {
 /* Rules for donation request box */
 
 .donate {
 /* 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: 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 */
 }
 
 /* Rules for Creative Commons logo button */


@@ -271,6 +303,10 @@ hr {
   border: 1px solid #ccc;
   text-decoration: none;
   color: #333;
   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
 }
 
 #tabnav a:link.active, #tabnav a:visited.active


@@ -335,15 +371,36 @@ hr {
   display: none !important;
 }
 
   display: none !important;
 }
 

-#map #permalink {
-  z-index:10000;
-  position:absolute;
-  bottom:15px;
-  right:15px;
-  font-size:smaller;
+#permalink {
+  z-index: 10000;
+  position: absolute;
+  bottom: 15px;
+  right: 15px;
+  font-size: smaller;

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

+/* 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 */
 
 #attribution {
 /* Rules for attribution text under the main map shown on printouts */
 
 #attribution {


@@ -500,14 +557,57 @@ hr {
   text-align: left;
 }
 
   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-right: 5px;
+  margin-bottom: 5px;
+}
+

 /* Rules for the changeset list shown by the history tab etc */
 
 /* 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;
   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 {
 }
 
 #changeset_list .date {


@@ -522,8 +622,20 @@ hr {
   white-space: nowrap;
 }
 
   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 {
+  float: right;
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  right: 0px;
+  width: 49%;
+  min-height: 400px;
+  border: solid 1px black;

 }
 
 /* Rules for the data browser */
 }
 
 /* Rules for the data browser */


@@ -535,6 +647,10 @@ hr {
   margin-left: 10px;
 }
 
   margin-left: 10px;
 }
 

+table.browse_details th {
+  white-space: nowrap;
+}
+

 #browse_map {
   float: right;
   width: 250px;
 #browse_map {
   float: right;
   width: 250px;


@@ -570,7 +686,7 @@ hr {
 }
 
 #user_list tr {
 }
 
 #user_list tr {

-  vertical-align: center;
+  vertical-align: middle;

 }
 
 #user_list p {
 }
 
 #user_list p {


@@ -583,35 +699,106 @@ hr {
   margin-top: 10px;
 }
 
   margin-top: 10px;
 }
 

-/* Rules for the login form */
+/* Rules for the login page */

 
 

-.loginBox {
-  float: left;
-  border-style: solid;
-  border-width: 1px;
-  padding-left: 10px;
-  padding-right: 10px;
+#login_wrapper div {
+  margin: 5px;
+  padding: 15px;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
+}
+
+#login_wrapper input[type=submit] {
+  float: right;
+}
+
+#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;
 }
 
   padding-bottom: 10px;
 }
 

-.loginBox table {
-  width: 100%;
+#login_openid_buttons td {
+  padding-left: 10px;
+  padding-right: 10px;
+  padding-top: 5px;
+  padding-bottom: 5px;

 }
 
 }
 

-.loginBox img {
+#login_openid_buttons img {

   border: 0;
 }
 
   border: 0;
 }
 

-.loginBox #openid_buttons img {
-  vertical-align: middle;
+#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;

 }
 
 }
 

-.loginBox input[type="submit"] {
+form#termsForm div#buttons {

   float: right;
 }
 
   float: right;
 }
 

-#openid_buttons {
-  margin-bottom: 20px;
+form#termsForm input#agree {
+  margin-left: 50px;
+}
+
+p#contributorGuidance {
+  background-color: #f5f5ff;
+  border: 1px solid #f3f3ff;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
+  padding: 10px;

 }
 
 /* Rules for the account settings page */
 }
 
 /* Rules for the account settings page */


@@ -674,6 +861,8 @@ hr {
   padding: 7px;
   background-color: #fff0f0;
   margin-bottom: 20px;
   padding: 7px;
   background-color: #fff0f0;
   margin-bottom: 20px;

+  border-radius: 5px;
+  -moz-border-radius: 5px;

 }
 
 #warning {
 }
 
 #warning {


@@ -681,6 +870,8 @@ hr {
   padding: 7px;
   background-color: #fff6f0;
   margin-bottom: 20px;
   padding: 7px;
   background-color: #fff6f0;
   margin-bottom: 20px;

+  border-radius: 5px;
+  -moz-border-radius: 5px;

 }
 
 #notice {
 }
 
 #notice {


@@ -688,6 +879,8 @@ hr {
   padding: 7px;
   background-color: #f0fff0;
   margin-bottom: 20px;
   padding: 7px;
   background-color: #f0fff0;
   margin-bottom: 20px;

+  border-radius: 5px;
+  -moz-border-radius: 5px;

 }
 
 /* Rules for highlighting fields with rails validation errors */
 }
 
 /* Rules for highlighting fields with rails validation errors */


@@ -750,7 +943,7 @@ input[type="submit"] {
 }
 
 input.openid_url { 
 }
 
 input.openid_url { 

-  background: url('../images/openid_input.png') repeat-y left;
+  background: url('../images/openid_input.png') repeat-y left white;

   padding-left: 16px;
 }
 
   padding-left: 16px;
 }