X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cf0fccec1fa081251af21ce056ae4aff41724b01..a4561fe89b9a899a8c4e1bae3434f3e2b445d269:/app/assets/stylesheets/common.css.scss diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 07428268a..d73d1000a 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 { @@ -310,7 +306,6 @@ nav.primary { a.tab, .dropdown-toggle { display: inline-block; - font-weight: bold; font-weight: 500; color: $green; padding: 5px 15px; @@ -632,7 +627,7 @@ nav.secondary { float: left; width: $sidebarWidth; background: #fff; - font-size: 13px; + font-size: 12px; h2 { padding: $lineheight $lineheight $lineheight/2; @@ -641,6 +636,7 @@ nav.secondary { h3, h4 { margin-top: $lineheight; margin-bottom: $lineheight/2; + font-size: 13px; } .icon.close { @@ -671,7 +667,6 @@ nav.secondary { p { padding: $lineheight/2 $lineheight $lineheight; font-size: 110%; - font-weight: normal; font-weight: 300; } @@ -757,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); @@ -894,6 +888,12 @@ nav.secondary { p { padding: $lineheight; } + + input { + display: block; + margin-left: auto; + margin-right: auto; + } } #sidebar { @@ -1031,10 +1031,11 @@ header .search_form { h4:first-child { margin-top: 0; + word-wrap: break-word; } } - :last-child { + .browse-section:last-of-type { border-bottom: none; } @@ -1075,25 +1076,25 @@ header .search_form { border: 1px solid #ddd; border-radius: 3px; font-size: 12px; + table-layout: fixed; + border-collapse: separate; - li { + th, td { border-bottom: 1px solid #ddd; } - li:last-child { + tr:last-child th, tr:last-child td { border-bottom: 0; } .browse-tag-k, .browse-tag-v { - display: inline-block; width: 50%; - float: left; padding: 6px 10px; + word-wrap: break-word; } .browse-tag-k { - font-weight: bold; font-weight: 500; background-color: #F6F6F6; } @@ -1119,6 +1120,7 @@ header .search_form { } .note-description { + overflow: hidden; margin: 0 0 10px 10px; } } @@ -1165,6 +1167,7 @@ header .search_form { .export_button { margin-top: $lineheight; + margin-bottom: $lineheight; } dl { @@ -1188,6 +1191,7 @@ header .search_form { #map { height: 100%; + overflow: hidden; } } @@ -1200,7 +1204,7 @@ header .search_form { } .content-body { - h1, h2, h3, p { + h1, h2, h3, p, ul, ol { margin-bottom: $lineheight; } @@ -1272,7 +1276,7 @@ header .search_form { right: 0; bottom: 0; border: 0; - z-index: 1000; + z-index: 2000; } #slim_container { @@ -1678,6 +1682,10 @@ header .search_form { vertical-align: middle; } +.inbox-sent { + white-space: nowrap; +} + .inbox-mark-unread, .inbox-mark-read, .inbox-delete { @@ -1746,7 +1754,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; @@ -1780,7 +1787,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 { @@ -1863,6 +1869,8 @@ img.user_thumbnail { } img.user_thumbnail_tiny { + width: auto; + height: auto; max-width: 25px; max-height: 25px; border: 1px solid #ccc; @@ -2110,14 +2118,32 @@ a.button { /* Rules for rich text editors */ +input.richtext_title[type="text"] { + width: 50%; + width: -moz-calc(100% - 235px); + width: -webkit-calc(100% - 235px); + width: calc(100% - 235px); + + @media only screen and (max-width:768px) { + width: 100%; + } +} + .richtext_container { margin-bottom: $lineheight; .richtext_content { width: 50%; + width: -moz-calc(100% - 235px); + width: -webkit-calc(100% - 235px); + width: calc(100% - 235px); display: inline-block; vertical-align: top; + @media only screen and (max-width:768px) { + width: 100%; + } + .richtext_preview { display: inline-block; padding: $lineheight; @@ -2486,7 +2512,6 @@ a.button { h1 { display: block; color: white; - font-weight: normal; font-weight: 300; font-size: 34px; span {