X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3ebad9ec2f59f2ba5716952f6169cdbb4972f931..ecbe27b373bbe241af332d51a663192fd71a2520:/app/assets/stylesheets/common.css.scss diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 7395afc99..bef955509 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -97,9 +97,9 @@ abbr, acronym { /* Default rules for the body of every page */ * { - -moz-box-sizing: border-box; -webkit-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } body { @@ -130,10 +130,6 @@ h2, h3 { font-size: 16px; } -p { - margin-bottom: $lineheight; -} - p > img { width: auto; max-width: 100%; @@ -143,15 +139,6 @@ small, aside { font-size: 12px; } -h1:first-child, -h2:first-child, -h3:first-child, -h4:first-child, -h5:first-child, -h6:first-child { - margin-top: 0; -} - .column-1 { width: 50%; margin: 0 0 $lineheight/2 0; @@ -172,10 +159,6 @@ h6:first-child { 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; } @@ -232,42 +215,6 @@ table { } } -/* Rules for the search box */ - -#search_form { - position: relative; - padding: $lineheight; - background-color: $lightgrey; - border-bottom: $keyline; - - #query_wrapper { - overflow: hidden; - } - - input { - width: 100%; - height: 30px; - border-right: none; - border-radius: 2px 0 0 2px; - - transition: 300ms linear; - -webkit-transition: 300ms linear; - -moz-transition: 300ms linear; - } - - input:focus { - outline: none; - box-shadow: 0px 0px 7px #9ED485; - } - - input[type=submit] { - float: right; - width: auto; - min-width: 0; - border-radius: 0 2px 2px 0; - } -} - /* Utility for de-emphasizing content */ .deemphasize { @@ -277,27 +224,6 @@ table { } } -/* Rules for donation request box */ - -a.donate { - display: block; - width: 163px; - padding: $lineheight/4; - border: 1px solid #AED1A0; - background: #cbeea7; - font-size: $typeheight; - line-height: 1.4; - text-align: center; - border-radius: 2px; - color: #222; - margin: $lineheight/2 auto; - - &:hover { - background: #9ed485; - text-decoration: none; - } -} - /* Rules for the header */ header { @@ -319,43 +245,56 @@ header { float: left; } + a, a:hover { + text-decoration: none; + } + img.logo { - width: 30px; - height: 30px; + width: 40px; + height: 40px; vertical-align: middle; } h1 { margin: 0; border-right: $keyline; + + a { + color: #000; + } } } nav.primary { > ul { - border: 1px solid darken($green, 20%); + $border: 1px solid darken($green, 20%); + + border: $border; border-radius: 4px; + + > li { + border-right: $border; + &:last-child { border-right: 0; } + } } - a.tab { + a.tab, + .dropdown-toggle { display: inline-block; font-weight: bold; - text-decoration: none; color: $green; padding: 5px 15px; - border-right: 1px solid darken($green, 20%); } - #edit_tab a.tab { - border-right: 1px solid lighten($green, 20%); + .dropdown-toggle { + padding: 5px 10px; } - .dropdown-toggle { - padding: 5px 10px 5px 5px; + #edit_tab a.tab { + border-right: 1px solid lighten($green, 20%); } .caret { - margin-top: 15px; border-top-color: $green; } @@ -363,28 +302,21 @@ nav.primary { color: #ccc; cursor: default; - &:hover { - text-decoration: none; - } - .caret { border-top-color: #ccc; } } -} -.site-index #view_tab, -.changeset-list #history_tab, -.site-export #export_tab, -.site-edit #edit_tab { - background-color: $green; + > ul li.current { + background-color: $green; - .tab { - color: #fff; - } + .tab { + color: #fff; + } - .caret { - border-top-color: #fff; + .caret { + border-top-color: #fff; + } } } @@ -392,39 +324,55 @@ nav.secondary { position: absolute; right: 0; - > ul a { + > ul a, + .dropdown-toggle { + display: inline-block; font-weight: bold; text-decoration: none; color: $darkgrey; - padding-right: 10px; + padding: 5px 5px; + } + + > ul li.current a { + color: darken($darkgrey, 25%); } - .dropdown { - border: 1px solid $grey; + .user-menu { + $border: 1px solid $grey; + + border: $border; border-radius: 4px; + margin-left: 10px; + + > li { + border-right: $border; + &:last-child { border-right: 0; } + } + + a { + padding: 5px 15px; + } } - img { + .caret { + border-top-color: $grey; + margin-top: 10px; + } + + img.user_thumbnail_tiny { + border: 0; vertical-align: top; + margin-top: 2px; border-radius: 2px 0 0 2px; - margin-right: 5px; } #inboxanchor { display: inline-block; - position: relative; + vertical-align: top; height: 20px; - top: -2px; - margin: 0 2px 0 0; - padding: 0 5px 0 0; - border-radius: 2px; - } - - .dropdown-toggle { - display: block; - padding: 3px 7px; - color: #000; - text-decoration: none; + margin: 2px 7px 0 0; + background-color: $grey; + border-radius: 0 2px 2px 0; } .dropdown-menu { @@ -551,7 +499,6 @@ nav.secondary { 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; @@ -592,40 +539,90 @@ nav.secondary { border-radius: 0 0 0 4px; } -/* Rules for the home page */ +/* Rules for the sidebar and main map area */ -#map { - height: 100%; - overflow: hidden; -} +.map-layout { + #content { + position: absolute; + top: $headerHeight; + bottom: 0; + width: 100%; + } -#map-ui { - display: none; - position: relative; - float: right; - width: 250px; - height: 100%; - background: white; - overflow: auto; + #sidebar, #map { + position: relative; + height: 100%; + overflow-x: hidden; + overflow-y: auto; + } + + #sidebar { + float: left; + width: $sidebarWidth; + border-right: $keyline; + + h2, h3, h4 { + padding: $lineheight; + border-bottom: $keyline; + } + + h4 { + font-weight: normal; + } - .section { - border-bottom: 1px solid #DDD; - padding: 15px; + .icon.close { + position: absolute; + right: $lineheight; + } + + .footer { + position: absolute; + bottom: 0; + } + + p.credits { + font-size: 11px; + color: #999; + + a { + color: #666; + } + } } - a.close-button { + #map { + height: 100%; + overflow: hidden; + } + + #map-ui { + display: none; + position: relative; float: right; - padding:5px; - font-size:20px; - line-height:10px; - color:#222; - border:1px solid #ddd; + width: 250px; + height: 100%; + background: white; + 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 { + li:last-child { margin-bottom: 0; } } @@ -713,7 +710,7 @@ nav.secondary { } .leaflet-top.leaflet-right { - top: 10px !important; + top: $lineheight !important; .leaflet-control { margin-right: 0px !important; margin-top: 0px !important; @@ -731,25 +728,6 @@ nav.secondary { -webkit-border-radius: 4px !important; } -/* Rules for edit menu */ - -.menu { - display: none; - z-index: 10000; - position: absolute; - background-color: #ffffff; - border: 1px solid $lightgrey; - border-top: 0px; - ul { - margin: 0px; - } - li { - padding: 2px $lineheight/4; - border-top: 1px solid #eee; - white-space: nowrap; - } -} - /* Rules for attribution text under the main map shown on printouts */ #attribution { @@ -767,54 +745,11 @@ nav.secondary { /* Rules for the sidebar */ -#sidebar { - border-right: $keyline; - - .alert { - background: #e00; - } - - h2, h3, h4 { - padding: $lineheight; - border-bottom: $keyline; - } - - h4 { - font-weight: normal; - } - - .icon.close { - position: absolute; - right: $lineheight; - } - - p { - margin: 0; - } - - .footer { - position: absolute; - bottom: 0; - } - - p.credits { - font-size: 11px; - color: #999; - - a { - color: #666; - } - } -} - .sidebar_heading { position: relative; padding: $lineheight/2 $lineheight; background: $offwhite; border-bottom: 1px solid #ccc; - h4 { - margin: 0; - } } .sidebar_close { @@ -834,6 +769,95 @@ nav.secondary { overflow-y: auto; } +/* Rules for the search box */ + +#search_form { + position: relative; + padding: $lineheight; + background-color: $lightgrey; + border-bottom: $keyline; + + #query_wrapper { + position: relative; + overflow: hidden; + } + + input { + width: 100%; + height: 30px; + border-right: none; + border-radius: 2px 0 0 2px; + + transition: 300ms linear; + -webkit-transition: 300ms linear; + -moz-transition: 300ms linear; + } + + input:focus { + outline: none; + box-shadow: 0px 0px 7px #9ED485; + } + + input[type=submit] { + float: right; + width: auto; + min-width: 0; + border-radius: 0 2px 2px 0; + } + + #describe_location { + position: absolute; + top: 6px; + right: 6px; + font-size: 10px; + color: $blue; + } +} + +/* Rules for donation request box */ + +a.donate { + display: block; + width: 163px; + padding: $lineheight/4; + border: 1px solid #AED1A0; + background: #cbeea7; + font-size: $typeheight; + line-height: 1.4; + text-align: center; + border-radius: 2px; + color: #222; + margin: $lineheight/2 auto; + + &:hover { + background: #9ed485; + text-decoration: none; + } +} + +/* Rules for rotating sidebar ads */ + +.ad-container { + display: block; + height: 120px; + margin: auto; + overflow: hidden; + position: relative; + border-bottom: 1px solid #ccc; + + a { + display: block; + width: 165px; + margin: auto; + } + + .ad { + height: 100px; + border: 0; + background: #fff; + } +} + /* Rules for the map key which appears in the popout sidebar */ #mapkey { @@ -879,33 +903,105 @@ nav.secondary { color: #f00; } -/* Rules for data browser information which appears in the popout sidebar */ +/* Rules for data browser information which appears in the popout sidebar */ + +#browse_content { + position: relative; + .browse_show_list.button { + position: absolute; + left: $lineheight; + right: $lineheight; + bottom: -40px; + margin-bottom: 0; + } + a.more-details { + position: absolute; + top: 0; + right: $lineheight; + } + ul li { + margin-bottom: 0; + } +} + +.browse_details { + position: relative; +} + +.browse_status { + display: none; +} + +/* Rules for the changeset list shown by the history tab */ + +#sidebar .changesets { + li { + padding: $lineheight; + border-bottom: $keyline; + } +} + +/* Rules for the data browser */ + +#sidebar_content { + .browse-section { + padding: 20px; + border-bottom: 1px solid #CCC; + } + + .browse-field { + margin-bottom: 10px; + + h4 { + padding: 5px 0 5px 10px; + font-size: 12px; + border: 1px solid #CCC; + border-radius: 4px 4px 0 0; + background-color: #F6F6F6; + } + + p { + padding: 7px 10px; + font-size: 12px; + background-color: #FFF; + border: 1px solid #CCC; + border-top: 0; + border-radius: 0 0 4px 4px; + } + } + + .browse-tag-list { + border: 1px solid #CCC; + border-radius: 4px; + font-size: 12px; + + li { + border-bottom: 1px solid #CCC; + } + + li:last-child { + border-bottom: 0; + } -#browse_content { - position: relative; - .browse_show_list.button { - position: absolute; - left: $lineheight; - right: $lineheight; - bottom: -40px; - margin-bottom: 0; - } - a.more-details { - position: absolute; - top: 0; - right: $lineheight; - } - ul li { - margin-bottom: 0; - } -} + .browse-tag-k, + .browse-tag-v { + display: inline-block; + width: 50%; + height: 30px; + float: left; + padding: 9px 10px; + } -.browse_details { - position: relative; -} + .browse-tag-k { + font-weight: bold; + background-color: #F6F6F6; + border-radius: 4px 0 0 4px; + } -.browse_status { - display: none; + .browse-tag-v { + border-left: 1px solid #CCC; + } + } } /* Rules for export information which appears in the popout sidebar */ @@ -926,41 +1022,27 @@ nav.secondary { margin: $lineheight/4; } -/* Rules for the sidebar and main content area */ +/* Rules for non-map content pages */ -.site-index, -.site-export, -.site-edit, -.changeset-list, -.browse { - #content { - position: absolute; - top: $headerHeight; - bottom: 0; - width: 100%; - } +.content-heading { + background: $lightgrey; + border-bottom: $keyline; +} - #sidebar, #map { - position: relative; - height: 100%; - overflow-x: hidden; - overflow-y: auto; +.content-body { + h1, h2, h3, p { + margin-bottom: $lineheight; } - #sidebar { - float: left; - width: $sidebarWidth; + h1, h2, h3 { + margin-top: $lineheight/2; } } -.content-heading { +.content-inner { position: relative; - padding: $lineheight; - background: $lightgrey; - border-bottom: $keyline; -} - -.content-body { + max-width: 900px; + margin: auto; padding: $lineheight; } @@ -968,18 +1050,18 @@ nav.secondary { .user-new, .user-create, -.user-terms, -.user-confirm { - .content-heading { - height: 200px; +.user-terms { + .content-body .content-inner { + padding: 0; } } .user-new, .user-create, -.user-terms { - .content-body { - padding: 0; +.user-terms, +.user-confirm { + .content-heading .content-inner { + height: 200px; } } @@ -1010,16 +1092,14 @@ nav.secondary { left: 260px; top: 160px; background-image: image-url("sign-up-illustration-arm.png"); + z-index: 100; } } @media only screen and (max-width:900px) { - .header-illustration.new-user-arm { display: none;} -.wrapper { - margin-left: $sidebarWidth; - text-align: left; -} - + .header-illustration.new-user-arm { + display: none; + } } #content.maximised { @@ -1078,88 +1158,6 @@ nav.secondary { float: right; } -/* Rules for the changeset list shown by the history tab */ - -#sidebar .changesets { - li { - padding: $lineheight; - border-bottom: $keyline; - } - - p { - padding: 0; - } -} - -/* Rules for the data browser */ - -body.browse #sidebar_content { - .browse-section { - padding: 20px; - border-bottom: 1px solid #CCC; - - ul { - margin: 0; - } - } - - .browse-field { - margin-bottom: 10px; - - h4 { - margin: 0; - padding: 5px 0 5px 10px; - font-size: 12px; - border: 1px solid #CCC; - border-radius: 4px 4px 0 0; - background-color: #F6F6F6; - } - - p { - margin: 0; - padding: 7px 10px; - font-size: 12px; - background-color: #FFF; - border: 1px solid #CCC; - border-top: 0; - border-radius: 0 0 4px 4px; - } - } - - .browse-tag-list { - border: 1px solid #CCC; - border-radius: 4px; - font-size: 12px; - - li { - border-bottom: 1px solid #CCC; - } - - li:last-child { - border-bottom: 0; - } - - .browse-tag-k, - .browse-tag-v { - display: inline-block; - width: 50%; - height: 30px; - float: left; - padding: 9px 10px; - } - - .browse-tag-k { - font-weight: bold; - background-color: #F6F6F6; - border-radius: 4px 0 0 4px; - } - - .browse-tag-v { - border-left: 1px solid #CCC; - } - } -} - /* Rules for the trace list shown by the traces tab etc */ #trace_list { @@ -1298,46 +1296,40 @@ body.browse #sidebar_content { /* Rules for the diary list page */ -.diary_entry-list img.user_thumbnail { - float: left; -} - .diary_post { - max-width: 740px; position: relative; margin-top: $lineheight/2; padding-top: $lineheight; border-top: 1px solid #ccc; - &:first-child { - margin-top: 0; - border-top: 0; - padding-top: 0; + .post_heading { + margin-bottom: $lineheight; + + h2 { + margin-top: 0; + margin-bottom: $lineheight/2; + font-size: 24px; + } } - h1, h2 { - font-size: 21px; - line-height: 1em; + + img.user_thumbnail { + float: left; } + small.deemphasize { float: left; display: block; } - ul.secondary-actions { display: inline-block;} + + ul.secondary-actions { + display: inline-block; + } } .content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div display: inline; } -#content .post_heading { - margin-bottom: $lineheight; - h2 { - margin-top: 0; - margin-bottom: $lineheight/2; - font-size: 24px; - } -} - /* Rules for the diary entry page */ .diary_entry { @@ -1400,19 +1392,6 @@ body.browse #sidebar_content { margin-bottom: $lineheight; overflow: auto; height: 10em; - - &:p#last { - margin-bottom: 0px; - } - - &:ol { - margin-bottom: 0px; - } - - &:img { - display: block; - margin: $lineheight auto inherit auto; - } } #decline { @@ -1558,17 +1537,19 @@ body.browse #sidebar_content { /* Rules for "flash" notice boxes shown at the top of the content area */ -.flash { - padding: $lineheight; - &#error { - background-color: #ff7070; - } - &#warning { - background-color: #ffe0cc; - } - &#notice { - background-color: #CBEEA7; - } +.error { + padding: $lineheight; + background-color: #ff7070; +} + +.warning { + padding: $lineheight; + background-color: #ffe0cc; +} + +.notice { + padding: $lineheight; + background-color: #CBEEA7; } /* Rules for highlighting fields with rails validation errors */ @@ -1722,12 +1703,6 @@ img.user_thumbnail_tiny { border: 1px solid #ccc; } -/* Rule for "nowrap" class that can be applied to anything to stop wrapping */ - -.nowrap { - white-space: nowrap; -} - /* Rules for geo microformats */ abbr.geo { @@ -1766,10 +1741,6 @@ ul.secondary-actions { margin-right: 0px; } } - .dropdown-menu { - left: auto; - right: 0; - } } /* Utility for managing inner content areas */ @@ -1867,7 +1838,7 @@ a.button { *[value="Hide"] + input:nth-child(2):not(:last-child), *[value="Hide"] + .button:nth-child(2):not(:last-child) { border-radius:2px 0 0 2px; - border-right-width: 1px solid white; + border-right-width: 1px; } } @@ -2109,37 +2080,13 @@ a.button { } } -/* - * Rules for the iD editor - */ +/* Rules for the iD editor */ .id-embed { width: 100%; height: 100%; } -/* Rules for rotating sidebar ads */ -.ad-container { - display: block; - height: 120px; - margin: auto; - overflow: hidden; - position: relative; - border-bottom: 1px solid #ccc; - - a { - display: block; - width: 165px; - margin: auto; - } - - .ad { - height: 100px; - border: 0; - background: #fff; - } -} - /* Rules for dropdown menus */ .dropdown { @@ -2225,7 +2172,7 @@ a.button { .dropdown-submenu:focus > a { color: #ffffff; text-decoration: none; - background-color: #0081c2; + background-color: $green; } .dropdown-menu > .active > a, @@ -2233,7 +2180,7 @@ a.button { .dropdown-menu > .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #0081c2; + background-color: $green; outline: 0; } @@ -2395,12 +2342,9 @@ a.button { background-color: rgba(0, 0, 0, 0.5); } - #content-body { - display: block; + .content-inner { position: relative; - margin: auto; color: #333; - width: 50%; min-width: 320px; max-width: 640px; @@ -2486,3 +2430,5 @@ a.button { &.infringement { background-position: 0px -160px; } } } + +@import 'browse';