X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d56b449bdbaf1cc2b811c3a13701b792c1c8bfc8..1e1baa33ade8941404bce34faed6aea2c7274f84:/app/assets/stylesheets/common.css.scss diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 8ecaaf113..961923979 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -87,9 +87,7 @@ strong { /* Default rules for the body of every page */ * { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; } body { @@ -464,9 +462,8 @@ nav.secondary { #noscript { z-index: 20000000; - position: absolute; - top: 15px; - left: 15px; + margin-left: 400px; + margin-top: 50px; } /* Rules for bootstrap tooltips */ @@ -846,7 +843,6 @@ nav.secondary { .leaflet-popup-content-wrapper { border-radius: 4px !important; - -webkit-border-radius: 4px !important; } /* Rules for attribution text under the main map shown on printouts */ @@ -926,8 +922,6 @@ header .search_form { border-right: none; transition: 300ms linear; - -webkit-transition: 300ms linear; - -moz-transition: 300ms linear; } input:focus { @@ -969,7 +963,9 @@ header .search_form { .search_results_entry { ul li { border-bottom: $keyline; + cursor: pointer; &:first-child { border-top: $keyline; } + &.selected { background: #FFFFE6; } } .search_details { @@ -1319,6 +1315,30 @@ header .search_form { } } +/* Rules for the new trace form */ + +#new_trace { + input[type=text] { + width: 50%; + width: calc(100% - 150px); + max-width: 500px; + } +} + +/* Rules for the edit trace form */ + +.edit_trace { + .form-row p { + margin-bottom: 0px; + } + + input[type=text] { + width: 50%; + width: calc(100% - 150px); + max-width: 500px; + } +} + /* Rules for the user profile page */ #userinformation { @@ -1901,7 +1921,6 @@ a.button { cursor: pointer; border: 0; display: inline-block; - line-height: 20px; padding: $lineheight/4 $lineheight/2; min-height: 20px + $lineheight/2; min-width: 120px; @@ -1910,7 +1929,6 @@ a.button { background: $blue; text-align: center; border-radius: 2px; - -moz-border-radius: 2px; &:hover { background: darken($blue, $hovercolor); text-decoration: none; @@ -1932,6 +1950,16 @@ a.button { } } +input[type="button"], +input[type="submit"], +input[type="reset"] { + line-height: normal; +} + +a.button { + line-height: 20px; +} + .buttons { min-width: 200px; input[type="submit"], @@ -2079,8 +2107,6 @@ a.button { 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) { @@ -2093,8 +2119,6 @@ input.richtext_title[type="text"] { .richtext_content { width: 50%; - width: -moz-calc(100% - 235px); - width: -webkit-calc(100% - 235px); width: calc(100% - 235px); display: inline-block; vertical-align: top; @@ -2229,12 +2253,8 @@ input.richtext_title[type="text"] { border-radius: 0 3px 3px; *border-right-width: 2px; *border-bottom-width: 2px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + background-clip: padding-box; } .dropdown-menu.pull-right { @@ -2524,6 +2544,36 @@ input.richtext_title[type="text"] { } } +#sidebar #sotm { + padding: 10px; + min-height: 120px; + + img { + float: left; + width: 100px; + height: 100px; + } + + h2 { + margin-left: 100px; + padding: 7px 10px 6px 15px; + } + + p { + margin-left: 100px; + padding: 6px 10px 7px 15px; + } + + a { + color: $darkgrey; + } + + :hover { + text-decoration: none; + color: darken($darkgrey, 25%); + } +} + @import 'browse'; @media only screen and (max-width:960px) {