X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1635c165608b9619f0b04eba508351afc3602292..3a654c89197b40f4a623c0dd33b87b415623d97d:/public/stylesheets/common.css?ds=sidebyside diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index 38cfec423..9b68bd03e 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -85,7 +85,9 @@ hr { -moz-border-radius: 5px; } -#intro p { margin: 5px; } +#intro p { + margin: 5px; +} /* * Rules for alert boxes shown in the left sidebar when important @@ -100,7 +102,6 @@ hr { border: 1px solid #ccc; background: #d00; line-height: 1.2em; - text-align: left; font-size: 14px; border-radius: 5px; -moz-border-radius: 5px; @@ -119,7 +120,6 @@ hr { border: 1px solid #ccc; background: #ea0; line-height: 1.2em; - text-align: left; font-size: 14px; border-radius: 5px; -moz-border-radius: 5px; @@ -133,10 +133,8 @@ hr { 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; @@ -145,18 +143,14 @@ hr { .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: 0px; margin: 0px; list-style-type: none; } @@ -166,10 +160,6 @@ hr { padding: 0px; } -.left_menu img { - margin: 2px 8px 0px 0px; -} - .left_menu a { color: #000; } @@ -197,9 +187,7 @@ hr { 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; @@ -219,10 +207,9 @@ hr { .whereami { line-height: 22px; vertical-align: bottom; - float: right; } -.search_form { +.search_container { height: 16px; padding-bottom: 6px; } @@ -278,7 +265,6 @@ hr { { height: 20px; margin: 0px; - padding-left: 215px; padding-top: 5px; background: url('../images/tab_bottom.gif') repeat-x bottom; } @@ -293,13 +279,11 @@ 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; @@ -331,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; @@ -351,20 +333,14 @@ 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 { @@ -376,13 +352,13 @@ hr { position: absolute; bottom: 15px; right: 15px; - font-size: smaller; text-align: right; + font-size: smaller; } /* Rules for edit menu */ -#editmenu { +.menu { display: none; z-index: 10000; position: absolute; @@ -390,15 +366,16 @@ hr { border: 1px solid black; } -#editmenu ul { +.menu ul { margin-top: 10px; margin-bottom: 10px; padding-left: 10px; padding-right: 10px; } -#editmenu li { +.menu li { list-style-type: none; + white-space: nowrap; } /* Rules for attribution text under the main map shown on printouts */ @@ -407,6 +384,10 @@ hr { display: none; } +.attribution_notice { + text-align: center; +} + /* Rules for the popout map sidebar */ #sidebar { @@ -416,12 +397,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; @@ -432,7 +412,7 @@ hr { right: 0px; } -.sidebar_title { +#sidebar .sidebar_title { margin: 0px; padding: 3px 6px; height: 29px; @@ -445,21 +425,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 */ @@ -551,10 +531,8 @@ hr { padding: 0px; margin: 0px; position: absolute; - right: 10px; bottom: 10px; line-height: 1.2em; - text-align: left; } #slim_container { @@ -585,18 +563,55 @@ hr { #slim_header img { vertical-align: middle; - margin-right: 5px; margin-bottom: 5px; } +/* Rules for the home page */ + +.site_index #map { + position: absolute; + top: 0px; + bottom: 0px; + left: 0px; + right: 0px; +} + +.site_export #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 { @@ -612,23 +627,49 @@ hr { } #changeset_list .selected { - background-color: #ffff55; + 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; +} + +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 { - float: right; width: 250px; - text-align: right; - margin-left: 10px; } #browse_map #small_map { @@ -637,24 +678,14 @@ hr { border: solid 1px black; } -#browse_map_changeset { - float: right; - width: 100%; - text-align: right; - margin-left: 10px; -} - -#browse_map_changeset #small_map { - width: 100%; - height: 315px; - border: solid 1px black; +#browse_map .geolink { + display: none; } /* Rules for the trace list shown by the traces tab etc */ #trace_list { font-size: small; - text-align: left; border-collapse: collapse; border-width: 0px; } @@ -664,6 +695,26 @@ 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 { @@ -681,10 +732,18 @@ hr { } #user_list_actions { - float: right; margin-top: 10px; } +/* Rules for the new diary entry page */ + +.diary_entry div#map { + position: relative; + width: 90%; + height: 400px; + display: none; +} + /* Rules for the login page */ #login_wrapper div { @@ -694,10 +753,6 @@ hr { -moz-border-radius: 15px; } -#login_wrapper input[type=submit] { - float: right; -} - #login_login { background-color: #f5f5ff; border: 1px solid #f3f3ff; @@ -709,6 +764,21 @@ hr { 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; @@ -720,7 +790,7 @@ div#contributorTerms { border: 1px solid black; padding: 4px; overflow: auto; - width: 80%; + width: 95%; height: 400px; } @@ -748,7 +818,7 @@ div#contributorTerms img { } form#termsForm { - width: 80%; + width: 95%; margin-bottom: 3em; } @@ -756,12 +826,12 @@ div#slim_content form#termsForm { width: auto; } -form#termsForm div#buttons { - float: right; -} - -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 */ @@ -770,6 +840,12 @@ form#termsForm input#agree { padding-bottom: 10px; } +#accountForm .user_map { + position: relative; + width: 500px; + height: 400px; +} + #accountImage td { padding-bottom: 0px; } @@ -786,6 +862,27 @@ form#termsForm input#agree { 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#no_home_location { + position: absolute; + top: 0px; + bottom: 0px; + width: 90%; + height: 30%; + margin: auto 5% +} + /* Rules for the user map */ .user_map .olControlPanZoomBar { @@ -807,6 +904,10 @@ form#termsForm input#agree { margin-right: 2px; } +.user_popup img.user_thumbnail { + float: left; +} + /* Rules for message in/out box page */ #messages { @@ -866,9 +967,7 @@ form#termsForm input#agree { } #errorExplanation h2 { - text-align: left; font-weight: bold; - padding: 5px 5px 5px 15px; font-size: 12px; margin: -7px; background-color: #c00; @@ -889,7 +988,7 @@ form#termsForm input#agree { /* Rules for forms */ .fieldName { - text-align: right; + vertical-align: top; font-weight: bold; } @@ -947,3 +1046,10 @@ abbr.geo { .table1 { background: #fff; } + +/* Rules for OpenID logo */ + +.openid_logo { + vertical-align: text-bottom; + border: 0; +}