X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3ebad9ec2f59f2ba5716952f6169cdbb4972f931..daf55682f8d2a2f7f5c424beb67aeca60f57f4f5:/app/assets/stylesheets/common.css.scss diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 7395afc99..709d5fd98 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -351,11 +351,11 @@ nav.primary { } .dropdown-toggle { - padding: 5px 10px 5px 5px; + display: inline-block; + padding: 6px 10px 4px 10px; } .caret { - margin-top: 15px; border-top-color: $green; } @@ -392,11 +392,17 @@ nav.secondary { position: absolute; right: 0; - > ul a { + > ul { + margin-right: 10px; + } + + > ul a, + .dropdown-toggle { + display: inline-block; font-weight: bold; text-decoration: none; color: $darkgrey; - padding-right: 10px; + padding: 5px 5px; } .dropdown { @@ -404,27 +410,26 @@ nav.secondary { border-radius: 4px; } - img { + .caret { + border-top-color: $grey; + margin-top: 10px; + margin-right: 5px; + } + + img.user_thumbnail_tiny { + border: 0; vertical-align: top; + margin: 2px 0 0 3px; border-radius: 2px 0 0 2px; - margin-right: 5px; } #inboxanchor { display: inline-block; - position: relative; + vertical-align: top; height: 20px; - top: -2px; - margin: 0 2px 0 0; - padding: 0 5px 0 0; - border-radius: 2px; - } - - .dropdown-toggle { - display: block; - padding: 3px 7px; - color: #000; - text-decoration: none; + margin: 2px 7px 0 0; + background-color: $grey; + border-radius: 0 2px 2px 0; } .dropdown-menu { @@ -713,7 +718,7 @@ nav.secondary { } .leaflet-top.leaflet-right { - top: 10px !important; + top: $lineheight !important; .leaflet-control { margin-right: 0px !important; margin-top: 0px !important; @@ -1400,19 +1405,6 @@ body.browse #sidebar_content { margin-bottom: $lineheight; overflow: auto; height: 10em; - - &:p#last { - margin-bottom: 0px; - } - - &:ol { - margin-bottom: 0px; - } - - &:img { - display: block; - margin: $lineheight auto inherit auto; - } } #decline { @@ -1722,12 +1714,6 @@ img.user_thumbnail_tiny { border: 1px solid #ccc; } -/* Rule for "nowrap" class that can be applied to anything to stop wrapping */ - -.nowrap { - white-space: nowrap; -} - /* Rules for geo microformats */ abbr.geo { @@ -1766,10 +1752,6 @@ ul.secondary-actions { margin-right: 0px; } } - .dropdown-menu { - left: auto; - right: 0; - } } /* Utility for managing inner content areas */ @@ -2225,7 +2207,7 @@ a.button { .dropdown-submenu:focus > a { color: #ffffff; text-decoration: none; - background-color: #0081c2; + background-color: $green; } .dropdown-menu > .active > a, @@ -2233,7 +2215,7 @@ a.button { .dropdown-menu > .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #0081c2; + background-color: $green; outline: 0; }