X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8cdd6b6a1cd9d8c521fac1305bc42faab48bd08c..ed84516db2ccf634c8639d15fc39b1896f66cd18:/app/assets/stylesheets/common.css.scss diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index a1099a153..c0796bdad 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -48,7 +48,8 @@ h2 { #left { position: absolute; - top: 0px; + top: 30px; + bottom: 0; width: 185px; font-size: 11px; line-height: 12px; @@ -57,11 +58,12 @@ h2 { /* 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 { @@ -94,7 +96,7 @@ h2 { /* Rules for the introductory text displayed in the left sidebar to new users */ .sidebar-copy { - padding: 0px 10px; + padding: 5px 10px; } .sidebar-copy p { @@ -150,38 +152,34 @@ h2 { /* Rules for the menu displayed in the left sidebar */ .left_menu { + 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 */ @@ -206,7 +204,7 @@ h2 { .optionalbox { padding: 5px 10px; - margin: 4px 0; + margin: 5px 0; } .optionalbox h1 { @@ -223,7 +221,7 @@ h2 { } #search_field form { - width: 100%; + width: 165px; margin: 0px; padding: 0px; } @@ -234,7 +232,6 @@ h2 { #search_field input[type="text"] { width: 165px; - padding: 5px; font-size: 14px; line-height: 15px; height: 25px; @@ -253,19 +250,20 @@ 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; + cursor: pointer; } .search_help { - margin:0; + margin: 5px 0 0 0; } .deemphasize { @@ -279,8 +277,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; @@ -289,10 +289,28 @@ h2 { font-size: 14px; border-radius: 2px; -moz-border-radius: 2px; + color: #222; +} + +.donate:hover { + background: #9ed485; + text-decoration: none; } -.donate a { - color:#222; +.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 */ @@ -305,8 +323,11 @@ h2 { /* Rules for tabbed navigation bar */ #top-bar { - border-bottom: 1px solid #ccc; + position: absolute; + top: 0; height: 29px; + border-bottom: 1px solid #ccc; + background: white; } #tabnav { @@ -394,7 +415,7 @@ body.site-export #tabnav a#exportanchor { top: 15px; } -/* Rules for OpenLayers maps */ +/* Rules for Leaflet maps */ #map { margin: 0px; @@ -402,13 +423,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; @@ -424,6 +438,11 @@ body.site-export #tabnav a#exportanchor { padding: 5px; } +.site-index .leaflet-top, +.site-export .leaflet-top { + margin-top: 40px !important; +} + /* Rules for edit menu */ .menuicon { @@ -472,7 +491,7 @@ body.site-export #tabnav a#exportanchor { #sidebar { display: none; position: absolute; - margin: 0px; + margin: 30px 0px 0px 0px; padding: 0px; width: 30%; top: 0px; @@ -496,7 +515,7 @@ body.site-export #tabnav a#exportanchor { height: 29px; font-size: 14px; line-height: 15px; - background: #bbb; + background: #ccc; } /* Rules for the map key which appears in the popout sidebar */ @@ -608,19 +627,26 @@ 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 0px; } -.site-index #content, .site-edit #content, +.site-index #content, .site-export #content { - border: 0px; + position: fixed; + margin-top: 0px; + left: 0px; + right: 0px; + top: 0px; + bottom: 0px; padding: 0px; } +.site-edit #content { + top: 30px; +} + #slim_container { width: 100%; } @@ -924,7 +950,7 @@ p#contributorGuidance { #accountForm .user_map { position: relative; width: 500px; - height: 400px; + height: 400px; border: 1px solid #ccc; } @@ -964,7 +990,7 @@ p#contributorGuidance { .user-view .user_map { position: relative; width: 400px; - height: 400px; + height: 400px; border: 1px solid #ccc; } @@ -979,16 +1005,12 @@ p#contributorGuidance { /* Rules for the user map */ -.user_map .olControlSimplePanZoom { - display: none; -} +/* Rules for user popups on maps */ -.user_map .olControlZoom { - display: block; +.user_popup { + min-width: 200px; } -/* Rules for user popups on maps */ - .user_popup p { padding-top: 3px; padding-bottom: 3px;