X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b97d2d98aef3d863d061b7c70857b19319365a8e..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/assets/stylesheets/common.scss?ds=inline diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 540c887b3..a13f73d7a 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,5 +1,5 @@ @import "parameters"; -@import "bootstrap-custom"; +@import "bootstrap"; /* Styles common to large and small screens */ @@ -92,25 +92,6 @@ a { } } -/* General styles for tables */ - -table { - width: 100%; - margin-bottom: $lineheight; - th, td { - text-align: left; - padding: $lineheight/4; - line-height: $lineheight; - } - th { - font-weight: 600; - vertical-align: top; - } - td { - vertical-align: middle; - } -} - /* Utility for de-emphasizing content */ .deemphasize { @@ -278,6 +259,15 @@ nav.secondary { } } +nav.primary, nav.secondary { + .dropdown-item { + &:hover, &:active { + background-color: $green; + color: white; + } + } +} + #compact-secondary-nav { display: none; } @@ -764,6 +754,7 @@ header .search_forms, input[type=text].overflow { border-right: none; + border-radius: 3px 0px 0px 3px; } input:focus { @@ -863,9 +854,6 @@ header .search_forms, margin-left: auto; margin-right: auto; } - td { - padding: 0 $lineheight/4 $lineheight/4 $lineheight/4; - } } /* Rules for search sidebar */ @@ -893,6 +881,7 @@ header .search_forms, padding: 5px 20px 10px 15px; width: 100%; border-collapse: separate; + border-spacing: 0; } div.direction { @@ -1017,6 +1006,8 @@ tr.turn:hover { border-radius: 3px; table-layout: fixed; border-collapse: separate; + border-spacing: 0; + width: 100%; th, td { border-bottom: 1px solid $grey; @@ -1288,18 +1279,6 @@ tr.turn:hover { float: right; } -/* Rules for the trace list shown by the traces tab etc */ - -#trace_list { - border-width: 0px; - text-align: right; - - .trace_summary { - font-size: 12px; - color: gray; - } -} - /* Rules for the new trace form */ #new_trace { @@ -1612,43 +1591,21 @@ tr.turn:hover { /* Rules for messages pages */ .messages { - width: 100%; - border: 1px solid $grey; - input[type="submit"] { margin: auto; } - tbody tr { - border-top: 1px solid $grey; - } .inbox-row { background: $offwhite; } .inbox-row-unread { - background:#CBEEA7; + background: #CBEEA7; } .right { float: right; } - - tr td, - tr th { - padding: $lineheight/4; - } - p:last-child, - h2:last-child, - h3:last-child, - ol:last-child, - ul:last-child { - margin-bottom:0; - } - tr td { - height: 30px; - border-right: 1px solid $lightgrey; - } } .inbox-row .inbox-mark-read { @@ -2036,16 +1993,11 @@ a.button { } } -/* Rules for doing distinct colour of alternate table rows */ +/* Customise the background colour of striped tables */ -.table0, -.item0 { - background: $offwhite; -} - -.table1, -.item1 { - background: #fff; +.table-striped > tbody > tr:nth-child(2n+1) > td, +.table-striped > tbody > tr:nth-child(2n+1) > th { + background-color: $offwhite; } /* Rules for OpenID logo */ @@ -2185,15 +2137,7 @@ input.richtext_title[type="text"] { .note_list { tr.creator { - background-color: $lightgrey; - } - - td { - padding: 3px; - } - - p { - margin-bottom: 0px; + background-color: $offwhite; } } @@ -2401,9 +2345,3 @@ input.richtext_title[type="text"] { background: $lightgrey; opacity: 0.7; } - -.issues-list { - td:nth-child(2) { - white-space: nowrap; - } -}