X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cf3897c4aa5fd74d327b379382e337739ff6de8c..48775da938fcfa29902b1d18fdde80aadc17c249:/app/assets/stylesheets/common.css.scss diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index f068438bf..19ad55d31 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -4,15 +4,16 @@ $typeheight: 14px; $offwhite: #f4f4ff; $blue: #7092FF; +$lightblue: #B8C5F0; $grey: #AAA; -$keyline: #CCC; +$lightgrey: #CCC; $hovercolor: 20%; /* Styles common to large and small screens */ /* Minimal CSS reset */ -html, body, ul, ol, li, form, fieldset, legend, h1, h2, h3, h4, h5, h6, p { +html, body, ul, ol, li, form, fieldset, legend, h1, h2, h3, h4, h5, h6, p, input { margin: 0; padding: 0; border: 0; @@ -132,7 +133,7 @@ h6:first-child { .column-1 { width: 50%; - margin-bottom: $lineheight/2; + margin: 0 0 $lineheight/2 0; } .small_icon { @@ -140,6 +141,37 @@ h6:first-child { margin-right: $lineheight/4; } +/* Rules for icons */ + +.icon { + display:inline-block; + vertical-align:top; + width:20px; + height:20px; + background:transparent image-url("sprite.png") no-repeat 0 0; + text-indent:-9999px; + overflow:hidden; + } + +.icon-pre-text { + margin-right: 5px; +} + +.icon.search { background-position: 0 0; } +.icon.donate { background-position: -20px 0; } +.icon.zoomin { background-position: -40px 0; } +.icon.zoomout { background-position: -60px 0; } +.icon.geolocate { background-position: -80px 0; } +.active .icon.geolocate { background-position: -80px -20px; } +.icon.layers { background-position: -100px 0; } +.icon.key { background-position: -120px 0; } +.icon.share { background-position: -140px 0; } +.icon.clipboard { background-position: -160px 0; } +.icon.link { background-position: -180px 0; } +.icon.close { background-position: -200px 0; } +.icon.check { background-position: -220px 0; } +.icon.note { background-position: -240px 0; } + /* Rules for links */ a { @@ -274,7 +306,7 @@ table { .left_menu { left: 0px; margin: 0; - padding: $lineheight/4 $lineheight/2; + padding: $lineheight/4 $lineheight/2 $lineheight/2 $lineheight/2; font-size: 12px; line-height: 1.25; list-style-type: none; @@ -300,23 +332,6 @@ table { font-size: 12px; margin: 0; } - - li:last-child h4 { - padding-top: 0; - } -} - -/* Rules for SOTM advert */ - -#sotm { - width: 165px; - margin: $lineheight/2; - padding: 0px; - border: 0px; - background: #fff; - img { - width: 165px; - } } /* @@ -362,9 +377,10 @@ table { padding: 0; width: 15px; height: 15px; + min-width: 0; text-indent: -1000px; overflow: hidden; - background: image-url("sprite.png") 0 0 no-repeat; + background: image-url("sprite.png") -2px -2px no-repeat; position: absolute; top: $lineheight/4; right: $lineheight/4; @@ -387,9 +403,9 @@ table { /* Rules for donation request box */ -.donate { +a.donate { display: block; - width: 164px; + width: 163px; padding: $lineheight/4; border: 1px solid #AED1A0; background: #cbeea7; @@ -404,11 +420,6 @@ table { background: #9ed485; text-decoration: none; } - span { - margin: 0; - padding-left: 18px; - background: image-url("sprite.png") 0 -29px no-repeat; - } } /* Rules for Creative Commons logo button */ @@ -438,7 +449,7 @@ table { } #tabnav { - height: 30px; + height: 29px; margin-bottom:0; overflow: hidden; li { @@ -461,8 +472,7 @@ table { .site-index #tabnav a#viewanchor, .site-edit #tabnav a#editanchor, -.changeset-list #tabnav a#historyanchor, -.site-export #tabnav a#exportanchor { +.changeset-list #tabnav a#historyanchor { border-bottom: 1px solid #aaa; background: #9ed485; color: #000; @@ -487,7 +497,7 @@ table { .count-number { padding: 2px $lineheight/4; - border-radius: 3px; + border-radius: 2px; background: #d7d7ff; margin: 0 2px; font-size: 11px; @@ -517,36 +527,178 @@ table { /* Rules for Leaflet maps */ -.leaflet-control-attribution { - a.disabled { - color: #99c9dc; - cursor: default; - text-decoration: none; +.leaflet-control .control-button { + display: block; + height: 40px; + width: 40px; + background-color: #333; + background-color: rgba(0,0,0,.6); + -bottom: 1px solid #333; + border-radius: 4px 0 0 4px; + margin-bottom: 10px; + outline: none; +} + +.leaflet-control .zoomin, +.control-layers .control-button { + margin-bottom: 0px; + border-radius: 4px 0 0 0; +} + +.site .leaflet-control .zoomout, +.control-key .control-button { + margin-bottom: 0; + border-radius: 0; +} + +.control-locate .control-button, +.control-share .control-button { + border-radius: 0 0 0 4px; +} + +.leaflet-control .control-button:hover { + background-color: black; +} + +.leaflet-control .control-button.active { + background-color: #9ed485; +} + +.leaflet-control .control-button .icon { + margin: 10px; +} + +/* Rules for the home page */ + +.site-export #map, +.site-index #map, +.site-edit #map { + height: 100%; + overflow: hidden; +} + +#map-ui { + display: none; + position: relative; + float: right; + width: 250px; + height: 100%; + background: white; + border-left: 1px solid #CCC; + overflow: auto; + + .section { + border-bottom: 1px solid #DDD; + padding: 15px; } - ul.secondary-actions { - float: left; - margin-right: $lineheight/4; + a.close-button { + float: right; + padding:5px; + font-size:20px; + line-height:10px; + color:#222; + border:1px solid #ddd; + } +} - &:only-child { - margin-right: 0px; +.layers-ui, +.share-ui { + ul, li:last-child, p:last-child { + margin-bottom: 0; + } +} + +.layers-ui { + li { + border-radius: 4px; + overflow: hidden; + margin-bottom: 10px; + } + + label { + display: block; + padding: 5px 5px 5px 7px; + background-color: #eee; + cursor: pointer; + } + + li.active label { + background-color: #ccc; + } + + .base-layers { + .leaflet-container { + width: 100%; + height: 50px; + cursor: pointer; } } } +.share-ui { + .share-tabs { + margin-bottom: 10px; + + a { + color: #fff; + text-decoration: none; + background-color: $lightblue; + padding: 5px 10px; + } + + a:first-child { + border-right: 1px solid #fff; + border-radius: 4px 0 0 4px; + } + + a:last-child { + border-left: 1px solid #fff; + border-radius: 0 4px 4px 0; + } + + a.active { + background-color: $blue; + } + } + + .share-tab { + display: none; + } + + .share-link { + input[type=text], + textarea { + width: 100%; + font-family: monospace; + font-size: small; + } + } + + .share-image { + label { + margin-right: 10px; + } + } + + #embed_html { + resize: vertical; + } + + #mapnik_scale { + width: 100px; + } +} + .site-index .leaflet-top, .site-export .leaflet-top { top: $lineheight/2 !important; .leaflet-control { + margin-right: 0px !important; margin-top: 0px !important; } } -.site-index #map .olControlScaleLine, -.site-export #map .olControlScaleLine { - left: $lineheight/2 !important; -} - .leaflet-popup-scrolled { padding-right: $lineheight; border-bottom: 0px !important; @@ -574,7 +726,7 @@ table { z-index: 10000; position: absolute; background-color: #ffffff; - border: 1px solid $keyline; + border: 1px solid $lightgrey; border-top: 0px; ul { margin: 0px; @@ -605,23 +757,11 @@ table { #sidebar { display: none; - position: absolute; - overflow: auto; - top: 0px; - bottom: 0px; - left: 0px; - border-right: 1px solid $keyline; + position: relative; + float: left; + border-right: 1px solid $lightgrey; width: 33.3333%; - .sidebar_heading { - position: relative; - padding: $lineheight/2 $lineheight; - z-index: 9999; - background: $offwhite; - border-bottom: 1px solid #ccc; - } - h4 { - margin: 0; - } + height: 100%; ul { margin-bottom: 0; &:last-child { @@ -636,7 +776,18 @@ table { } } -#sidebar_close { +.sidebar_heading { + position: relative; + padding: $lineheight/2 $lineheight; + z-index: 9999; + background: $offwhite; + border-bottom: 1px solid #ccc; + h4 { + margin: 0; + } +} + +.sidebar_close { position: absolute; height: $lineheight; top: 0px; @@ -648,6 +799,8 @@ table { #sidebar_content { position: relative; margin-bottom: 20px; + overflow: auto; + height: 100%; width: 100%; h4 { padding: 0 $lineheight $lineheight/2 $lineheight; @@ -660,7 +813,6 @@ table { /* Rules for the map key which appears in the popout sidebar */ #mapkey { - padding: $lineheight $lineheight 0 $lineheight; .mapkey-table-key img { display: block; margin-left: auto; @@ -737,26 +889,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; } .export_area_inputs { margin-bottom: $lineheight/2; + input[type="text"] { + width: 80px; + margin-bottom: 5px; + } } .export_bound { margin: $lineheight/4; } -.export_details input[type="text"]#export_html_text { - width: 100%; -} - -#sidebar #marker_inputs li:last-child { - margin-bottom: $lineheight/2; -} - -#export_osm, -#export_mapnik, -#export_osmarender { - display: none; -} - /* Rules for the main content area */ #content { @@ -863,28 +1005,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; } margin-bottom: $lineheight; } -/* Rules for the home page */ - -.site-export #map, -.site-index #map { - position: absolute; - top: 0px; - bottom: 0px; - left: 0px; - right: 0px; -} - -/* Rules for the edit page */ - -.site-edit #map { - position: absolute; - top: 0px; - bottom: 0px; - left: 0px; - right: 0px; - overflow: hidden; -} - /* Rules for the changeset list shown by the history tab etc */ #changeset_list { @@ -951,7 +1071,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } h4, p { margin-bottom: $lineheight/4; } - p, ul, .bbox, .geo { + ul, .bbox, .geo { display: inline-block; vertical-align: top; max-width: 65%; @@ -961,6 +1081,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } margin-bottom: 0; } h4 { + float: left; width: 33.3333%; display: inline-block; vertical-align: top; @@ -1028,6 +1149,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } /* Rules for the user profile page */ #userinformation { + min-height: 100px; .userinformation-inner { float: left; @@ -1066,13 +1188,13 @@ ul.results-list li { border-bottom: 1px solid #ccc; } } .activity-details p { - margin-left: 72px; + margin-left: 70px; margin-bottom: 0; } #friends-container .contact-activity ul { - margin-left: 72px; - } + margin-left: 70px; +} .user-view { p#no_home_location { @@ -1095,16 +1217,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; } .user_popup { min-width: 200px; - p { - padding-top: 0; - padding-bottom: 5px; - margin-top: 0; - margin-bottom: 0; - margin-left: 60px; + padding: 0 0 5px 0; + margin-top: 0 0 0 60px; font-size: 12px; } - img.user_thumbnail { float: left; margin: 0 $lineheight/2 0 0; @@ -1152,7 +1269,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } } h1, h2 { font-size: 21px; - line-height: 1; + line-height: 1em; } small.deemphasize { float: left; @@ -1219,7 +1336,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } /* Rules for the login page */ #login_openid_buttons { - height: 56px; + margin-bottom: 0; } #login_openid_buttons li { @@ -1284,8 +1401,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; } border: 1px solid #ccc; } -.accountImage-options p { - margin-bottom: 0px; +#accountForm .user_image { + margin-bottom: 0; +} + +#accountForm #user_image { + margin-left: 20px; +} + +#accountForm ul.accountImage-options { + margin-left: 120px; } .nohome .location { @@ -1301,11 +1426,21 @@ ul.results-list li { border-bottom: 1px solid #ccc; } } .content_map.settings_map { - float: none; width: 50%; + float: none; +} + +/* Rules for the oauth settings page */ + +.oauth_clients .buttons .oauth-edit { + border-radius: 2px 0 0 2px; } -/* Rules for message in/out box page */ +.oauth_clients .buttons .oauth-delete { + border-radius: 0 2px 2px 0; +} + +/* Rules for messages pages */ .messages { width: 100%; @@ -1334,8 +1469,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; } 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 { - border-right: 1px solid $keyline; + height: 30px; + border-right: 1px solid $lightgrey; } } @@ -1357,10 +1500,26 @@ ul.results-list li { border-bottom: 1px solid #ccc; } vertical-align: middle; } +.inbox-mark-unread, +.inbox-mark-read, +.inbox-delete { + width: 1%; +} + .inbox-row-unread .inbox-mark-unread { display: none; } +.message-read .message-buttons { + margin-top: $lineheight; + padding-top: $lineheight; + border-top: 1px solid $lightgrey; +} + +.message-read .buttons .mark-unread-button { + border-radius: 0; +} + /* Rules for "flash" notice boxes shown at the top of the content area */ .flash { @@ -1389,11 +1548,12 @@ ul.results-list li { border-bottom: 1px solid #ccc; } #errorExplanation { width: 400px; border: 2px solid #ff7070; - padding: $lineheight/2; + padding: 0 $lineheight/2; margin-bottom: $lineheight; background-color: #f0f0f0; + h2 { - margin: -10px; + margin: 0 -10px 10px -10px; padding: $lineheight/4 $lineheight/4 $lineheight/4 15px; font-weight: bold; font-size: 12px; @@ -1408,32 +1568,58 @@ ul.results-list li { border-bottom: 1px solid #ccc; } padding: $lineheight/4; } - ul li { - font-size: 12px; - list-style: disc; - } + ul { + padding-left: $lineheight; + li { + font-size: 12px; + list-style: disc; + } + } } /* Rules for forms */ .standard-form { fieldset { - margin-bottom: $lineheight/2; + margin-bottom: $lineheight; } - label { + label.standard-label { display: block; - width: 300px; margin-bottom: $lineheight/4; font-size: $typeheight; font-weight: bold; line-height: 1.5; } + label.standard-label.secondary { + display: inline-block; + font-weight: normal; + } + .form-help { + font-weight: normal; + } + .form-column { + float: left; + margin-right: 20px; + } + .form-divider { + margin-top: $lineheight; + padding-top: $lineheight; + border-top: 1px solid $lightgrey; + } .form-row { margin-bottom: $lineheight/2; } - input[name=remember_me] { + .form-list { + margin-bottom: 0; + } + .form-list li { + margin-bottom: 5px; + } + input[type="checkbox"], + input[type="radio"] { float: left; + margin-top: 5px; } } @@ -1441,13 +1627,25 @@ ul.results-list li { border-bottom: 1px solid #ccc; } display: block; } +input[type="checkbox"], +input[type="radio"] { + margin-right: 5px; +} + input[type="text"], input[type="email"], input[type="url"], input[type="password"], textarea { border: 1px solid #ccc; - padding: 2px; + padding: 2px 5px; + margin: 0; + width: 200px; +} + +textarea { + padding: 5px; + width: 100%; } /* Rules for user images */ @@ -1526,6 +1724,8 @@ ul.secondary-actions { .inner12 { padding: $lineheight/2 $lineheight;} +.inner11 { padding: $lineheight/2;} + .inner02 { padding: 0 $lineheight;} /* Utility for general button styles */ @@ -1536,10 +1736,12 @@ input[type="reset"], a.button { cursor: pointer; border: 0; - display: block; - padding: $lineheight/4; + display: inline-block; + line-height: 20px; + padding: $lineheight/4 $lineheight/2; + min-height: 20px + $lineheight/2; min-width: 120px; - margin-bottom: $lineheight/2; + margin: 0 0 $lineheight/2 0; color: white; background: $blue; text-align: center; @@ -1549,15 +1751,67 @@ a.button { background: darken($blue, $hovercolor); text-decoration: none; } + &.deemphasize { + background: $lightblue; + &:hover { + background: darken($lightblue, $hovercolor); + } + } + &:disabled { + background: $lightgrey; + &:hover { + background: $lightgrey; + } + } &:last-child { margin-bottom: 0; } } -a.button.submit { - background-color: #cbeea7; - &:hover { - background-color: #9ed485; +.buttons { + min-width: 200px; + input[type="submit"], + input[type="button"], + input[type="reset"], + .button { + box-sizing: border-box; + float: left; + border-radius: 0; + margin:0; + min-width: 100px; + max-width: 180px; + border-right:1px solid white; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + } + input:first-child, + .button:first-child { + border-radius:2px 0 0 2px; + } + input:last-child, + .button:last-child { + border-radius:0 2px 2px 0; + border-right-width: 0; + } + input:only-child, + .button:only-child, + *[value="Hide"] + input:last-child, + *[value="Hide"] + .button:last-child { + border-radius:2px; + border-right-width: 0; + } + /* if a 3-button set has a hidden middle button */ + *[value="Hide"] + input:nth-child(3), + *[value="Hide"] + .button:nth-child(3) { + border-radius:0 2px 2px 0; + border-right-width: 0; + } + /* if a 3-button set starts with a hidden button */ + *[value="Hide"] + input:nth-child(2):not(:last-child), + *[value="Hide"] + .button:nth-child(2):not(:last-child) { + border-radius:2px 0 0 2px; + border-right-width: 1px solid white; } } @@ -1582,7 +1836,8 @@ a.button.submit { /* Rules for rich text */ -.richtext { +.richtext, +.prose { h1, h2 { padding-bottom: $lineheight/2; border-bottom: 1px dashed #cccccc; @@ -1633,7 +1888,6 @@ a.button.submit { } ul, ol { - font-style: italic; padding-left: $lineheight; margin-bottom: $lineheight; margin-left: $lineheight; @@ -1660,7 +1914,10 @@ a.button.submit { /* Rules for rich text editors */ .richtext_container { + margin-bottom: $lineheight; + .richtext_content { + width: 50%; display: inline-block; vertical-align: top; @@ -1688,8 +1945,7 @@ a.button.submit { margin-left: 15px; background-color: #f8f8ff; padding: $lineheight/2; - width: 300px; - max-width: 450px; + width: 220px; ul { margin-bottom: 0; @@ -1708,35 +1964,16 @@ a.button.submit { } li h4 { - width: 35%; + width: 40%; margin: 0; } li span, li p { - width: 60%; + width: 50%; margin-left: $lineheight/2; margin-bottom: $lineheight/4; white-space: nowrap; } - - input.richtext_doedit, - input.richtext_dopreview { - margin-right: $lineheight/2; - } - } - - .buttons input[type="submit"] { - display: inline-block; - margin-bottom:0; - width:99px; - min-width:99px; - } - .buttons input:first-child { - border-radius:2px 0 0 2px; - margin-right:1px; - } - .buttons input:last-child { - border-radius:0 2px 2px 0; } } @@ -1758,11 +1995,11 @@ a.button.submit { /* Rules for the notes interface */ -.note { +.leaflet-popup-content .note { padding-top: $lineheight/2; } -.note { +.leaflet-popup-content .note { h2 { margin-bottom: $lineheight/2; } @@ -1777,7 +2014,6 @@ a.button.submit { left: $lineheight/4; min-width: 15px; min-height: 15px; - background: image-url("sprite.png") 0 -45px no-repeat; } .permalink span { @@ -1834,16 +2070,8 @@ a.button.submit { border-bottom: 1px solid #ccc; } -.ads { - width: 370px; - position: absolute; - left: 0%; -} - .ad { - float: left; - height: 120px; - padding: $lineheight/2; - border: 0px; + height: 100px; + border: 0; background: #fff; }