X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/926576881ff4e18573e34827fa9e598b8cc29174..04ac7d9c030dcccd7e27aef0d8ffe8f09315fae7:/app/assets/stylesheets/common.scss diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index a37074561..c95dcc982 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -7,15 +7,7 @@ /* Default rules for the body of every page */ body { - font-family: 'Helvetica Neue',Arial,sans-serif; font-size: $typeheight; - line-height: 1.6666; - color: #222; - background-color: #fff; - margin: 0px; - padding: 0px; - text-align: left; - height: 100%; } p > img { @@ -362,6 +354,10 @@ body.compact-nav { display: none; } + #sidebar_content { + padding: $spacer; + } + > div { position: relative; float: left; @@ -370,7 +366,6 @@ body.compact-nav { } h2 { - padding: $lineheight $lineheight $lineheight/2; font-size: 1.5rem; } @@ -676,6 +671,10 @@ body.compact-nav { margin-left: auto; margin-right: auto; } + + > div { + padding: $spacer; + } } #sidebar { @@ -739,13 +738,6 @@ header .search_forms, /* Rules for routing */ -#sidebar_content>table { - padding: 5px 20px 10px 15px; - width: 100%; - border-collapse: separate; - border-spacing: 0; -} - div.direction { background-image: image-url('routing-sprite.png'); width: 20px; @@ -756,10 +748,6 @@ div.direction { div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; } } -p#routing_summary { - padding: 0 $lineheight $lineheight/4; -} - td.instruction, td.distance { padding-top: $lineheight/5; padding-bottom: $lineheight/5; @@ -821,7 +809,8 @@ tr.turn:hover { #sidebar_content { .browse-section { - padding: $lineheight/2 $lineheight; + padding-bottom: $spacer; + margin-bottom: $spacer; border-bottom: 1px solid $grey; h4:first-child { @@ -942,17 +931,8 @@ tr.turn:hover { margin: 0 0 10px 10px; } - .query-intro p { - padding: $lineheight $lineheight $lineheight/2; - } - .query-results { display: none; - padding-bottom: $lineheight/2; - - h3 { - padding: 0 $lineheight; - } ul { li { @@ -981,8 +961,6 @@ tr.turn:hover { /* Rules for export sidebar */ .export_form { - padding: $lineheight; - .export_area_inputs, .export_button { text-align: center; @@ -1026,15 +1004,6 @@ tr.turn:hover { } } -/* Rules for the routing sidebar */ - -#sidebar_content { - #routing_credit { - text-align: center; - padding: 0.5em; - } -} - /* Rules for edit pages */ .site-edit { @@ -1059,7 +1028,7 @@ tr.turn:hover { .content-inner { position: relative; - max-width: 900px; + max-width: 960px; margin: auto; padding: $lineheight; } @@ -1427,25 +1396,6 @@ tr.turn:hover { &.notice { background-color: #CBEEA7; } - - div.message { - display: inline-block; - margin-left: $lineheight / 2; - vertical-align: middle; - - p { - margin-top: $lineheight * 0.5; - margin-bottom: $lineheight * 0.5; - - &:first-child { - margin-top: 0px; - } - - &:last-child { - margin-bottom: 0px; - } - } - } } /* Rules for highlighting fields with rails validation errors */ @@ -1578,18 +1528,6 @@ div.secondary-actions { text-align: center; } -/* Utility for managing inner content areas */ - -.inner22 { padding: $lineheight;} - -.inner12 { padding: $lineheight/2 $lineheight;} - -.inner11 { padding: $lineheight/2;} - -.inner20 { padding: $lineheight 0;} - -.inner02 { padding: 0 $lineheight;} - .buttons { min-width: 200px; input[type="submit"], @@ -1695,13 +1633,8 @@ div.secondary-actions { } } -.diary_post .richtext { - margin-top: $lineheight; - } - .comments .richtext { margin-left: 70px; - margin-top: 0; } /* Rules for the user notes list */