X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5ddab68c11ad7ac85bf3b80e250aa4454292a53c..e418075e26d80d68e4127d3358a2d8b11dee3a13:/app/assets/stylesheets/common.css.scss diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index ba3583eea..4ec0dced3 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -38,7 +38,6 @@ abbr, acronym { strong { font-weight: bold; - font-weight: 500; } /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */ @@ -110,13 +109,11 @@ body.slim { } h1, h2, h3 { - font-weight: bold; - font-weight: 500; + font-weight: 600; line-height: 1.2; } h4, h5 { - font-weight: bold; font-weight: 500; } @@ -212,8 +209,7 @@ table { line-height: $lineheight; } th { - font-weight: bold; - font-weight: 500; + font-weight: 600; vertical-align: top; } td { @@ -248,7 +244,7 @@ header { height: $headerHeight; position: relative; z-index: 1001; - font-size: 13px; + font-size: 14px; h1, nav, nav > ul, nav > ul > li, .dropdown { display: inline-block; @@ -270,7 +266,7 @@ header { img.logo { width: 30px; height: 30px; - margin-top: -4px; + margin-top: -2px; vertical-align: middle; } @@ -310,7 +306,6 @@ nav.primary { a.tab, .dropdown-toggle { display: inline-block; - font-weight: bold; font-weight: 500; color: $green; padding: 5px 15px; @@ -369,8 +364,6 @@ nav.secondary { .user-menu { $border: 1px solid $grey; - font-weight: bold; - font-weight: 500; border: $border; border-radius: $border-radius; margin-left: 10px; @@ -397,7 +390,8 @@ nav.secondary { &.logged-in > a { padding: 0; > .user-button { - padding: 5px 10px 5px 6px; + line-height: 1.8; + padding: 5px 10px 3px 6px; display: inline-block; color: $darkgrey; } @@ -414,7 +408,7 @@ nav.secondary { border: 0; vertical-align: top; margin-top: 0px; - margin: 3px 0 0 3px; + margin: 4px 0 0 4px; border-radius: 2px; } @@ -633,7 +627,7 @@ nav.secondary { float: left; width: $sidebarWidth; background: #fff; - font-size: 13px; + font-size: 12px; h2 { padding: $lineheight $lineheight $lineheight/2; @@ -642,6 +636,7 @@ nav.secondary { h3, h4 { margin-top: $lineheight; margin-bottom: $lineheight/2; + font-size: 13px; } .icon.close { @@ -650,19 +645,28 @@ nav.secondary { } } + .welcome { + display: none; + } + .overlay-sidebar #sidebar { position: absolute; z-index: 1000; height: auto; border-bottom-right-radius: 5px; overflow: hidden; + .welcome { + display: block; + } + #sidebar_content { + display: none; + } } .welcome { p { padding: $lineheight/2 $lineheight $lineheight; font-size: 110%; - font-weight: normal; font-weight: 300; } @@ -748,8 +752,7 @@ nav.secondary { padding: 2px 6px; border-bottom-right-radius: 3px; cursor: pointer; - font-weight: bold; - font-weight: 500; + font-weight: 600; font-size: 16px; text-stroke: 2px #fff; background: rgba(255,255,255,.9); @@ -997,7 +1000,7 @@ header .search_form { #sidebar .changesets { li { - padding: $lineheight; + padding: 15px 20px; border-bottom: 1px solid #ddd; cursor: pointer; @@ -1006,7 +1009,7 @@ header .search_form { } h4 { - margin-top: 0; + margin: 0; a { color: #000; } @@ -1025,7 +1028,7 @@ header .search_form { } } - :last-child { + .browse-section:last-of-type { border-bottom: none; } @@ -1081,10 +1084,10 @@ header .search_form { width: 50%; float: left; padding: 6px 10px; + word-wrap: break-word; } .browse-tag-k { - font-weight: bold; font-weight: 500; background-color: #F6F6F6; } @@ -1110,6 +1113,7 @@ header .search_form { } .note-description { + overflow: hidden; margin: 0 0 10px 10px; } } @@ -1128,10 +1132,28 @@ header .search_form { margin-bottom: $lineheight/2; input[type="text"] { width: 80px; + text-align: center; margin-bottom: 5px; } } + .export_boxy { + background: #eee; + border: 1px solid #ccc; + border-radius: 3px; + + #maxlat { margin-top: -1px; } + #minlon { + float: left; + margin-left: -1px; + } + #maxlon { + float: right; + margin-right: -1px; + } + #minlat { margin-bottom: 0; } + } + .export_bound { margin: $lineheight/4; } @@ -1161,6 +1183,7 @@ header .search_form { #map { height: 100%; + overflow: hidden; } } @@ -1173,7 +1196,7 @@ header .search_form { } .content-body { - h1, h2, h3, p { + h1, h2, h3, p, ul, ol { margin-bottom: $lineheight; } @@ -1245,7 +1268,7 @@ header .search_form { right: 0; bottom: 0; border: 0; - z-index: 1000; + z-index: 2000; } #slim_container { @@ -1651,6 +1674,10 @@ header .search_form { vertical-align: middle; } +.inbox-sent { + white-space: nowrap; +} + .inbox-mark-unread, .inbox-mark-read, .inbox-delete { @@ -1719,7 +1746,6 @@ header .search_form { margin: 0 -10px 10px -10px; padding: $lineheight/4 $lineheight/4 $lineheight/4 15px; font-weight: bold; - font-weight: 500; font-size: 12px; background-color: #c00; color: #fff; @@ -1753,7 +1779,6 @@ header .search_form { margin-bottom: $lineheight/4; font-size: $typeheight; font-weight: bold; - font-weight: 500; line-height: 1.5; } label.standard-label.secondary { @@ -2459,7 +2484,6 @@ a.button { h1 { display: block; color: white; - font-weight: normal; font-weight: 300; font-size: 34px; span {