X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/821f9498694dd744a9da1dbdd90c54da53c8b8f0..f1c5b66561ae48bc4f6b3fb5a3138443098fac1b:/app/assets/stylesheets/common.css.scss diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index cdbf7e58d..9625c656b 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -115,6 +115,7 @@ body { margin: 0px; padding: 0px; text-align: left; + height: 100%; } body.slim { @@ -145,6 +146,8 @@ small, aside { font-size: 12px; } +#container { position: relative; } + .column-1 { width: 50%; margin: 0 0 $lineheight/2 0; @@ -240,7 +243,7 @@ table { #menu-icon { display: none !important; float: right; - background: url("/assets/menu-icon.png") no-repeat; + background: image-url("menu-icon.png") no-repeat; background-size: 30px 30px; display: block; width: 30px; @@ -447,6 +450,30 @@ nav.secondary { } } +a#ad { + width: 100%; + display: block; + background: rgb(240,151,53); + z-index: 999; + padding: 1px $lineheight; + color: #fff; + font-size: 11px; + text-transform: uppercase; + span.close { + float: right; + color: #fff; + font-size: 10px; + line-height: 18px; + opacity: .5; + text-transform: none; + &:hover { opacity: .9; } + } + &:hover { + background: rgb(220,151,53); + text-decoration: none; + } +} + #compact-secondary-nav { display: none; ul li a { @@ -643,7 +670,7 @@ nav.secondary { padding: $lineheight $lineheight $lineheight/2; } - h4 { + h4, span.user, span.date { font-weight: normal; color: #666; font-size: 12px; @@ -690,6 +717,13 @@ nav.secondary { background: none; width: 78%; } + + a#ad { + margin: 0 $lineheight; + width: 64%; + padding: 0 6px; + border-radius: 3px; + } } #map { @@ -871,6 +905,8 @@ nav.secondary { text-align: center; } +.donate-attr { color: darken($green, 10%) !important; } + /* Rules for the sidebar */ .sidebar_heading { @@ -885,6 +921,10 @@ nav.secondary { } } +#ad + #sidebar_content { + top: 70px; +} + #sidebar_content { position: absolute; top: 50px; @@ -1067,7 +1107,7 @@ a.donate { } .comment a { - font-weight: bold; + font-weight: 500; color: #000; } } @@ -1081,6 +1121,13 @@ a.donate { h4 { padding: 0; } + + .paginate { + float: right; + padding: 1px 6px; + border: 1px solid #eee; + border-radius: 3px; + } } .paginate ul, .note-comments ul { @@ -1109,12 +1156,15 @@ a.donate { } .browse-tag-list { - border: 1px solid #CCC; - border-radius: 4px; + background-color: #F6F6F6; + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; font-size: 12px; + margin-left: -$lineheight; + margin-right: -$lineheight; li { - border-bottom: 1px solid #CCC; + border-bottom: 1px solid #ddd; } li:last-child { @@ -1125,26 +1175,25 @@ a.donate { .browse-tag-v { display: inline-block; width: 50%; - height: 30px; float: left; - padding: 6px 10px; + padding: 6px 10px 6px $lineheight; } .browse-tag-k { font-weight: 500; background-color: #F6F6F6; - border-radius: 4px 0 0 4px; } .browse-tag-v { - border-left: 1px solid #CCC; + border-left: 1px solid #ddd; + background-color: #fff; } } } /* Rules for export information which appears in the popout sidebar */ -.export_bounds { +.export_bounds, .export_button { text-align: center; }