X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f360d77aff145a1355c64ab49d7bc6761a233fbc..9d3b419aad3069db13fc0169049a30fbc2b2a288:/app/assets/stylesheets/common.css.scss diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 9299a258b..0d12b758f 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -537,6 +537,12 @@ table { background:#fff; } +.leaflet-control-attribution a.disabled { + color: #99c9dc; + cursor: default; + text-decoration: none; +} + .site-index .leaflet-top, .site-export .leaflet-top { top: 10px !important; @@ -550,6 +556,12 @@ table { left: 10px !important; } +.leaflet-popup-scrolled { + padding-right: 20px; + border-bottom: 0px !important; + border-top: 0px !important; +} + /* Rules for edit menu */ .menuicon { @@ -777,6 +789,15 @@ ul.results-list li { border-bottom: 1px solid #ccc; } top: 30px; } +#content.maximised { + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 0; + z-index: 1000; +} + #slim_container { width: 100%; } @@ -793,12 +814,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; } #slim_content { margin: 10px; - margin-top: 90px; + margin-top: 95px; max-width: 50em; + + .content-heading { + margin-bottom: 15px; + } } #slim_header { - margin: 10px; + margin: 30px 10px; position: absolute; top: 0px; margin-right: 5px; @@ -915,6 +940,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; } p, ul, .bbox { margin-left: 33.3333%; } + ul p { + margin-left: 0; + margin-bottom: 0; + } h4 { width: 33.3333%; float: left; @@ -1124,15 +1153,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } } ul, ol { - margin-bottom: 20px; font-style: italic; - margin-left: 20px; - } - ul li { - list-style: disc; - } - ol li { - list-style: decimal; } ul.secondary-actions { display: inline-block;} } @@ -1421,8 +1442,8 @@ textarea { /* Rules for user images */ img.user_image { - width: 100px; - height: 100px; + max-width: 100px; + max-height: 100px; border: 1px solid #ccc; margin-bottom: 20px; float: left; @@ -1430,8 +1451,8 @@ img.user_image { } img.user_thumbnail { - width: 50px; - height: 50px; + max-width: 50px; + max-height: 50px; border: 1px solid #ccc; margin-right: 20px; } @@ -1484,18 +1505,6 @@ ul.secondary-actions { padding-left: 0; } } - .hidden li, - .hide_unless_logged_in li, - .hide_unless_administrator li { - border-left: 1px solid #ccc; - padding-left: 5px; - } - .hidden:first-child li, - .hide_unless_logged_in:first-child li, - .hide_unless_administrator:first-child li { - border-left: 0; - padding-left: 0; - } } /* Utility for managing inner content areas */ @@ -1533,6 +1542,7 @@ a.button.submit { background-color: #9ed485; } } + /* Rules for doing distinct colour of alternate table rows */ .table0, @@ -1552,58 +1562,121 @@ a.button.submit { border: 0; } +/* Rules for rich text */ + +.richtext { + ul, + ol { + margin-bottom: 20px; + margin-left: 20px; + } + ul li { + list-style: disc; + } + + ol li { + list-style: decimal; + } +} + /* Rules for rich text editors */ .richtext_container { white-space: nowrap; + .richtext_content { display: inline-block; vertical-align: top; + .richtext_preview { display: inline-block; padding: 20px; background-color: #f4f4ff; white-space: normal; + &.loading { background-image: image-url("loading.gif"); background-repeat: no-repeat; background-position: center; } + > :first-child { margin-top: 0px; } } } + .richtext_help { display: inline-block; vertical-align: top; margin-left: 15px; background-color: #f8f8ff; padding: 20px; + p { margin: 0px; } + th { vertical-align: top; text-align: left; padding: 0px 15px 0px 0px !important; } - table > thead th { - font-weight: bold; - } + td { font-family: fixed; line-height: 16px; text-align: left; padding: 0px !important; } + input.richtext_doedit { margin-top: 5px !important; margin-right: 10px !important; } + input.richtext_dopreview { margin-top: 5px !important; margin-left: 10px !important; } } } + +/* Rules for the user notes list */ + +.note_list { + tr.creator { + background-color: #eeeeee; + } + + td { + padding: 3px; + } + + p { + margin-bottom: 0px; + } +} + +/* Rules for the notes interface */ + +.note { + .comment_body { + margin-top: 4px; + margin-bottom: 4px; + + p { + margin-top: 0px; + margin-bottom: 0px; + } + } + + .comment { + width: 100%; + } + + .buttons { + margin-top: 5px; + text-align: right; + } +}