X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e47c11c644c3e73e8dcc95d3ee9c133e050360f0..89a57f33ef5dc585842d516ee79620f4c843c1b9:/app/assets/stylesheets/common.scss diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index a13f73d7a..0890481da 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -30,11 +30,6 @@ small, aside { #container { position: relative; } -.column-1 { - width: 50%; - margin: 0 0 $lineheight/2 0; -} - .small_icon { vertical-align: middle; margin-right: $lineheight/4; @@ -101,6 +96,10 @@ a { } } +.text-muted a { + color: $blue; +} + /* Rules for the header */ #menu-icon { @@ -700,10 +699,6 @@ body.compact { } #browse_status { - p { - padding: $lineheight; - } - input { display: block; margin-left: auto; @@ -1045,11 +1040,6 @@ tr.turn:hover { } } - .warning { - margin: 0 0 $lineheight/2 0; - padding: 0 $lineheight/2; - } - .note-comments li, .changeset-comments li { margin: $lineheight/2 0; @@ -1196,16 +1186,6 @@ tr.turn:hover { background: $lightgrey; } -.content-body { - h1, h2, h3, p, ul, ol { - margin-bottom: $lineheight; - } - - h1, h2, h3 { - margin-top: $lineheight/2; - } -} - .content-inner { position: relative; max-width: 900px; @@ -1271,12 +1251,15 @@ tr.turn:hover { /* Rules for small maps in content areas */ .content_map { - position: relative; - width: 45%; - height: 400px; + height: 200px; border: 1px solid $grey; margin-bottom: $lineheight; - float: right; +} + +@include media-breakpoint-up(md) { + .content_map { + height: 400px; + } } /* Rules for the new trace form */ @@ -1306,21 +1289,14 @@ tr.turn:hover { /* Rules for the user profile page */ #userinformation { - min-height: 100px; .userinformation-inner { float: left; } - h2 { - margin-top: 0; - } .user-description { width: 100%; clear: both; } - .deemphasize { - margin: 0; - } } .admin-user-info small { @@ -1329,16 +1305,6 @@ tr.turn:hover { margin-right: $lineheight; } -.activity-block { - clear: left; - border-bottom: 1px solid $grey; - padding-bottom: $lineheight; - float: left; - h3 { - margin-bottom: $lineheight/2; - } -} - .contact-activity { margin-top: $lineheight; width: 100%; @@ -1417,7 +1383,7 @@ tr.turn:hover { margin-top: $lineheight/2; } - &.deemphasize { + &.deleted { background-color: #fee; } @@ -1472,7 +1438,7 @@ tr.turn:hover { padding-top: $lineheight; border-top: 1px solid $grey; } - &.deemphasize { + &.deleted { background-color: #fee; } p { @@ -1567,11 +1533,6 @@ tr.turn:hover { display: inline !important; } -.content_map.settings_map { - width: 50%; - float: none; -} - /* Rules for the oauth settings page */ .oauth_clients .buttons .oauth-edit { @@ -1640,17 +1601,6 @@ tr.turn:hover { display: none; } -.messages-show .message-buttons { - margin-top: $lineheight; - margin-bottom: $lineheight * 1.5; - padding-top: $lineheight; - border-top: 1px solid $lightgrey; -} - -.messages-show .buttons .mark-unread-button { - border-radius: 0; -} - /* Rules for "flash" notice boxes shown at the top of the content area */ .flash {