X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bd7c279604469e0ef22ed8148603befa469d9c2b..ecf85902149168c348a737ece93d2a892a42853a:/app/assets/stylesheets/common.scss diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index d7984436a..abdbaef57 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -5,67 +5,21 @@ /* Minimal CSS reset */ -html, body, ul, ol, li, form, fieldset, legend, input { +html, body { margin: 0; padding: 0; border: 0; } -fieldset,img { border: 0; } - -legend { color: #000; } - -sup { - vertical-align: super; - font-size: smaller; -} - -sub { - vertical-align: sub; - font-size: smaller; -} - table { border-collapse: collapse; border-spacing: 0; } -li { list-style: none; } - -input, -select, -textarea, -body { font: #{$typeheight}/#{$lineheight} "Helvetica Neue",Arial,sans-serif; } - -abbr, acronym { - text-decoration: underline dotted; - cursor: help; -} - -strong { - font-weight: bold; -} - -/* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */ - -.clearfix:before, -.clearfix:after { - content: " "; - display: table; -} - -.clearfix:after { - clear: both; -} - .fillL { background-color: white; } /* Default rules for the body of every page */ -* { - box-sizing: border-box; -} - body { font-family: 'Helvetica Neue',Arial,sans-serif; font-size: $typeheight; @@ -151,15 +105,6 @@ a { } } -/* Rules for horizontal lines */ - -hr { - border: none; - background-color: $grey; - color: $grey; - height: 1px; -} - /* General styles for tables */ table { @@ -251,6 +196,7 @@ header { nav.primary { > ul { + padding: 0; $border: 1px solid $green; border: $border; @@ -317,6 +263,9 @@ nav.secondary { > ul { vertical-align: middle; + margin: 0; + padding: 0; + a, .dropdown-toggle { display: inline-block; text-decoration: none; @@ -336,6 +285,7 @@ nav.secondary { border: $border; border-radius: $border-radius; margin-left: 10px; + padding: 0; > li { border-right: $border; @@ -1002,9 +952,14 @@ header .search_forms, /* Rules for search sidebar */ #sidebar .search_results_entry { + ul { + padding: 0; + } + ul li { border-bottom: $keyline; cursor: pointer; + list-style-type: none; &:first-child { border-top: $keyline; } &.selected { background: $list-highlight; } } @@ -1123,10 +1078,6 @@ tr.turn:hover { border-radius: 3px; } - .paginate ul { - padding-left: 20px; - } - .browse-field { margin-bottom: 10px; @@ -1135,7 +1086,7 @@ tr.turn:hover { font-size: 12px; border: 1px solid $grey; border-radius: 4px 4px 0 0; - background-color: #F6F6F6; + background-color: $offwhite; } p { @@ -1149,7 +1100,7 @@ tr.turn:hover { } .browse-tag-list { - background-color: #F6F6F6; + background-color: $offwhite; border: 1px solid $grey; border-radius: 3px; table-layout: fixed; @@ -1173,7 +1124,7 @@ tr.turn:hover { .browse-tag-k { font-weight: 500; - background-color: #F6F6F6; + background-color: $offwhite; } .browse-tag-v { @@ -1450,7 +1401,7 @@ tr.turn:hover { /* Rules for the edit trace form */ .edit_trace { - .form-row p { + .standard-form-row p { margin-bottom: 0px; } @@ -1507,10 +1458,6 @@ tr.turn:hover { margin-bottom: 0; } -#friends-container .contact-activity ul { - margin-left: 70px; -} - .users-show { // Silly exception; remove when user page is redesigned. .content-inner { @@ -1908,15 +1855,6 @@ tr.turn:hover { margin-bottom: 0px; padding: $lineheight/4; } - - ul { - padding-left: $lineheight; - - li { - font-size: 12px; - list-style: disc; - } - } } /* Rules for forms */ @@ -1948,11 +1886,11 @@ tr.turn:hover { padding-top: $lineheight; border-top: 1px solid $lightgrey; } - .horizontal-list .form-row { + .horizontal-list .standard-form-row { float: left; padding-right: 10px; } - .form-row { + .standard-form-row { margin-bottom: $lineheight/2; } .form-list { @@ -1960,7 +1898,8 @@ tr.turn:hover { } .form-list li { margin-bottom: 5px; - } + list-style-type: none; + } input[type="checkbox"], input[type="radio"] { float: left; @@ -2044,6 +1983,7 @@ ul.secondary-actions { font-style: normal; margin-bottom: 0; margin-left: 0; + padding: 0; &.pager { display: inline-block; margin-right: 60px; @@ -2238,20 +2178,6 @@ a.button { margin: 0; color: $darkgrey; } - - ul, ol { - padding-left: $lineheight; - margin-bottom: $lineheight; - margin-left: $lineheight; - } - - ul > li { - list-style: disc; - } - - ol > li { - list-style: decimal; - } } .diary_post .richtext { @@ -2689,47 +2615,8 @@ input.richtext_title[type="text"] { 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; - } - } -}