From: Tom Hughes Date: Wed, 15 Jan 2020 12:17:10 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/2505' X-Git-Tag: live~3318 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/50b2f4f656b82112fce4939da26a1afc6b140e89?ds=sidebyside;hp=-c Merge remote-tracking branch 'upstream/pull/2505' --- 50b2f4f656b82112fce4939da26a1afc6b140e89 diff --combined app/assets/stylesheets/common.scss index d7984436a,05920a49f..9d262d8f3 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@@ -5,10 -5,11 +5,10 @@@ /* 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; } @@@ -58,6 -59,36 +58,6 @@@ strong clear: both; } -/* Basic grid */ - -.col0 { float:left; width:04.1666%; } -.col1 { float:left; width:08.3333%; } -.col2 { float:left; width:16.6666%; } -.col3 { float:left; width:25.0000%; } -.col4 { float:left; width:33.3333%; } -.col5 { float:left; width:41.6666%; } -.col6 { float:left; width:50.0000%; } -.col7 { float:left; width:58.3333%; } -.col8 { float:left; width:66.6666%; } -.col9 { float:left; width:75.0000%; } -.col10 { float:left; width:83.3333%; } -.col11 { float:left; width:91.6666%; } -.col12 { width:100%; } - -.margin0 { margin-left:04.1666%; } -.margin1 { margin-left:08.3333%; } -.margin2 { margin-left:16.6666%; } -.margin3 { margin-left:25.0000%; } -.margin4 { margin-left:33.3333%; } -.margin5 { margin-left:41.6666%; } -.margin6 { margin-left:50.0000%; } -.margin7 { margin-left:58.3333%; } -.margin8 { margin-left:66.6666%; } -.margin9 { margin-left:75.0000%; } -.margin10 { margin-left:83.3333%; } -.margin11 { margin-left:91.6666%; } -.margin12 { margin-left:100.0000%; } - .fillL { background-color: white; } /* Default rules for the body of every page */ @@@ -512,6 -543,7 +512,6 @@@ body.compact float: left; width: $sidebarWidth; background: #fff; - font-size: 12px; #sidebar_loader { display: none; @@@ -526,13 -558,12 +526,13 @@@ 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 { @@@ -1078,12 -1109,21 +1078,12 @@@ tr.turn:hover #sidebar .changesets { li { - padding: 15px 20px; - border-bottom: 1px solid $grey; cursor: pointer; &.selected { background: $list-highlight; } /* color is derived from changeset bbox fillColor in history.js */ } - h4 { - margin: 0; - a { - color: #000; - } - } - .comments { float: right; color: $darkgrey; @@@ -1135,7 -1175,7 +1135,7 @@@ font-size: 12px; border: 1px solid $grey; border-radius: 4px 4px 0 0; - background-color: #F6F6F6; + background-color: $offwhite; } p { @@@ -1149,9 -1189,10 +1149,9 @@@ } .browse-tag-list { - background-color: #F6F6F6; + background-color: $offwhite; border: 1px solid $grey; border-radius: 3px; - font-size: 12px; table-layout: fixed; border-collapse: separate; @@@ -1173,7 -1214,7 +1173,7 @@@ .browse-tag-k { font-weight: 500; - background-color: #F6F6F6; + background-color: $offwhite; } .browse-tag-v { @@@ -1183,8 -1224,8 +1183,8 @@@ .colour-preview-box { float: right; - width: 12px; - height: 12px; + width: 14px; + height: 14px; margin: 4px 0px; border: 1px solid rgba(0, 0, 0, .1); // add color via inline css on element: background-color: ; @@@ -1237,14 -1278,17 +1237,14 @@@ .query-results { display: none; + padding-bottom: $lineheight/2; h3 { - padding: $lineheight $lineheight $lineheight/2; - margin: 0; + padding: 0 $lineheight; } ul { li { - padding: 15px 20px; - border-bottom: 1px solid $grey; - &.query-result { cursor: pointer; } @@@ -1340,6 -1384,8 +1340,6 @@@ .content-heading { background: $lightgrey; - - h1 { font-size: 22px; } } .content-body { @@@ -1361,6 -1407,19 +1361,6 @@@ /* Overrides for pages that use new layout conventions */ -.users-new, -.users-create, -.users-terms { - .content-body .content-inner { - padding: 0; - - .message { - margin-top: 80px; - padding: 20px; - } - } -} - .users-new, .users-create, .users-terms, @@@ -1428,6 -1487,7 +1428,6 @@@ /* Rules for the trace list shown by the traces tab etc */ #trace_list { - font-size: $lineheight/2; border-width: 0px; text-align: right; @@@ -1435,6 -1495,38 +1435,6 @@@ 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-show { - .trace_pending { - color: red; - } - - .geo { - display: inline; - } } /* Rules for the new trace form */ @@@ -1550,6 -1642,7 +1550,6 @@@ /* Rules for the user list */ #user_list { - font-size: $lineheight/2; width: 100%; tr { @@@ -1589,6 -1682,7 +1589,6 @@@ h2 { margin-top: 0; margin-bottom: $lineheight/2; - font-size: 24px; } } @@@ -1989,7 -2083,6 +1989,7 @@@ textarea color: #222; background-color: #fff; border: 1px solid $grey; + border-radius: 3px; padding: 2px 5px; margin: 0; width: 200px; @@@ -2002,8 -2095,6 +2002,8 @@@ textarea { padding: 5px; width: 100%; + min-height: 50px; + resize: vertical; } /* Rules for user images */ @@@ -2038,6 -2129,13 +2038,6 @@@ abbr.geo border-bottom: none; } -/* Rules for RSS buttons */ - -.rsssmall { - position: relative; - top: 3px; -} - /* General styles for action lists / subnavs / pager navs */ ul.secondary-actions { @@@ -2207,6 -2305,24 +2207,6 @@@ a.button .richtext, .prose { - h1, h2 { - padding-bottom: $lineheight/2; - border-bottom: 1px dashed $grey; - margin-bottom: $lineheight/2; - } - - h1 { - font-size: 24px; - } - - h2 { - font-size: 18px; - } - - h3 { - font-size: $typeheight; - } - code { font-size: 13px; background: $lightgrey; @@@ -2564,6 -2680,11 +2564,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; @@@ -2577,12 -2698,53 +2577,12 @@@ background-size: cover; background-attachment: fixed; - .caption { - max-width: 200px; - font: 13px/20px Helvetica, Arial, sans-serif; - position: fixed; - text-align: right; - right: 20px; - bottom: 60px; - text-shadow: #000 0px 1px 5px; - color: $lightgrey; - opacity: 0.8; - display: none; - } - - .caption a { - color: white; - white-space: nowrap; - text-decoration: none; - } - - a.next { - display: block; - position: fixed; - right: 10px; - bottom: 10px; - width: 40px; - height: 40px; - border-radius: 5px; - text-indent: -9999px; - overflow: hidden; - background: image-url('about/sprite.png') -120px 0px no-repeat; - background-color: #000; - background-color: rgba(0, 0, 0, 0.5); - } .content-inner { position: relative; color: #333; min-width: 320px; max-width: 640px; - - .section { - margin-bottom: 30px; - } - - .section:last-child { - margin-bottom: 0; - } } .text { @@@ -2642,6 -2804,10 +2642,6 @@@ } } - h2 { - margin-bottom: 10px; - } - .icon { width: 30px; height: 30px; @@@ -2724,6 -2890,12 +2724,6 @@@ } .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;