X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cb87f02642d0097ebc067ca1f9371dde274a41e3..f8d61f287cc68bd241b6588c1ab07a14a3a9f282:/app/assets/stylesheets/common.scss diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 6b99662a4..b28b2547d 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,4 +1,5 @@ @import "parameters"; +@import "bootstrap-custom"; /* Styles common to large and small screens */ @@ -38,7 +39,7 @@ textarea, body { font: #{$typeheight}/#{$lineheight} "Helvetica Neue",Arial,sans-serif; } abbr, acronym { - border-bottom: .1em dotted; + text-decoration: underline dotted; cursor: help; } @@ -108,23 +109,6 @@ body { height: 100%; } -h1, h2, h3 { - font-weight: 600; - line-height: 1.2; -} - -h4, h5 { - font-weight: 500; -} - -h1 { - font-size: 18px; -} - -h2, h3 { - font-size: 16px; -} - p > img { width: auto; max-width: 100%; @@ -150,6 +134,10 @@ small, aside { .piwik { border: 0; } +[dir=rtl] { /* no-r2 */ text-align: right; } + +[dir=ltr] { /* no-r2 */ text-align: left; } + /* Rules for icons */ .icon { @@ -163,24 +151,24 @@ small, aside { overflow: hidden; } -.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.search { /* no-r2 */ background-position: 0 0; } +.icon.donate { /* no-r2 */ background-position: -20px 0; } +.icon.zoomin { /* no-r2 */ background-position: -40px 0; } +.icon.zoomout { /* no-r2 */ background-position: -60px 0; } +.icon.geolocate { /* no-r2 */ background-position: -80px 0; } +.active .icon.geolocate { /* no-r2 */ background-position: -80px -20px; } +.icon.layers { /* no-r2 */ background-position: -100px 0; } +.icon.key { /* no-r2 */ background-position: -120px 0; } +.icon.share { /* no-r2 */ background-position: -140px 0; } +.icon.clipboard { /* no-r2 */ background-position: -160px 0; } +.icon.link { /* no-r2 */ background-position: -180px 0; } +.icon.close { /* no-r2 */ background-position: -200px 0; } .close-wrap:hover .icon.close, -.icon.close:hover { background-position: -200px -20px; } -.icon.check { background-position: -220px 0; } -.icon.note { background-position: -240px 0; } -.icon.note.grey { background-position: -240px -20px; } -.icon.query { background-position: -260px 0; } +.icon.close:hover { /* no-r2 */ background-position: -200px -20px; } +.icon.check { /* no-r2 */ background-position: -220px 0; } +.icon.note { /* no-r2 */ background-position: -240px 0; } +.icon.note.grey { /* no-r2 */ background-position: -240px -20px; } +.icon.query { /* no-r2 */ background-position: -260px 0; } /* Rules for links */ @@ -198,8 +186,8 @@ a { hr { border: none; - background-color: #ccc; - color: #ccc; + background-color: $grey; + color: $grey; height: 1px; } @@ -225,7 +213,7 @@ table { /* Utility for de-emphasizing content */ .deemphasize { - color: #999; + color: $darkgrey; a { color: $blue; } @@ -276,12 +264,19 @@ header { } h1 { + font-size: 18px; + font-weight: 600; + line-height: 1.2; margin: 0; padding-top: 15px; a { color: #000; } + + a:hover { + color: #000; + } } } @@ -326,11 +321,11 @@ nav.primary { } .disabled a { - color: #ccc; + color: $grey; cursor: default; .caret { - border-top-color: #ccc; + border-top-color: $grey; } } @@ -501,7 +496,7 @@ body.compact { } &.active { - background-color: #9ed485; + background-color: $vibrant-green; } .icon { @@ -611,11 +606,18 @@ body.compact { height: auto; overflow: hidden; - #banner, - .welcome { + #banner { display: block; } + .welcome { + display: none; + + &.visible { + display: block; + } + } + #sidebar_content { display: none; } @@ -681,7 +683,7 @@ body.compact { overflow: auto; .section { - border-bottom: 1px solid #DDD; + border-bottom: 1px solid $grey; padding: 10px 20px; } @@ -691,14 +693,14 @@ body.compact { font-size:20px; line-height:10px; color:#222; - border:1px solid #ddd; + border:1px solid $grey; } .tooltip { opacity: 1; - border: 1px solid #ccc; + border: 1px solid $grey; .tooltip-arrow { - border-top-color: #ccc; + border-top-color: $grey; } } } @@ -757,7 +759,7 @@ body.compact { font-size: 13px; margin-bottom: 8px; } - li.disabled { color: #999; } + li.disabled { color: $darkgrey; } } } @@ -861,7 +863,7 @@ body.compact { position: relative; padding: $lineheight/2 $lineheight; // background: $offwhite; - // border-bottom: 1px solid #ccc; + // border-bottom: 1px solid $grey; > .close { float: right; margin-top: 2px; @@ -928,7 +930,7 @@ header .search_forms, input:focus { outline: none; - box-shadow: 0px 0px 7px #9ED485; + box-shadow: 0px 0px 7px $vibrant-green; } input[type=submit].float { @@ -938,6 +940,10 @@ header .search_forms, border-radius: 0 2px 2px 0; } + input.error { + background-color: rgba($red, 0.4); + } + select { /* this next line is to polyfill the vertical alignment of text within a select element, * which is different between firefox and chrome. */ @@ -967,6 +973,8 @@ header .search_forms, img.button { display: block; + width: 20px; + height: 20px; } span.force_width { @@ -1002,6 +1010,11 @@ header .search_forms, vertical-align: middle; } } + + a.reverse_directions { + cursor: pointer; + margin: 0px 0px 5px 25px; + } } /* Rules for the map key which appears in the popout sidebar */ @@ -1019,7 +1032,7 @@ header .search_forms, /* Rules for search sidebar */ -.search_results_entry { +#sidebar .search_results_entry { ul li { border-bottom: $keyline; cursor: pointer; @@ -1027,12 +1040,9 @@ header .search_forms, &.selected { background: $list-highlight; } } - .search_details { - display: block; - float: right; - text-align: right; - margin-top: 0.2em; - margin-left: 0.5em; + .search_more .loader { + display: none; + width: 100%; } } @@ -1066,10 +1076,10 @@ p#routing_summary { td.instruction, td.distance { padding-top: $lineheight/5; padding-bottom: $lineheight/5; - border-bottom: 1px solid #DDD; + border-bottom: 1px solid $grey; } td.distance { - color: #BBB; + color: $darkgrey; text-align: right; font-size: x-small; } @@ -1100,7 +1110,7 @@ tr.turn:hover { #sidebar .changesets { li { padding: 15px 20px; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid $grey; cursor: pointer; &.selected { background: $list-highlight; } @@ -1116,12 +1126,17 @@ tr.turn:hover { .comments { float: right; - color: #999; + color: $darkgrey; } .comments-0 { opacity: 0.5; } + + .changeset_more .loader { + display: none; + width: 100%; + } } /* Rules for the browse sidebar */ @@ -1129,7 +1144,7 @@ tr.turn:hover { #sidebar_content { .browse-section { padding: $lineheight/2 $lineheight; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid $grey; h4:first-child { margin-top: 0; @@ -1144,7 +1159,7 @@ tr.turn:hover { .paginate { float: right; padding: 1px 6px; - border: 1px solid #eee; + border: 1px solid $lightgrey; border-radius: 3px; } @@ -1158,7 +1173,7 @@ tr.turn:hover { h4 { padding: 5px 0 5px 10px; font-size: 12px; - border: 1px solid #CCC; + border: 1px solid $grey; border-radius: 4px 4px 0 0; background-color: #F6F6F6; } @@ -1167,7 +1182,7 @@ tr.turn:hover { padding: 7px 10px; font-size: 12px; background-color: #FFF; - border: 1px solid #CCC; + border: 1px solid $grey; border-top: 0; border-radius: 0 0 4px 4px; } @@ -1175,14 +1190,14 @@ tr.turn:hover { .browse-tag-list { background-color: #F6F6F6; - border: 1px solid #ddd; + border: 1px solid $grey; border-radius: 3px; font-size: 12px; table-layout: fixed; border-collapse: separate; th, td { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid $grey; } tr:last-child th, tr:last-child td { @@ -1203,22 +1218,31 @@ tr.turn:hover { } .browse-tag-v { - border-left: 1px solid #ddd; + border-left: 1px solid $grey; background-color: #fff; } + + .colour-preview-box { + float: right; + width: 12px; + height: 12px; + margin: 4px 0px; + border: 1px solid rgba(0, 0, 0, .1); + // add color via inline css on element: background-color: ; + } } .warning { - margin: $lineheight/2 0; - padding: $lineheight/2; - font-size: 90%; + margin: 0 0 $lineheight/2 0; + padding: 0 $lineheight/2; } .note-comments li, .changeset-comments li { margin: $lineheight/2 0; p { - margin-left: 10px; + margin: 10px 6px 0 6px; + line-height: 1.5; } } @@ -1263,7 +1287,7 @@ tr.turn:hover { ul { li { padding: 15px 20px; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid $grey; &.query-result { cursor: pointer; @@ -1297,18 +1321,18 @@ tr.turn:hover { } .export_boxy { - background: #eee; - border: 1px solid #ccc; + background: $lightgrey; + border: 1px solid $grey; border-radius: 3px; #maxlat { margin-top: -1px; } #minlon { float: left; - margin-left: -1px; + /* no-r2 */ margin-left: -1px; } #maxlon { float: right; - margin-right: -1px; + /* no-r2 */ margin-right: -1px; } #minlat { margin-bottom: 0; } } @@ -1383,9 +1407,9 @@ tr.turn:hover { /* Overrides for pages that use new layout conventions */ -.user-new, -.user-create, -.user-terms { +.users-new, +.users-create, +.users-terms { .content-body .content-inner { padding: 0; @@ -1396,10 +1420,10 @@ tr.turn:hover { } } -.user-new, -.user-create, -.user-terms, -.user-confirm { +.users-new, +.users-create, +.users-terms, +.users-confirm { .content-heading .content-inner { height: 200px; } @@ -1436,6 +1460,10 @@ tr.turn:hover { } } +[dir=rtl] .header-illustration { + transform: scaleX(-1); +} + #content.maximised { top: 0; left: 0; @@ -1451,7 +1479,7 @@ tr.turn:hover { position: relative; width: 45%; height: 400px; - border: 1px solid #ccc; + border: 1px solid $grey; margin-bottom: $lineheight; float: right; } @@ -1459,7 +1487,6 @@ tr.turn:hover { /* Rules for the trace list shown by the traces tab etc */ #trace_list { - font-size: $lineheight/2; border-width: 0px; text-align: right; @@ -1491,7 +1518,7 @@ tr.turn:hover { /* Rules for the trace view */ -.trace-view { +.trace-show { .trace_pending { color: red; } @@ -1553,7 +1580,7 @@ tr.turn:hover { .activity-block { clear: left; - border-bottom: 1px solid #ccc; + border-bottom: 1px solid $grey; padding-bottom: $lineheight; float: left; h3 { @@ -1575,7 +1602,7 @@ tr.turn:hover { margin-left: 70px; } -.user-view { +.users-show { // Silly exception; remove when user page is redesigned. .content-inner { max-width: none; @@ -1614,7 +1641,6 @@ tr.turn:hover { /* Rules for the user list */ #user_list { - font-size: $lineheight/2; width: 100%; tr { @@ -1636,9 +1662,17 @@ tr.turn:hover { .diary_post { position: relative; - margin-top: $lineheight/2; padding-top: $lineheight; - border-top: 1px solid #ccc; + padding-bottom: $lineheight/2; + border-top: 1px solid $grey; + + &:first-of-type { + margin-top: $lineheight/2; + } + + &.deemphasize { + background-color: #fee; + } .post_heading { margin-bottom: $lineheight; @@ -1660,27 +1694,23 @@ tr.turn:hover { } } -.content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div - display: inline; -} - .pagination { padding-top: $lineheight; } /* Rules for the diary entry page */ -.diary_entry { +.diary_entries { #map { position: relative; width: 90%; height: 400px; - border: 1px solid #ccc; + border: 1px solid $grey; display: none; margin-bottom: $lineheight; } #newcomment { - border-top: 1px solid #ccc; + border-top: 1px solid $grey; padding-top: $lineheight; margin-top: $lineheight/2; } @@ -1688,13 +1718,16 @@ tr.turn:hover { max-width: 740px; } .diary-comment { - margin-top: $lineheight/2; - border-top: 1px dashed #ccc; + border-top: 1px dashed $grey; padding-top: $lineheight/2; + padding-bottom: $lineheight/2; &:first-child { - margin-top: $lineheight; + margin-top: $lineheight/2; padding-top: $lineheight; - border-top: 1px solid #ccc; + border-top: 1px solid $grey; + } + &.deemphasize { + background-color: #fee; } p { margin-bottom: $lineheight/2; @@ -1706,7 +1739,7 @@ tr.turn:hover { } } -.diary_entry-view img.user_thumbnail { +.diary_entries-show img.user_thumbnail { float: left; } @@ -1730,9 +1763,9 @@ tr.turn:hover { /* Rules for the account confirmation page */ -.user-terms { +.users-terms { .legale { - border: 1px solid #ccc; + border: 1px solid $grey; padding: $lineheight; margin-bottom: $lineheight; overflow: auto; @@ -1761,7 +1794,7 @@ tr.turn:hover { position: relative; width: 500px; height: 400px; - border: 1px solid #ccc; + border: 1px solid $grey; } #accountForm .user_image { @@ -1813,17 +1846,17 @@ tr.turn:hover { .messages { width: 100%; - border: 1px solid #ddd; + border: 1px solid $grey; input[type="submit"] { margin: auto; } tbody tr { - border-top: 1px solid #ccc; + border-top: 1px solid $grey; } .inbox-row { - background: #f8f8ff; + background: $offwhite; } .inbox-row-unread { @@ -1858,7 +1891,7 @@ tr.turn:hover { .info-line { margin-bottom: $lineheight; padding: $lineheight/4 0px 4px 0px; - border-bottom: 1px solid #ccc; + border-bottom: 1px solid $grey; form, form div { display: inline; @@ -1883,14 +1916,14 @@ tr.turn:hover { display: none; } -.message-read .message-buttons { +.messages-show .message-buttons { margin-top: $lineheight; margin-bottom: $lineheight * 1.5; padding-top: $lineheight; border-top: 1px solid $lightgrey; } -.message-read .buttons .mark-unread-button { +.messages-show .buttons .mark-unread-button { border-radius: 0; } @@ -2047,7 +2080,7 @@ input[type="password"], textarea { color: #222; background-color: #fff; - border: 1px solid #ccc; + border: 1px solid $grey; padding: 2px 5px; margin: 0; width: 200px; @@ -2067,7 +2100,7 @@ textarea { img.user_image { max-width: 100px; max-height: 100px; - border: 1px solid #ccc; + border: 1px solid $grey; margin-bottom: $lineheight; float: left; margin-right: $lineheight; @@ -2076,7 +2109,7 @@ img.user_image { img.user_thumbnail { max-width: 50px; max-height: 50px; - border: 1px solid #ccc; + border: 1px solid $grey; margin-right: $lineheight; } @@ -2085,7 +2118,7 @@ img.user_thumbnail_tiny { height: auto; max-width: 25px; max-height: 25px; - border: 1px solid #ccc; + border: 1px solid $grey; } /* Rules for geo microformats */ @@ -2115,7 +2148,7 @@ ul.secondary-actions { display: block; float: left; list-style: none; - border-left: 1px solid #ccc; + border-left: 1px solid $grey; padding-left: $lineheight/2; margin-right: $lineheight/2; &:first-child { @@ -2272,7 +2305,7 @@ a.button { .prose { h1, h2 { padding-bottom: $lineheight/2; - border-bottom: 1px dashed #cccccc; + border-bottom: 1px dashed $grey; margin-bottom: $lineheight/2; } @@ -2290,14 +2323,15 @@ a.button { code { font-size: 13px; - background: #e8e8e8; + background: $lightgrey; padding: 2px 3px; } pre { font-size: 13px; - background: #e8e8e8; + background: $lightgrey; padding: 2px 3px; + white-space: pre-wrap; code { padding: 0; @@ -2316,7 +2350,7 @@ a.button { border-left: $lineheight solid $offwhite; padding-left: $lineheight; margin: 0; - color: #7E7E7E; + color: $darkgrey; } ul, ol { @@ -2325,11 +2359,11 @@ a.button { margin-left: $lineheight; } - ul li { + ul > li { list-style: disc; } - ol li { + ol > li { list-style: decimal; } } @@ -2389,7 +2423,7 @@ input.richtext_title[type="text"] { display: inline-block; vertical-align: top; margin-left: 15px; - background-color: #f8f8ff; + background-color: $offwhite; padding: $lineheight/2; width: 220px; @@ -2398,7 +2432,7 @@ input.richtext_title[type="text"] { } h4.heading, li { - border-bottom: 1px solid #ccc; + border-bottom: 1px solid $grey; margin-bottom: $lineheight/4; padding-bottom: $lineheight/4; } @@ -2427,7 +2461,7 @@ input.richtext_title[type="text"] { .note_list { tr.creator { - background-color: #eeeeee; + background-color: $lightgrey; } td { @@ -2489,7 +2523,7 @@ input.richtext_title[type="text"] { margin: 0; list-style: none; background-color: #ffffff; - border: 1px solid #ccc; + border: 1px solid $grey; border-radius: 0 3px 3px; *border-right-width: 2px; *border-bottom-width: 2px; @@ -2508,7 +2542,7 @@ input.richtext_title[type="text"] { margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; - background-color: #e5e5e5; + background-color: $lightgrey; border-bottom: 1px solid #ffffff; } @@ -2543,7 +2577,7 @@ input.richtext_title[type="text"] { .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { - color: #999999; + color: $darkgrey; } .dropdown-menu > .disabled > a:hover, @@ -2603,7 +2637,7 @@ input.richtext_title[type="text"] { } .sprite.x { - background-position: -50px 0; + /* no-r2 */ background-position: -50px 0; } .sprite.term { @@ -2612,27 +2646,27 @@ input.richtext_title[type="text"] { } .sprite.node { - background-position: -100px 0; + /* no-r2 */ background-position: -100px 0; } .sprite.way { - background-position: -150px 0; + /* no-r2 */ background-position: -150px 0; } .sprite.tag { - background-position: -200px 0; + /* no-r2 */ background-position: -200px 0; } .sprite.editor { - background-position: -250px 0; + /* no-r2 */ background-position: -250px 0; } .sprite.question { - background-position: -300px 0; + /* no-r2 */ background-position: -300px 0; } .sprite.rules { - background-position: -350px 0; + /* no-r2 */ background-position: -350px 0; } .start-mapping { @@ -2656,8 +2690,7 @@ input.richtext_title[type="text"] { } .site-about #content { - //background-color: #000; - background-color: #eee; + background-color: $lightgrey; background-position: 50% 50%; background-repeat: no-repeat; background-size: cover; @@ -2671,7 +2704,7 @@ input.richtext_title[type="text"] { right: 20px; bottom: 60px; text-shadow: #000 0px 1px 5px; - color: #eee; + color: $lightgrey; opacity: 0.8; display: none; } @@ -2731,7 +2764,7 @@ input.richtext_title[type="text"] { font-weight: 300; font-size: 34px; span { - color: #76c551; + color: $vibrant-green; } } @@ -2745,7 +2778,7 @@ input.richtext_title[type="text"] { background-repeat: no-repeat; background-image: image-url('about/osm.png'); background-size: cover; - background-color: #76c551; + background-color: $vibrant-green; } .byosm { @@ -2759,7 +2792,7 @@ input.richtext_title[type="text"] { font: 500 20px/24px Helvetica, Arial, sans-serif; white-space: nowrap; color: #fff; - background: #76c551; + background: $vibrant-green; } .byosm span { @@ -2814,3 +2847,59 @@ input.richtext_title[type="text"] { display: none; } } + +.read-reports { + background: $lightgrey; + opacity: 0.7; +} + +.report-related-block { + display:inline-block; +} + +.report-block { + width:475px; + float:left; + margin-right:100px; +} + +.related-reports { + width: 280px; + float: right; + + ul { + padding-left: $lineheight; + margin-bottom: 0; + + li { + list-style: disc; + } + } +} + +.issue-comments { + width:475px; +} + +.issues-list { + td:nth-child(2) { + white-space: nowrap; + } +} + +.report-disclaimer { + background: #fff1f0; + color: #d85030; + border-color: rgba(216, 80, 48, 0.3); + padding: 10px 20px; + margin-bottom: $lineheight; + + ul { + padding-left: $lineheight; + margin-bottom: 0; + + li { + list-style: disc; + } + } +}