X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d6507a5882a3a4dae12beed712a1770b076f31a5..8598db3233baefa9e455da331ca2579a8df17709:/app/assets/stylesheets/common.css.scss diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index fd72d348e..37a6aa7a9 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1,20 +1,4 @@ -/* Parameters */ -$lineheight: 20px; -$typeheight: 14px; - -$offwhite: #f4f4ff; -$blue: #7092FF; -$lightblue: #B8C5F0; -$green: #7ebc6f; -$grey: #CCC; -$red: red; -$lightgrey: #EEE; -$darkgrey: #AAA; -$hovercolor: 20%; -$headerHeight: 54px; -$sidebarWidth: 300px; -$keyline: 1px solid $lightgrey; -$border-radius: 3px; +@import "parameters"; /* Styles common to large and small screens */ @@ -52,7 +36,9 @@ abbr, acronym { cursor: help; } -strong { font-weight: 500; } +strong { + font-weight: bold; +} /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */ @@ -101,9 +87,7 @@ strong { font-weight: 500; } /* Default rules for the body of every page */ * { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; } body { @@ -118,16 +102,14 @@ body { height: 100%; } -body.slim { - background-color: #f0f0f0; -} - h1, h2, h3 { - font-weight: 500; + font-weight: 600; line-height: 1.2; } -h4, h5 { font-weight: 500; } +h4, h5 { + font-weight: 500; +} h1 { font-size: 18px; @@ -192,7 +174,7 @@ small, aside { /* Rules for links */ a { - color: #00f; + color: #24d; text-decoration: none; -webkit-appearance: none; outline: 0; @@ -221,7 +203,7 @@ table { line-height: $lineheight; } th { - font-weight: 500; + font-weight: 600; vertical-align: top; } td { @@ -256,7 +238,7 @@ header { height: $headerHeight; position: relative; z-index: 1001; - font-size: 13px; + font-size: 14px; h1, nav, nav > ul, nav > ul > li, .dropdown { display: inline-block; @@ -278,7 +260,7 @@ header { img.logo { width: 30px; height: 30px; - margin-top: -4px; + margin-top: -2px; vertical-align: middle; } @@ -366,7 +348,7 @@ nav.secondary { color: $darkgrey; padding: 5px; - &:hover { color: darken($darkgrey, 10%); } + &:hover { color: darken($darkgrey, 25%); } } } @@ -376,8 +358,6 @@ nav.secondary { .user-menu { $border: 1px solid $grey; - - font-weight: 500; border: $border; border-radius: $border-radius; margin-left: 10px; @@ -404,7 +384,8 @@ nav.secondary { &.logged-in > a { padding: 0; > .user-button { - padding: 5px 10px 5px 6px; + line-height: 1.8; + padding: 5px 10px 3px 6px; display: inline-block; color: $darkgrey; } @@ -421,7 +402,7 @@ nav.secondary { border: 0; vertical-align: top; margin-top: 0px; - margin: 3px 0 0 3px; + margin: 4px 0 0 4px; border-radius: 2px; } @@ -481,9 +462,8 @@ nav.secondary { #noscript { z-index: 20000000; - position: absolute; - top: 15px; - left: 15px; + margin-left: 400px; + margin-top: 50px; } /* Rules for bootstrap tooltips */ @@ -622,6 +602,7 @@ nav.secondary { .map-layout { #content { + overflow: hidden; position: absolute; top: $headerHeight; bottom: 0; @@ -639,35 +620,40 @@ nav.secondary { float: left; width: $sidebarWidth; background: #fff; + font-size: 12px; - h2, h3, h4 { + h2 { padding: $lineheight $lineheight $lineheight/2; } - h4 { - font-weight: normal; - color: #666; - font-size: 12px; + h3, h4 { + margin-top: $lineheight; + margin-bottom: $lineheight/2; + font-size: 13px; } .icon.close { float: right; cursor: pointer; } + } - -webkit-transition: margin 300ms linear; - -moz-transition: margin 300ms linear; - transition: margin 300ms linear; + .welcome { + display: none; } .overlay-sidebar #sidebar { position: absolute; z-index: 1000; height: auto; - border-radius: 5px; + border-bottom-right-radius: 5px; overflow: hidden; - margin-top: $lineheight/2; - margin-left: $lineheight/2; + .welcome { + display: block; + } + #sidebar_content { + display: none; + } } .welcome { @@ -682,7 +668,7 @@ nav.secondary { float: left; margin: 0; border-radius: 0; - font-weight: 400; + font-weight: normal; padding: .6em; &.learn-more { @@ -718,6 +704,14 @@ nav.secondary { color:#222; border:1px solid #ddd; } + + .tooltip { + opacity: 1; + border: 1px solid #ccc; + .tooltip-arrow { + border-top-color: #ccc; + } + } } } @@ -751,10 +745,11 @@ nav.secondary { padding: 2px 6px; border-bottom-right-radius: 3px; cursor: pointer; - font-weight: 500; + font-weight: 600; font-size: 16px; text-stroke: 2px #fff; background: rgba(255,255,255,.9); + z-index: 2; // For IE9 input[type="radio"] { display: none; } @@ -773,6 +768,7 @@ nav.secondary { font-size: 13px; margin-bottom: 8px; } + li.disabled { color: #999; } } } @@ -847,7 +843,6 @@ nav.secondary { .leaflet-popup-content-wrapper { border-radius: 4px !important; - -webkit-border-radius: 4px !important; } /* Rules for attribution text under the main map shown on printouts */ @@ -885,39 +880,48 @@ nav.secondary { p { padding: $lineheight; } + + input { + display: block; + margin-left: auto; + margin-right: auto; + } } -#sidebar_content { +#sidebar { + #sidebar_loader, .loader, .load_more { text-align: center; margin: $lineheight auto; - width: $lineheight; + width: 40px; display: block; } } /* Rules for the search box */ -#search_form { +header .search_form { + display: none; +} + +.search_form { position: relative; padding: $lineheight/2; background-color: $lightgrey; - #query_wrapper { + .query_wrapper { position: relative; overflow: hidden; + border-radius: 2px 0 0 2px; } - input { + input[type=text] { 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 { @@ -932,7 +936,7 @@ nav.secondary { border-radius: 0 2px 2px 0; } - #describe_location { + .describe_location { position: absolute; top: 6px; right: 6px; @@ -941,48 +945,6 @@ nav.secondary { } } -/* Rules for donation request box */ - -a.donate { - display: block; - padding: $lineheight/4 $lineheight; - border: 1px solid $green; - font-size: $typeheight; - line-height: 1.4; - text-align: center; - border-radius: 2px; - color: #222; - margin: $lineheight/2 $lineheight; - - &:hover { - background: $green; - 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 { @@ -996,12 +958,14 @@ a.donate { } } -/* Rules for search results which appear in the popout sidebar */ +/* Rules for search sidebar */ .search_results_entry { ul li { border-bottom: $keyline; + cursor: pointer; &:first-child { border-top: $keyline; } + &.selected { background: #FFFFE6; } } .search_details { @@ -1017,28 +981,8 @@ a.donate { color: #f00; } -/* 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; - } -} - /* Rules for entity history */ + #sidebar_content { .browse_details { position: relative; @@ -1050,47 +994,51 @@ a.donate { display: none; } -/* Rules for the changeset list shown by the history tab */ +/* Rules for the history sidebar */ #sidebar .changesets { li { - padding: $lineheight; - border-bottom: $keyline; + padding: 15px 20px; + border-bottom: 1px solid #ddd; cursor: pointer; &.selected { background: #FFFFE6; } /* color is derived from changeset bbox fillColor in history.js */ - - h4 { - padding: 0; - } } - .comment a { - font-weight: 500; - color: #000; + h4 { + margin: 0; + a { + color: #000; + } } } -/* Rules for the data browser */ +/* Rules for the browse sidebar */ #sidebar_content { .browse-section { - padding: 10px 20px; + padding: $lineheight/2 $lineheight; + border-bottom: 1px solid #ddd; - h4 { - padding: 0; + h4:first-child { + margin-top: 0; + word-wrap: break-word; } + } - .paginate { - float: right; - padding: 1px 6px; - border: 1px solid #eee; - border-radius: 3px; - } + .browse-section:last-of-type { + border-bottom: none; + } + + .paginate { + float: right; + padding: 1px 6px; + border: 1px solid #eee; + border-radius: 3px; } - .paginate ul, .note-comments ul { + .paginate ul { padding-left: 20px; } @@ -1117,26 +1065,25 @@ a.donate { .browse-tag-list { background-color: #F6F6F6; - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; + border: 1px solid #ddd; + border-radius: 3px; font-size: 12px; - margin-left: -$lineheight; - margin-right: -$lineheight; + table-layout: fixed; + border-collapse: separate; - li { + th, td { border-bottom: 1px solid #ddd; } - li:last-child { + tr:last-child th, tr:last-child td { border-bottom: 0; } .browse-tag-k, .browse-tag-v { - display: inline-block; width: 50%; - float: left; - padding: 6px 10px 6px $lineheight; + padding: 6px 10px; + word-wrap: break-word; } .browse-tag-k { @@ -1149,38 +1096,95 @@ a.donate { background-color: #fff; } } -} -/* Rules for export information which appears in the popout sidebar */ + .warning { + margin: $lineheight/2 0; + padding: $lineheight/2; + font-size: 90%; + } -.export_bounds, .export_button { - text-align: center; -} + .note-comments li, .changeset-comments li { + margin: $lineheight/2 0; -.export_area_inputs { - margin-bottom: $lineheight/2; - input[type="text"] { - width: 80px; - margin-bottom: 5px; + p { + margin-left: 10px; + } + } + + .comments-header { + float: left; + } + + .subscribe-buttons { + float: left; + margin: 18px 10px 10px; + min-width: 80px; + } + + .subscribe-buttons input { + font-size: 90%; + line-height: 15px; + min-height: 20px; + } + + span.action-button:hover { + cursor: pointer; + text-decoration: underline; } -} -.export_bound { - margin: $lineheight/4; + .note-description { + overflow: hidden; + margin: 0 0 10px 10px; + } } -#export_osm { - span.small-title { - font-weight: 500; - display: block; - font-size: 14px; - padding-bottom: 5px; +/* Rules for export sidebar */ + +.export_form { + padding: $lineheight; + + .export_area_inputs, + .export_button { + text-align: center; + } + + .export_area_inputs { + margin-bottom: $lineheight/2; + input[type="text"] { + width: 80px; + text-align: center; + margin-bottom: 5px; + } + } + + .export_boxy { + background: #eee; + border: 1px solid #ccc; + border-radius: 3px; + + #maxlat { margin-top: -1px; } + #minlon { + float: left; + margin-left: -1px; + } + #maxlon { + float: right; + margin-right: -1px; + } + #minlat { margin-bottom: 0; } + } + + .export_bound { + margin: $lineheight/4; + } + + .export_button { + margin-top: $lineheight; + margin-bottom: $lineheight; } dl { - padding-left: 30px; - font-size: 13px; - color: #666; + padding-left: $lineheight/2; dd { margin-left: 0; margin-bottom: 10px; @@ -1200,6 +1204,7 @@ a.donate { #map { height: 100%; + overflow: hidden; } } @@ -1212,7 +1217,7 @@ a.donate { } .content-body { - h1, h2, h3, p { + h1, h2, h3, p, ul, ol { margin-bottom: $lineheight; } @@ -1284,43 +1289,7 @@ a.donate { right: 0; bottom: 0; border: 0; - z-index: 1000; -} - -#slim_container { - width: 100%; -} - -#slim_container_content { - max-width: 50em; - background-color: #FFFFFF; - margin: $lineheight/2 auto; - padding: 3px; - border-radius: 25px; - -moz-border-radius: 25px; - border: 1px solid #e6e6e6; -} - -#slim_content { - margin: $lineheight/2; - margin-top: 95px; - max-width: 50em; - - .content-heading { - margin-bottom: 15px; - } -} - -#slim_header { - margin: 30px $lineheight/2; - position: absolute; - top: 0px; - margin-right: $lineheight/4; - img { - vertical-align: middle; - margin-bottom: $lineheight/4; - margin-right: $lineheight/4; - } + z-index: 2000; } /* Rules for small maps in content areas */ @@ -1367,6 +1336,30 @@ a.donate { } } +/* Rules for the new trace form */ + +#new_trace { + input[type=text] { + width: 50%; + width: calc(100% - 150px); + max-width: 500px; + } +} + +/* Rules for the edit trace form */ + +.edit_trace { + .form-row p { + margin-bottom: 0px; + } + + input[type=text] { + width: 50%; + width: calc(100% - 150px); + max-width: 500px; + } +} + /* Rules for the user profile page */ #userinformation { @@ -1418,6 +1411,10 @@ a.donate { } .user-view { + // Silly exception; remove when user page is redesigned. + .content-inner { + max-width: none; + } p#no_home_location { margin: $lineheight; } @@ -1567,7 +1564,7 @@ a.donate { padding: $lineheight; margin-bottom: $lineheight; overflow: auto; - height: 10em; + height: 20em; } #decline { @@ -1576,11 +1573,6 @@ a.donate { background: darken($lightblue, $hovercolor); } } - - .form-row { - margin: auto; - max-width: 370px; - } } /* Rules for the account settings page */ @@ -1691,6 +1683,10 @@ a.donate { vertical-align: middle; } +.inbox-sent { + white-space: nowrap; +} + .inbox-mark-unread, .inbox-mark-read, .inbox-delete { @@ -1703,6 +1699,7 @@ a.donate { .message-read .message-buttons { margin-top: $lineheight; + margin-bottom: $lineheight * 1.5; padding-top: $lineheight; border-top: 1px solid $lightgrey; } @@ -1730,12 +1727,6 @@ a.donate { /* Rules for highlighting fields with rails validation errors */ -.field_with_errors { - padding: 2px; - background-color: #ff7070; - display: inline-block; -} - .formError { display: inline-block; padding: 5px 10px; @@ -1758,7 +1749,7 @@ a.donate { h2 { margin: 0 -10px 10px -10px; padding: $lineheight/4 $lineheight/4 $lineheight/4 15px; - font-weight: 500; + font-weight: bold; font-size: 12px; background-color: #c00; color: #fff; @@ -1791,7 +1782,7 @@ a.donate { display: block; margin-bottom: $lineheight/4; font-size: $typeheight; - font-weight: 500; + font-weight: bold; line-height: 1.5; } label.standard-label.secondary { @@ -1848,6 +1839,10 @@ textarea { padding: 2px 5px; margin: 0; width: 200px; + + &.field_with_errors { + border: 2px solid #ff7070; + } } textarea { @@ -1874,6 +1869,8 @@ img.user_thumbnail { } img.user_thumbnail_tiny { + width: auto; + height: auto; max-width: 25px; max-height: 25px; border: 1px solid #ccc; @@ -1921,7 +1918,6 @@ ul.secondary-actions { div.secondary-actions { padding: 10px; - border-top: 1px solid #ccc; text-align: center; } @@ -1946,7 +1942,6 @@ a.button { cursor: pointer; border: 0; display: inline-block; - line-height: 20px; padding: $lineheight/4 $lineheight/2; min-height: 20px + $lineheight/2; min-width: 120px; @@ -1955,7 +1950,6 @@ a.button { background: $blue; text-align: center; border-radius: 2px; - -moz-border-radius: 2px; &:hover { background: darken($blue, $hovercolor); text-decoration: none; @@ -1977,6 +1971,16 @@ a.button { } } +input[type="button"], +input[type="submit"], +input[type="reset"] { + line-height: normal; +} + +a.button { + line-height: 20px; +} + .buttons { min-width: 200px; input[type="submit"], @@ -1987,7 +1991,7 @@ a.button { float: left; border-radius: 0; margin:0; - min-width: 100px; + min-width: 75px; max-width: 180px; border-right:1px solid white; text-overflow: ellipsis; @@ -2122,14 +2126,28 @@ a.button { /* Rules for rich text editors */ +input.richtext_title[type="text"] { + width: 50%; + width: calc(100% - 235px); + + @media only screen and (max-width:768px) { + width: 100%; + } +} + .richtext_container { margin-bottom: $lineheight; .richtext_content { width: 50%; + width: calc(100% - 235px); display: inline-block; vertical-align: top; + @media only screen and (max-width:768px) { + width: 100%; + } + .richtext_preview { display: inline-block; padding: $lineheight; @@ -2202,66 +2220,6 @@ a.button { } } -/* Rules for the notes interface */ - -.leaflet-popup-content .note { - padding-top: $lineheight/2; -} - -.leaflet-popup-content .note { - h2 { - margin-bottom: $lineheight/2; - } - - div { - margin-top: $lineheight/2; - } - - .permalink { - position: absolute; - top: $lineheight/4; - left: $lineheight/4; - min-width: 15px; - min-height: 15px; - } - - .permalink span { - display: none; - padding-left: $lineheight; - } - - .permalink:hover span { - display: block; - } - - .warning { - display: block; - background-color: #ffe0cc; - padding: 4px 6px; - margin-bottom: $lineheight/2; - } - - .comment_body { - margin-top: 2px; - margin-bottom: 2px; - - p { - margin-top: 0px; - margin-bottom: 0px; - } - } - - .comment { - width: 100%; - height: 100px; - } - - .buttons { - margin-top: $lineheight/4; - text-align: right; - } -} - /* Rules for the iD editor */ .id-embed { @@ -2316,12 +2274,8 @@ a.button { border-radius: 0 3px 3px; *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + background-clip: padding-box; } .dropdown-menu.pull-right { @@ -2399,7 +2353,7 @@ a.button { } /* Rules for the "Welcome" page */ -.site-welcome { +.site-welcome, .site-fixthemap { .center { text-align: center; .sprite { @@ -2486,13 +2440,6 @@ a.button { background-size: cover; background-attachment: fixed; - &.photo-0 { background-image: image-url('about/0.jpg'); .photo-0 { display: block; } } - &.photo-1 { background-image: image-url('about/1.jpg'); .photo-1 { display: block; } } - &.photo-2 { background-image: image-url('about/2.jpg'); .photo-2 { display: block; } } - &.photo-3 { background-image: image-url('about/4.jpg'); .photo-3 { display: block; } } - &.photo-4 { background-image: image-url('about/4.jpg'); .photo-4 { display: block; } } - &.photo-5 { background-image: image-url('about/5.jpg'); .photo-5 { display: block; } } - .caption { max-width: 200px; font: 13px/20px Helvetica, Arial, sans-serif; @@ -2618,6 +2565,36 @@ a.button { } } +#sidebar #sotm { + padding: 10px; + min-height: 120px; + + img { + float: left; + width: 100px; + height: 100px; + } + + h2 { + margin-left: 100px; + padding: 7px 10px 6px 15px; + } + + p { + margin-left: 100px; + padding: 6px 10px 7px 15px; + } + + a { + color: $darkgrey; + } + + :hover { + text-decoration: none; + color: darken($darkgrey, 25%); + } +} + @import 'browse'; @media only screen and (max-width:960px) {