X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/58ea30c724c9990a51c13da40eb5fe515c026888..ffe637f23d81a9e9ba769020ad0ffbb04a5e3a7d:/app/assets/stylesheets/common.scss diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index f4a9ce4bc..181524a0e 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -204,18 +204,7 @@ nav.secondary { } #inboxanchor { - display: inline-block; - height: 25px; - margin: 3px 0 3px 3px; background-color: lighten($grey, 10%); - line-height: 20px; - border-radius: 3; - } - - .dropdown-menu { - .count-number { - font-size: 14px; - } } } @@ -304,7 +293,7 @@ body.small-nav { } nav.secondary { - .user-menu { + .user-menu, .login-menu { width: 100%; } } @@ -324,21 +313,14 @@ body.small-nav { .overlay-sidebar #sidebar #banner { display: none; } - - .leaflet-top.leaflet-right { - top: 10px !important; - } } /* Utility for styling notification numbers */ .count-number { - padding: 2px $lineheight/4; - border-radius: 2px; background: lighten($green, 30%); - margin: 0 2px; - font-size: 11px; - color: #333; + color: $gray-800; + font-weight: $font-weight-normal; } /* Rules for the message shown in place of the map when javascript is disabled */ @@ -351,6 +333,15 @@ body.small-nav { /* Rules for Leaflet maps */ +.leaflet-top.leaflet-right, +.leaflet-top.leaflet-left { + height: 100%; + column-gap: 10px; + display: flex; + flex-direction: column; + flex-wrap: wrap-reverse; +} + .leaflet-control .control-button { display: block; height: 40px; @@ -460,6 +451,11 @@ body.small-nav { display: block; width: $sidebarWidth; } + + button.btn-close { + background-color: rgba(255, 255, 255, 0.5); + opacity: 1.0; + } } #map { @@ -490,7 +486,7 @@ body.small-nav { .section { border-bottom: 1px solid $grey; - padding: 10px 20px; + padding: $spacer; } } } @@ -577,29 +573,13 @@ body.small-nav { } .share-ui { - .share-link { - input[type=text], - textarea { - width: 100%; - font-family: monospace; - font-size: small; - line-height: 1.3; - } - } - - .share-image { - label { - margin-right: 10px; - } - } - #mapnik_scale { width: 100px; } } .leaflet-top { - top: $lineheight/2 !important; + top: 10px !important; .leaflet-control { margin-right: 0px !important; margin-top: 0px !important; @@ -626,13 +606,6 @@ body.small-nav { /* Rules for the sidebar */ -.sidebar_heading { - position: relative; - padding: $lineheight/2 $lineheight; - // background: $offwhite; - // border-bottom: 1px solid $grey; -} - #browse_status { input { display: block; @@ -651,6 +624,9 @@ form { label { font-size: 16px; } + .col-form-label { + font-size: 16px; + } } /* Stop bootstrap 5 from floating legends when they don't need to be */ @@ -1047,49 +1023,21 @@ tr.turn:hover { width: 100%; } -/* Rules for the diary list page */ - -.diary_post { - position: relative; - padding-top: $lineheight; - padding-bottom: $lineheight/2; - border-top: 1px solid $grey; - - &.deleted { - background-color: #fee; - } -} - /* Rules for the diary entry page */ .diary_entries { #map { height: 400px; display: none; - margin-bottom: $lineheight; } .comments { max-width: 740px; } .diary-comment { border-top: 1px dashed $grey; - padding-top: $lineheight/2; - padding-bottom: $lineheight/2; &:first-child { - margin-top: $lineheight/2; - padding-top: $lineheight; border-top: 1px solid $grey; } - &.deleted { - background-color: #fee; - } - p { - margin-bottom: $lineheight/2; - } - .comment-heading { - margin-bottom: 0; - margin-top: 0; - } } } @@ -1123,32 +1071,6 @@ tr.turn:hover { } } -/* Rules for the account settings page */ - -#accountForm .user_image { - margin-bottom: 0; -} - -#accountForm #user_image { - margin-left: 20px; -} - -#accountForm ul.accountImage-options { - margin-left: 120px; -} - -.nohome .location { - display: none; -} - -#homerow .message { - display: none; -} - -.nohome .message { - display: inline !important; -} - /* Rules for the oauth authorization page */ .oauth-authorize ul { @@ -1158,11 +1080,6 @@ tr.turn:hover { /* Rules for messages pages */ .messages { - button[type="submit"] { - margin: auto; - white-space: nowrap; - } - .inbox-row { background: $offwhite; } @@ -1170,42 +1087,6 @@ tr.turn:hover { .inbox-row-unread { background: #CBEEA7; } - - .right { - float: right; - } -} - -.inbox-row .inbox-mark-read { - display: none; -} - -.info-line { - margin-bottom: $lineheight; - padding: $lineheight/4 0px 4px 0px; - border-bottom: 1px solid $grey; - - form, form div { - display: inline; - } -} - -.info-line .user_thumbnail_tiny { - vertical-align: middle; -} - -.inbox-sent { - white-space: nowrap; -} - -.inbox-mark-unread, -.inbox-mark-read, -.inbox-delete { - width: 1%; -} - -.inbox-row-unread .inbox-mark-unread { - display: none; } .search_form { @@ -1242,15 +1123,8 @@ img.user_thumbnail_tiny { max-height: 25px; } -/* Rules for geo microformats */ - -abbr.geo { - border-bottom: none; -} - /* General styles for action lists / subnavs */ - nav.secondary-actions { margin-left: -11px; overflow: hidden; @@ -1265,9 +1139,9 @@ nav.secondary-actions { flex-basis: auto; list-style: none; border-left: 1px solid $grey; - padding-left: $lineheight/2; - margin-right: $lineheight/2; - margin-bottom: $lineheight/8; + padding-left: $lineheight * 0.5; + margin-right: $lineheight * 0.5; + margin-bottom: $lineheight * 0.125; } } } @@ -1277,24 +1151,6 @@ div.secondary-actions { text-align: center; } -/* Create a single-line dl */ - -dl.dl-inline { - dt, dd { - display: inline-block; - } - dd { - margin-right: 1em; - } -} - -/* Rules for OpenID logo */ - -.openid_logo { - vertical-align: text-bottom; - border: 0; -} - /* Rules for rich text */ .richtext, @@ -1302,6 +1158,8 @@ dl.dl-inline { code { background: $lightgrey; padding: 2px 3px; + direction: inherit; /* fix for Bootstrap < 5.2 */ + unicode-bidi: unset; /* fix for Bootstrap < 5.2 */ } pre { @@ -1330,14 +1188,6 @@ dl.dl-inline { } } -/* Rules for the user notes list */ - -.note_list { - tr.creator { - background-color: $offwhite; - } -} - /* Rules for the iD editor */ .id-embed {