X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/efa5f6d4b68bd7a0bc0a22ec8ef639ce9b00a2e0..1586e2ba802e051f122d42fd8ad30aa3e6fdbf18:/app/assets/stylesheets/common.scss diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 54fd52dd2..bd0b574e5 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,4 +1,5 @@ @import "parameters"; +@import "bootstrap-custom"; /* Styles common to large and small screens */ @@ -108,23 +109,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%; @@ -280,12 +264,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; + } } } @@ -1496,7 +1487,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; @@ -1504,35 +1494,11 @@ 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; } @@ -1651,7 +1617,6 @@ tr.turn:hover { /* Rules for the user list */ #user_list { - font-size: $lineheight/2; width: 100%; tr {