X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/76adaa09856c02a022215291c05df3b5eb134e5f..f0ee117cffb37d36cc2fc0be198832358a451025:/app/assets/stylesheets/common.scss diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 0ec99266e..018f36217 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,14 +1,14 @@ @import "parameters"; +@import "bootstrap-custom"; /* Styles common to large and small screens */ /* Minimal CSS reset */ -html, body, ul, ol, li, form, fieldset, legend, h1, h2, h3, h4, h5, h6, p, input { +html, body, ul, ol, li, form, fieldset, legend, input { margin: 0; padding: 0; border: 0; - font-size:100%; } fieldset,img { border: 0; } @@ -108,23 +108,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 +133,10 @@ small, aside { .piwik { border: 0; } +[dir=rtl] { /* no-r2 */ text-align: right; } + +[dir=ltr] { /* no-r2 */ text-align: left; } + /* Rules for icons */ .icon { @@ -198,8 +185,8 @@ a { hr { border: none; - background-color: #ccc; - color: #ccc; + background-color: $grey; + color: $grey; height: 1px; } @@ -225,7 +212,7 @@ table { /* Utility for de-emphasizing content */ .deemphasize { - color: #999; + color: $darkgrey; a { color: $blue; } @@ -276,12 +263,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 +320,11 @@ nav.primary { } .disabled a { - color: #ccc; + color: $grey; cursor: default; .caret { - border-top-color: #ccc; + border-top-color: $grey; } } @@ -501,7 +495,7 @@ body.compact { } &.active { - background-color: #9ed485; + background-color: $vibrant-green; } .icon { @@ -548,7 +542,6 @@ body.compact { float: left; width: $sidebarWidth; background: #fff; - font-size: 12px; #sidebar_loader { display: none; @@ -563,12 +556,13 @@ body.compact { h2 { padding: $lineheight $lineheight $lineheight/2; + font-size: 1.5rem; } h3, h4 { margin-top: $lineheight; margin-bottom: $lineheight/2; - font-size: 13px; + font-size: 1.25rem; } .close-wrap { @@ -611,11 +605,18 @@ body.compact { height: auto; overflow: hidden; - #banner, - .welcome { + #banner { display: block; } + .welcome { + display: none; + + &.visible { + display: block; + } + } + #sidebar_content { display: none; } @@ -681,7 +682,7 @@ body.compact { overflow: auto; .section { - border-bottom: 1px solid #DDD; + border-bottom: 1px solid $grey; padding: 10px 20px; } @@ -691,14 +692,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 +758,7 @@ body.compact { font-size: 13px; margin-bottom: 8px; } - li.disabled { color: #999; } + li.disabled { color: $darkgrey; } } } @@ -861,7 +862,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 +929,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 +939,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 +972,8 @@ header .search_forms, img.button { display: block; + width: 20px; + height: 20px; } span.force_width { @@ -1024,7 +1031,7 @@ header .search_forms, /* Rules for search sidebar */ -.search_results_entry { +#sidebar .search_results_entry { ul li { border-bottom: $keyline; cursor: pointer; @@ -1032,12 +1039,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%; } } @@ -1071,10 +1075,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; } @@ -1105,7 +1109,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; } @@ -1121,12 +1125,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 */ @@ -1134,7 +1143,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; @@ -1149,7 +1158,7 @@ tr.turn:hover { .paginate { float: right; padding: 1px 6px; - border: 1px solid #eee; + border: 1px solid $lightgrey; border-radius: 3px; } @@ -1163,7 +1172,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; } @@ -1172,7 +1181,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; } @@ -1180,14 +1189,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 { @@ -1208,16 +1217,16 @@ 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: 20px; - height: 20px; - margin: 0px; - border: 1px solid rgba(0, 0, 0, .1); + width: 12px; + height: 12px; + margin: 4px 0px; + border: 1px solid rgba(0, 0, 0, .1); // add color via inline css on element: background-color: ; } } @@ -1231,7 +1240,8 @@ tr.turn:hover { margin: $lineheight/2 0; p { - margin-left: 10px; + margin: 10px 6px 0 6px; + line-height: 1.5; } } @@ -1276,7 +1286,7 @@ tr.turn:hover { ul { li { padding: 15px 20px; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid $grey; &.query-result { cursor: pointer; @@ -1310,18 +1320,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; } } @@ -1373,8 +1383,6 @@ tr.turn:hover { .content-heading { background: $lightgrey; - - h1 { font-size: 22px; } } .content-body { @@ -1396,9 +1404,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; @@ -1409,10 +1417,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; } @@ -1449,6 +1457,10 @@ tr.turn:hover { } } +[dir=rtl] .header-illustration { + transform: scaleX(-1); +} + #content.maximised { top: 0; left: 0; @@ -1464,7 +1476,7 @@ tr.turn:hover { position: relative; width: 45%; height: 400px; - border: 1px solid #ccc; + border: 1px solid $grey; margin-bottom: $lineheight; float: right; } @@ -1472,7 +1484,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; @@ -1480,38 +1491,6 @@ tr.turn:hover { font-size: 12px; color: gray; } - - .trace_pending { - color: red; - } - - .trace_public { - color: green; - } - - .trace_identifiable { - color: green; - } - - .trace_trackable { - color: red; - } - - .trace_private { - color: red; - } -} - -/* Rules for the trace view */ - -.trace-view { - .trace_pending { - color: red; - } - - .geo { - display: inline; - } } /* Rules for the new trace form */ @@ -1566,7 +1545,7 @@ tr.turn:hover { .activity-block { clear: left; - border-bottom: 1px solid #ccc; + border-bottom: 1px solid $grey; padding-bottom: $lineheight; float: left; h3 { @@ -1588,7 +1567,7 @@ tr.turn:hover { margin-left: 70px; } -.user-view { +.users-show { // Silly exception; remove when user page is redesigned. .content-inner { max-width: none; @@ -1627,7 +1606,6 @@ tr.turn:hover { /* Rules for the user list */ #user_list { - font-size: $lineheight/2; width: 100%; tr { @@ -1649,9 +1627,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; @@ -1659,7 +1645,6 @@ tr.turn:hover { h2 { margin-top: 0; margin-bottom: $lineheight/2; - font-size: 24px; } } @@ -1673,27 +1658,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; } @@ -1701,13 +1682,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; @@ -1719,7 +1703,7 @@ tr.turn:hover { } } -.diary_entry-view img.user_thumbnail { +.diary_entries-show img.user_thumbnail { float: left; } @@ -1743,9 +1727,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; @@ -1774,7 +1758,7 @@ tr.turn:hover { position: relative; width: 500px; height: 400px; - border: 1px solid #ccc; + border: 1px solid $grey; } #accountForm .user_image { @@ -1826,17 +1810,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 { @@ -1871,7 +1855,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; @@ -1896,14 +1880,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; } @@ -2060,7 +2044,8 @@ input[type="password"], textarea { color: #222; background-color: #fff; - border: 1px solid #ccc; + border: 1px solid $grey; + border-radius: 3px; padding: 2px 5px; margin: 0; width: 200px; @@ -2073,6 +2058,8 @@ textarea { textarea { padding: 5px; width: 100%; + min-height: 50px; + resize: vertical; } /* Rules for user images */ @@ -2080,7 +2067,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; @@ -2089,7 +2076,7 @@ img.user_image { img.user_thumbnail { max-width: 50px; max-height: 50px; - border: 1px solid #ccc; + border: 1px solid $grey; margin-right: $lineheight; } @@ -2098,7 +2085,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 */ @@ -2128,7 +2115,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 { @@ -2283,34 +2270,17 @@ a.button { .richtext, .prose { - h1, h2 { - padding-bottom: $lineheight/2; - border-bottom: 1px dashed #cccccc; - margin-bottom: $lineheight/2; - } - - h1 { - font-size: 24px; - } - - h2 { - font-size: 18px; - } - - h3 { - font-size: $typeheight; - } - 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; @@ -2329,7 +2299,7 @@ a.button { border-left: $lineheight solid $offwhite; padding-left: $lineheight; margin: 0; - color: #7E7E7E; + color: $darkgrey; } ul, ol { @@ -2338,11 +2308,11 @@ a.button { margin-left: $lineheight; } - ul li { + ul > li { list-style: disc; } - ol li { + ol > li { list-style: decimal; } } @@ -2402,7 +2372,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; @@ -2411,7 +2381,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; } @@ -2440,7 +2410,7 @@ input.richtext_title[type="text"] { .note_list { tr.creator { - background-color: #eeeeee; + background-color: $lightgrey; } td { @@ -2502,7 +2472,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; @@ -2521,7 +2491,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; } @@ -2556,7 +2526,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, @@ -2616,7 +2586,7 @@ input.richtext_title[type="text"] { } .sprite.x { - background-position: -50px 0; + /* no-r2 */ background-position: -50px 0; } .sprite.term { @@ -2625,27 +2595,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 { @@ -2657,11 +2627,6 @@ input.richtext_title[type="text"] { text-decoration: none; } - .note-box { - margin-top: 20px; - background-color: $offwhite; - } - .icon.note { background-color: #333; border-radius: 4px; @@ -2669,8 +2634,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; @@ -2684,7 +2648,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; } @@ -2744,7 +2708,7 @@ input.richtext_title[type="text"] { font-weight: 300; font-size: 34px; span { - color: #76c551; + color: $vibrant-green; } } @@ -2758,7 +2722,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 { @@ -2772,7 +2736,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 { @@ -2827,3 +2791,53 @@ 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 { + ul { + padding-left: $lineheight; + margin-bottom: 0; + + li { + list-style: disc; + } + } +}