X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f11221f05bcdd05edd7a9f97d6d57e7baaeb4921..928465764e52407884b35e31a08bf9241e651269:/app/assets/stylesheets/common.scss diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index a16f7d85a..d7984436a 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; } @@ -58,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 */ @@ -108,23 +78,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 +103,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 +155,8 @@ a { hr { border: none; - background-color: #ccc; - color: #ccc; + background-color: $grey; + color: $grey; height: 1px; } @@ -225,7 +182,7 @@ table { /* Utility for de-emphasizing content */ .deemphasize { - color: #999; + color: $darkgrey; a { color: $blue; } @@ -276,12 +233,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 +290,11 @@ nav.primary { } .disabled a { - color: #ccc; + color: $grey; cursor: default; .caret { - border-top-color: #ccc; + border-top-color: $grey; } } @@ -501,7 +465,7 @@ body.compact { } &.active { - background-color: #9ed485; + background-color: $vibrant-green; } .icon { @@ -548,7 +512,6 @@ body.compact { float: left; width: $sidebarWidth; background: #fff; - font-size: 12px; #sidebar_loader { display: none; @@ -563,12 +526,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 { @@ -688,7 +652,7 @@ body.compact { overflow: auto; .section { - border-bottom: 1px solid #DDD; + border-bottom: 1px solid $grey; padding: 10px 20px; } @@ -698,14 +662,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; } } } @@ -764,7 +728,7 @@ body.compact { font-size: 13px; margin-bottom: 8px; } - li.disabled { color: #999; } + li.disabled { color: $darkgrey; } } } @@ -868,7 +832,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; @@ -935,7 +899,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 { @@ -1081,10 +1045,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; } @@ -1114,24 +1078,15 @@ tr.turn:hover { #sidebar .changesets { li { - padding: 15px 20px; - border-bottom: 1px solid #ddd; 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: #999; + color: $darkgrey; } .comments-0 { @@ -1149,7 +1104,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; @@ -1164,7 +1119,7 @@ tr.turn:hover { .paginate { float: right; padding: 1px 6px; - border: 1px solid #eee; + border: 1px solid $lightgrey; border-radius: 3px; } @@ -1178,7 +1133,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; } @@ -1187,7 +1142,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; } @@ -1195,14 +1150,13 @@ 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 { @@ -1223,9 +1177,18 @@ 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: 14px; + height: 14px; + margin: 4px 0px; + border: 1px solid rgba(0, 0, 0, .1); + // add color via inline css on element: background-color: ; + } } .warning { @@ -1274,17 +1237,14 @@ tr.turn:hover { .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 #ddd; - &.query-result { cursor: pointer; } @@ -1317,8 +1277,8 @@ tr.turn:hover { } .export_boxy { - background: #eee; - border: 1px solid #ccc; + background: $lightgrey; + border: 1px solid $grey; border-radius: 3px; #maxlat { margin-top: -1px; } @@ -1380,8 +1340,6 @@ tr.turn:hover { .content-heading { background: $lightgrey; - - h1 { font-size: 22px; } } .content-body { @@ -1403,19 +1361,6 @@ tr.turn:hover { /* 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, @@ -1456,6 +1401,10 @@ tr.turn:hover { } } +[dir=rtl] .header-illustration { + transform: scaleX(-1); +} + #content.maximised { top: 0; left: 0; @@ -1471,7 +1420,7 @@ tr.turn:hover { position: relative; width: 45%; height: 400px; - border: 1px solid #ccc; + border: 1px solid $grey; margin-bottom: $lineheight; float: right; } @@ -1479,7 +1428,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; @@ -1487,38 +1435,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-show { - .trace_pending { - color: red; - } - - .geo { - display: inline; - } } /* Rules for the new trace form */ @@ -1573,7 +1489,7 @@ tr.turn:hover { .activity-block { clear: left; - border-bottom: 1px solid #ccc; + border-bottom: 1px solid $grey; padding-bottom: $lineheight; float: left; h3 { @@ -1634,7 +1550,6 @@ tr.turn:hover { /* Rules for the user list */ #user_list { - font-size: $lineheight/2; width: 100%; tr { @@ -1656,9 +1571,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; @@ -1666,7 +1589,6 @@ tr.turn:hover { h2 { margin-top: 0; margin-bottom: $lineheight/2; - font-size: 24px; } } @@ -1686,17 +1608,17 @@ tr.turn:hover { /* 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; } @@ -1704,13 +1626,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; @@ -1722,7 +1647,7 @@ tr.turn:hover { } } -.diary_entry-show img.user_thumbnail { +.diary_entries-show img.user_thumbnail { float: left; } @@ -1748,7 +1673,7 @@ tr.turn:hover { .users-terms { .legale { - border: 1px solid #ccc; + border: 1px solid $grey; padding: $lineheight; margin-bottom: $lineheight; overflow: auto; @@ -1777,7 +1702,7 @@ tr.turn:hover { position: relative; width: 500px; height: 400px; - border: 1px solid #ccc; + border: 1px solid $grey; } #accountForm .user_image { @@ -1829,17 +1754,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 { @@ -1874,7 +1799,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; @@ -2063,7 +1988,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; @@ -2076,6 +2002,8 @@ textarea { textarea { padding: 5px; width: 100%; + min-height: 50px; + resize: vertical; } /* Rules for user images */ @@ -2083,7 +2011,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; @@ -2092,7 +2020,7 @@ img.user_image { img.user_thumbnail { max-width: 50px; max-height: 50px; - border: 1px solid #ccc; + border: 1px solid $grey; margin-right: $lineheight; } @@ -2101,7 +2029,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 */ @@ -2110,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 { @@ -2131,7 +2052,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 { @@ -2286,33 +2207,15 @@ 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; @@ -2333,7 +2236,7 @@ a.button { border-left: $lineheight solid $offwhite; padding-left: $lineheight; margin: 0; - color: #7E7E7E; + color: $darkgrey; } ul, ol { @@ -2342,11 +2245,11 @@ a.button { margin-left: $lineheight; } - ul li { + ul > li { list-style: disc; } - ol li { + ol > li { list-style: decimal; } } @@ -2406,7 +2309,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; @@ -2415,7 +2318,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; } @@ -2444,7 +2347,7 @@ input.richtext_title[type="text"] { .note_list { tr.creator { - background-color: #eeeeee; + background-color: $lightgrey; } td { @@ -2506,7 +2409,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; @@ -2525,7 +2428,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; } @@ -2560,7 +2463,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, @@ -2620,7 +2523,7 @@ input.richtext_title[type="text"] { } .sprite.x { - background-position: -50px 0; + /* no-r2 */ background-position: -50px 0; } .sprite.term { @@ -2629,27 +2532,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 { @@ -2661,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; @@ -2673,60 +2571,18 @@ 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; 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: #eee; - 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 { @@ -2748,7 +2604,7 @@ input.richtext_title[type="text"] { font-weight: 300; font-size: 34px; span { - color: #76c551; + color: $vibrant-green; } } @@ -2762,7 +2618,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 { @@ -2776,7 +2632,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 { @@ -2786,10 +2642,6 @@ input.richtext_title[type="text"] { } } - h2 { - margin-bottom: 10px; - } - .icon { width: 30px; height: 30px; @@ -2833,7 +2685,7 @@ input.richtext_title[type="text"] { } .read-reports { - background: #eee; + background: $lightgrey; opacity: 0.7; } @@ -2872,12 +2724,6 @@ input.richtext_title[type="text"] { } .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;