X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/53fc883a91acf926d5102e6305ba87c30f5b30ab..c5fc21e6a6615646b3fa443b6fd12a80b4fef331:/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 4fe477900..7eec371b4 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -6,7 +6,7 @@ $offwhite: #f4f4ff; $blue: #7092FF; $lightblue: #B8C5F0; $grey: #AAA; -$keyline: #CCC; +$lightgrey: #CCC; $hovercolor: 20%; /* Styles common to large and small screens */ @@ -57,6 +57,40 @@ abbr, acronym { clear: both; } +/* Basic grid */ + +.col0 { float:left; width:04.1666%; } +.col1 { float:left; width:08.3333%; } +.col2 { float:left; width:16.6666%; } +.col3 { float:left; width:25.0000%; } +.col4 { float:left; width:33.3333%; } +.col5 { float:left; width:41.6666%; } +.col6 { float:left; width:50.0000%; } +.col7 { float:left; width:58.3333%; } +.col8 { float:left; width:66.6666%; } +.col9 { float:left; width:75.0000%; } +.col10 { float:left; width:83.3333%; } +.col11 { float:left; width:91.6666%; } +.col12 { width:100%; } + +.margin0 { margin-left:04.1666%; } +.margin1 { margin-left:08.3333%; } +.margin2 { margin-left:16.6666%; } +.margin3 { margin-left:25.0000%; } +.margin4 { margin-left:33.3333%; } +.margin5 { margin-left:41.6666%; } +.margin6 { margin-left:50.0000%; } +.margin7 { margin-left:58.3333%; } +.margin8 { margin-left:66.6666%; } +.margin9 { margin-left:75.0000%; } +.margin10 { margin-left:83.3333%; } +.margin11 { margin-left:91.6666%; } +.margin12 { margin-left:100.0000%; } + +.pad1 { padding: $lineheight/2; } +.pad2 { padding: $lineheight; } + +.fillL { background-color: white; } /* Default rules for the body of every page */ * { @@ -141,6 +175,37 @@ h6:first-child { margin-right: $lineheight/4; } +/* Rules for icons */ + +.icon { + display:inline-block; + vertical-align:top; + width:20px; + height:20px; + background:transparent image-url("sprite.png") no-repeat 0 0; + text-indent:-9999px; + overflow:hidden; + } + +.icon-pre-text { + margin-right: 5px; +} + +.icon.search { background-position: 0 0; } +.icon.donate { background-position: -20px 0; } +.icon.zoomin { background-position: -40px 0; } +.icon.zoomout { background-position: -60px 0; } +.icon.geolocate { background-position: -80px 0; } +.active .icon.geolocate { background-position: -80px -20px; } +.icon.layers { background-position: -100px 0; } +.icon.key { background-position: -120px 0; } +.icon.share { background-position: -140px 0; } +.icon.clipboard { background-position: -160px 0; } +.icon.link { background-position: -180px 0; } +.icon.close { background-position: -200px 0; } +.icon.check { background-position: -220px 0; } +.icon.note { background-position: -240px 0; } + /* Rules for links */ a { @@ -219,6 +284,10 @@ table { #small-title { display: none; + + img { + vertical-align: text-bottom; + } } /* Rules for the introductory text displayed in the left sidebar to new users */ @@ -275,7 +344,7 @@ table { .left_menu { left: 0px; margin: 0; - padding: $lineheight/4 $lineheight/2; + padding: $lineheight/4 $lineheight/2 $lineheight/2 $lineheight/2; font-size: 12px; line-height: 1.25; list-style-type: none; @@ -301,23 +370,6 @@ table { font-size: 12px; margin: 0; } - - li:last-child h4 { - padding-top: 0; - } -} - -/* Rules for SOTM advert */ - -#sotm { - width: 165px; - margin: $lineheight/2; - padding: 0px; - border: 0px; - background: #fff; - img { - width: 165px; - } } /* @@ -366,7 +418,7 @@ table { min-width: 0; text-indent: -1000px; overflow: hidden; - background: image-url("sprite.png") 0 0 no-repeat; + background: image-url("sprite.png") -2px -2px no-repeat; position: absolute; top: $lineheight/4; right: $lineheight/4; @@ -389,7 +441,7 @@ table { /* Rules for donation request box */ -.donate { +a.donate { display: block; width: 163px; padding: $lineheight/4; @@ -406,11 +458,6 @@ table { background: #9ed485; text-decoration: none; } - span { - margin: 0; - padding-left: 18px; - background: image-url("sprite.png") 0 -29px no-repeat; - } } /* Rules for Creative Commons logo button */ @@ -435,6 +482,7 @@ table { .site-index #top-bar, .site-export #top-bar { position: fixed; + top: 0; left: 0; right: 0; } @@ -463,8 +511,7 @@ table { .site-index #tabnav a#viewanchor, .site-edit #tabnav a#editanchor, -.changeset-list #tabnav a#historyanchor, -.site-export #tabnav a#exportanchor { +.changeset-list #tabnav a#historyanchor { border-bottom: 1px solid #aaa; background: #9ed485; color: #000; @@ -517,45 +564,271 @@ table { left: 15px; } -/* Rules for Leaflet maps */ -.leaflet-control-layers-expanded { - padding: 10px !important; +/* Rules for bootstrap tooltips */ + +.tooltip { + position: absolute; + display: none; + color: #333; + text-align: left; + font-size: 12px; + max-width: 250px; +} + +.tooltip.in { + opacity: 0.8; + z-index: 1030; + height: auto; + display: block; +} + +.tooltip.top { + margin-top: -10px; + text-align: center; } -.leaflet-control-layers-separator { - margin: 5px -10px !important; +.tooltip.right { + margin-left: 10px; } -.leaflet-control-attribution { - a.disabled { - color: #99c9dc; +.tooltip.bottom { + margin-top: 10px; + text-align: center; +} + +.tooltip.left { + margin-left: -10px; + text-align: right; +} + +.tooltip-inner { + display: inline-block; + padding: 10px; + font-weight: normal; + background-color: white; +} + +.tooltip-arrow { + position: absolute; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} + +.tooltip.top .tooltip-arrow { + bottom: -5px; + left: 50%; + margin-left: -5px; + border-top-color: white; + border-width: 5px 5px 0; +} + +.tooltip.right .tooltip-arrow { + top: 50%; + left: -5px; + margin-top: -5px; + border-right-color: white; + border-width: 5px 5px 5px 0; +} + +.tooltip.left .tooltip-arrow { + top: 50%; + right: -5px; + margin-top: -5px; + border-left-color: white; + border-width: 5px 0 5px 5px; +} + +.tooltip.bottom .tooltip-arrow { + top: -5px; + left: 50%; + margin-left: -5px; + border-bottom-color: white; + border-width: 0 5px 5px; +} + +/* Rules for Leaflet maps */ + +.leaflet-control .control-button { + display: block; + height: 40px; + width: 40px; + background-color: #333; + background-color: rgba(0,0,0,.6); + -bottom: 1px solid #333; + border-radius: 4px 0 0 4px; + margin-bottom: 10px; + outline: none; + + &:hover { + background-color: black; + } + + &.active { + background-color: #9ed485; + } + + &.disabled { + background-color: #333; + background-color: rgba(0,0,0,.5); cursor: default; - text-decoration: none; } - ul.secondary-actions { - float: left; - margin-right: $lineheight/4; + .icon { + margin: 10px; + } +} - &:only-child { - margin-right: 0px; +.leaflet-control .zoomin, +.control-layers .control-button { + margin-bottom: 0px; + border-radius: 4px 0 0 0; +} + +.site .leaflet-control .zoomout, +.control-key .control-button { + margin-bottom: 0; + border-radius: 0; +} + +.leaflet-control .zoomout, // For non-main page maps +.control-locate .control-button, +.control-share .control-button { + border-radius: 0 0 0 4px; +} + +/* Rules for the home page */ + +.site-export #map, +.site-index #map, +.site-edit #map { + height: 100%; + overflow: hidden; +} + +#map-ui { + display: none; + position: relative; + float: right; + width: 250px; + height: 100%; + background: white; + border-left: 1px solid #CCC; + overflow: auto; + + .section { + border-bottom: 1px solid #DDD; + padding: 15px; + } + + a.close-button { + float: right; + padding:5px; + font-size:20px; + line-height:10px; + color:#222; + border:1px solid #ddd; + } +} + +.layers-ui, +.share-ui { + ul, li:last-child, p:last-child { + margin-bottom: 0; + } +} + +.layers-ui { + li { + border-radius: 4px; + overflow: hidden; + margin-bottom: 10px; + } + + label { + display: block; + padding: 5px 5px 5px 7px; + background-color: #eee; + cursor: pointer; + } + + li.active label { + background-color: #ccc; + } + + .base-layers { + .leaflet-container { + width: 100%; + height: 50px; + cursor: pointer; + } + } +} + +.share-ui { + .share-tabs { + margin-bottom: 10px; + + a { + color: #fff; + text-decoration: none; + background-color: $lightblue; + padding: 5px 10px; + } + + a:first-child { + border-right: 1px solid #fff; + border-radius: 4px 0 0 4px; + } + + a:last-child { + border-left: 1px solid #fff; + border-radius: 0 4px 4px 0; + } + + a.active { + background-color: $blue; + } + } + + .share-tab { + display: none; + } + + .share-link { + input[type=text], + textarea { + width: 100%; + font-family: monospace; + font-size: small; + line-height: 1.3; + } + } + + .share-image { + label { + margin-right: 10px; } } + + #embed_html { + resize: vertical; + } + + #mapnik_scale { + width: 100px; + } } -.site-index .leaflet-top, -.site-export .leaflet-top { +.leaflet-top.leaflet-right { top: $lineheight/2 !important; .leaflet-control { + margin-right: 0px !important; margin-top: 0px !important; } } -.site-index #map .olControlScaleLine, -.site-export #map .olControlScaleLine { - left: $lineheight/2 !important; -} - .leaflet-popup-scrolled { padding-right: $lineheight; border-bottom: 0px !important; @@ -583,7 +856,7 @@ table { z-index: 10000; position: absolute; background-color: #ffffff; - border: 1px solid $keyline; + border: 1px solid $lightgrey; border-top: 0px; ul { margin: 0px; @@ -614,23 +887,11 @@ table { #sidebar { display: none; - position: absolute; - overflow: auto; - top: 0px; - bottom: 0px; - left: 0px; - border-right: 1px solid $keyline; + position: relative; + float: left; + border-right: 1px solid $lightgrey; width: 33.3333%; - .sidebar_heading { - position: relative; - padding: $lineheight/2 $lineheight; - z-index: 9999; - background: $offwhite; - border-bottom: 1px solid #ccc; - } - h4 { - margin: 0; - } + height: 100%; ul { margin-bottom: 0; &:last-child { @@ -645,7 +906,18 @@ table { } } -#sidebar_close { +.sidebar_heading { + position: relative; + padding: $lineheight/2 $lineheight; + z-index: 9999; + background: $offwhite; + border-bottom: 1px solid #ccc; + h4 { + margin: 0; + } +} + +.sidebar_close { position: absolute; height: $lineheight; top: 0px; @@ -657,6 +929,8 @@ table { #sidebar_content { position: relative; margin-bottom: 20px; + overflow: auto; + height: 100%; width: 100%; h4 { padding: 0 $lineheight $lineheight/2 $lineheight; @@ -669,7 +943,6 @@ table { /* Rules for the map key which appears in the popout sidebar */ #mapkey { - padding: $lineheight $lineheight 0 $lineheight; .mapkey-table-key img { display: block; margin-left: auto; @@ -747,7 +1020,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } .export_area_inputs { margin-bottom: $lineheight/2; input[type="text"] { - width: 60px; + width: 80px; margin-bottom: 5px; } } @@ -756,24 +1029,9 @@ ul.results-list li { border-bottom: 1px solid #ccc; } margin: $lineheight/4; } -.export_details input[type="text"]#export_html_text { - width: 100%; -} - -#sidebar #marker_inputs li:last-child { - margin-bottom: $lineheight/2; -} - -#export_osm, -#export_mapnik, -#export_osmarender { - display: none; -} - /* Rules for the main content area */ #content { - padding: $lineheight; position: relative; } @@ -787,16 +1045,58 @@ ul.results-list li { border-bottom: 1px solid #ccc; } border-left: 1px solid #ccc; } +/* Overrides for pages that use new layout conventions */ +.site-verifysignup, +.site-copyright, +.site-welcome { + #content { + max-width: 740px; + } +} + +.user-new, +.user-create { + .content-heading { + height: 200px; + } + + #content.pad2 { + padding: 0; + } +} + +.header-illustration { + background-position: 0 0; + background-repeat: no-repeat; + position: absolute; +} + +.header-illustration.new-user-main { + height: 200px; + width: 100%; + left: 0; + bottom: 0; + background-image: image-url("sign-up-illustration.png"); +} + +.header-illustration.new-user-arm { + height: 110px; + width: 130px; + left: 260px; + top: 160px; + background-image: image-url("sign-up-illustration-arm.png"); +} + +@media only screen and (max-width:770px) { + .new-user-illustration.new-user-arm { display: none;} +} + .wrapper { margin-left: 184px; border-left: 1px solid #ccc; text-align: left; } -.site-edit #content { - top: 30px; -} - #content.maximised { top: 0; left: 0; @@ -846,6 +1146,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } position: relative; padding: $lineheight; background: $offwhite; + z-index: 2; h1, h2 { margin-bottom: $lineheight/2; line-height: 100%; @@ -876,28 +1177,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; } margin-bottom: $lineheight; } -/* Rules for the home page */ - -.site-export #map, -.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; - overflow: hidden; -} - /* Rules for the changeset list shown by the history tab etc */ #changeset_list { @@ -964,7 +1243,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } h4, p { margin-bottom: $lineheight/4; } - p, ul, .bbox, .geo { + ul, .bbox, .geo { display: inline-block; vertical-align: top; max-width: 65%; @@ -974,6 +1253,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } margin-bottom: 0; } h4 { + float: left; width: 33.3333%; display: inline-block; vertical-align: top; @@ -1161,7 +1441,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } } h1, h2 { font-size: 21px; - line-height: 1; + line-height: 1em; } small.deemphasize { float: left; @@ -1225,7 +1505,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } float: left; } -/* Rules for the login page */ +/* Rules for the log in page */ #login_openid_buttons { margin-bottom: 0; @@ -1265,9 +1545,9 @@ ul.results-list li { border-bottom: 1px solid #ccc; } float: left; } #decline { - background: $grey; + background: $lightblue; &:hover { - background: darken($grey, $hovercolor); + background: darken($lightblue, $hovercolor); } } } @@ -1363,12 +1643,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; } } p:last-child, h2:last-child, - h3:last-child { + h3:last-child, + ol:last-child, + ul:last-child { margin-bottom:0; } tr td { height: 30px; - border-right: 1px solid $keyline; + border-right: 1px solid $lightgrey; } } @@ -1403,7 +1685,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } .message-read .message-buttons { margin-top: $lineheight; padding-top: $lineheight; - border-top: 1px solid $keyline; + border-top: 1px solid $lightgrey; } .message-read .buttons .mark-unread-button { @@ -1430,7 +1712,17 @@ ul.results-list li { border-bottom: 1px solid #ccc; } .field_with_errors { padding: 2px; background-color: #ff7070; - display: table; + display: inline-block; +} + +.formError { + display: inline-block; + padding: 5px 10px; + margin-top: 5px; + border-radius: 4px; + font-size: 12px; + color: #fff; + background-color: #ff7070; } /* Rules for rails validation error boxes */ @@ -1438,11 +1730,12 @@ ul.results-list li { border-bottom: 1px solid #ccc; } #errorExplanation { width: 400px; border: 2px solid #ff7070; - padding: $lineheight/2; + padding: 0 $lineheight/2; margin-bottom: $lineheight; background-color: #f0f0f0; + h2 { - margin: -10px; + margin: 0 -10px 10px -10px; padding: $lineheight/4 $lineheight/4 $lineheight/4 15px; font-weight: bold; font-size: 12px; @@ -1457,11 +1750,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; } padding: $lineheight/4; } - ul li { - font-size: 12px; - list-style: disc; - } + ul { + padding-left: $lineheight; + li { + font-size: 12px; + list-style: disc; + } + } } /* Rules for forms */ @@ -1491,7 +1787,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } .form-divider { margin-top: $lineheight; padding-top: $lineheight; - border-top: 1px solid $keyline; + border-top: 1px solid $lightgrey; } .form-row { margin-bottom: $lineheight/2; @@ -1532,7 +1828,6 @@ textarea { textarea { padding: 5px; width: 100%; - height: 100% !important; } /* Rules for user images */ @@ -1626,6 +1921,7 @@ a.button { display: inline-block; line-height: 20px; padding: $lineheight/4 $lineheight/2; + min-height: 20px + $lineheight/2; min-width: 120px; margin: 0 0 $lineheight/2 0; color: white; @@ -1643,6 +1939,12 @@ a.button { background: darken($lightblue, $hovercolor); } } + &:disabled { + background: $lightgrey; + &:hover { + background: $lightgrey; + } + } &:last-child { margin-bottom: 0; } @@ -1659,8 +1961,11 @@ a.button { border-radius: 0; margin:0; min-width: 100px; - max-width: 150px; + max-width: 180px; border-right:1px solid white; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } input:first-child, .button:first-child { @@ -1765,7 +2070,6 @@ a.button { } ul, ol { - font-style: italic; padding-left: $lineheight; margin-bottom: $lineheight; margin-left: $lineheight; @@ -1873,11 +2177,11 @@ a.button { /* Rules for the notes interface */ -.note { +.leaflet-popup-content .note { padding-top: $lineheight/2; } -.note { +.leaflet-popup-content .note { h2 { margin-bottom: $lineheight/2; } @@ -1892,7 +2196,6 @@ a.button { left: $lineheight/4; min-width: 15px; min-height: 15px; - background: image-url("sprite.png") 0 -45px no-repeat; } .permalink span { @@ -1935,6 +2238,30 @@ a.button { /* * Rules for the iD editor */ + +.site-edit-id { + #left, + #large-title { + display: none; + } + + #small-title { + display: inline-block; + width: 185px; + height: 30px; + font-size: 14px; + margin: 0; + background-color: #eee; + border-bottom: 1px solid #ccc; + text-align: center; + padding-top: 7px; + } + + #content { + left: 0; + } +} + .id-embed { width: 100%; height: 100%; @@ -1954,3 +2281,100 @@ a.button { border: 0; background: #fff; } + +/* Rules for the "Verify signup" page */ +.site-verifysignup .content-heading { + height: 200px; +} + +.header-illustration.verify-main { + background-position: 0 0; + background-repeat: no-repeat; + position: absolute; +} + +.header-illustration.verify-main { + height: 200px; + width: 100%; + left: 0; + bottom: 0; + background-image: image-url("verify-illustration.png"); +} + +/* Rules for the "Welcome" page */ +.site-welcome { + .center { + text-align: center; + .sprite { + float: none; + margin: auto; + } + } + + .drop { + margin-top: 20px; + } + + .sprite { + background-image: image-url("welcome-sprite.png"); + background-size: 500px 250px; + display: block; + float: left; + } + + .icon-list { + padding-bottom: 20px; + div { + margin-bottom: 10px; + p { + padding-top: 10px; + } + } + } + .sprite.small { + width: 50px; + height: 50px; + } + + .sprite.x { + background-position: -50px 0; + } + + .sprite.term { + margin-right: 10px; + vertical-align: middle; + } + + .sprite.node { + background-position: -100px 0; + } + + .sprite.way { + background-position: -150px 0; + } + + .sprite.tag { + background-position: -200px 0; + } + + .sprite.editor { + background-position: -250px 0; + } + + .sprite.question { + background-position: -300px 0; + } + + .start-mapping { + margin: auto; + cursor: pointer; + border: none; + padding: 20px 40px; + font-size: 30px; + text-decoration: none; + } + + .note-box { + background-color: $offwhite; + } +}