X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0814b4096c443e2ab3c09baa058aa81a00d205d1..2aca6920dc3488a381b275d21a31344da02029e6:/app/assets/stylesheets/common.scss diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index bb0e6f0d4..50b38e7a3 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -38,7 +38,7 @@ textarea, body { font: #{$typeheight}/#{$lineheight} "Helvetica Neue",Arial,sans-serif; } abbr, acronym { - border-bottom: .1em dotted; + text-decoration: underline dotted; cursor: help; } @@ -148,6 +148,8 @@ small, aside { .red { color: $red; } +.piwik { border: 0; } + /* Rules for icons */ .icon { @@ -161,24 +163,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 */ @@ -548,6 +550,10 @@ body.compact { background: #fff; font-size: 12px; + #sidebar_loader { + display: none; + } + > div { position: relative; float: left; @@ -586,10 +592,16 @@ body.compact { cursor: pointer; } - p.error { - background-color: #ff7070; - padding: 10px; - font-weight: bold; + .flash { + padding: 15px; + + picture { + margin-right: -25px; + } + + div.message { + margin-left: 30px; + } } } @@ -926,6 +938,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. */ @@ -990,6 +1006,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 */ @@ -1197,9 +1218,8 @@ tr.turn:hover { } .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 { @@ -1477,6 +1497,18 @@ tr.turn:hover { } } +/* Rules for the trace view */ + +.trace-view { + .trace_pending { + color: red; + } + + .geo { + display: inline; + } +} + /* Rules for the new trace form */ #new_trace { @@ -1640,6 +1672,10 @@ tr.turn:hover { display: inline; } +.pagination { + padding-top: $lineheight; +} + /* Rules for the diary entry page */ .diary_entry { @@ -1709,6 +1745,14 @@ tr.turn:hover { margin-bottom: $lineheight; overflow: auto; height: 20em; + + li { + list-style: inherit; + } + + ol ol { + list-style-type: lower-alpha; + } } #decline { @@ -1767,6 +1811,12 @@ tr.turn:hover { border-radius: 0 2px 2px 0; } +/* Rules for the oauth authorization page */ + +.oauth-authorize ul { + list-style: none; +} + /* Rules for messages pages */ .messages { @@ -2738,12 +2788,30 @@ input.richtext_title[type="text"] { vertical-align: middle; background: 40px 40px image-url('about/sprite.png') no-repeat; - &.local { background-position: 0px 0px; } - &.community { background-position: 0px -40px; } - &.open { background-position: 0px -80px; } - &.partners { background-position: 0px -120px; } - &.infringement { background-position: 0px -160px; } - &.legal { background-position: -45px -160px; } + &.local { + /* no-r2 */ + background-position: 0px 0px; + } + &.community { + /* no-r2 */ + background-position: 0px -40px; + } + &.open { + /* no-r2 */ + background-position: 0px -80px; + } + &.partners { + /* no-r2 */ + background-position: 0px -120px; + } + &.infringement { + /* no-r2 */ + background-position: 0px -160px; + } + &.legal { + /* no-r2 */ + background-position: -45px -160px; + } } } @@ -2754,3 +2822,59 @@ input.richtext_title[type="text"] { display: none; } } + +.read-reports { + background: #eee; + 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; + } + } +}