X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/df1ec6b6809b533829fc2c171699540bbb92a85b..b0a9b39c8d6c2ec32ed0748f8a7130b813fb123e:/app/assets/stylesheets/common.scss?ds=inline

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 281cd4ba5..f8cd32438 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 {
@@ -83,13 +75,6 @@ a {
 
 /* Utility for de-emphasizing content */
 
-.deemphasize {
-  color: $darkgrey;
-  a {
-    color: $blue;
-  }
-}
-
 .text-muted a {
   color: $blue;
 }
@@ -369,6 +354,10 @@ body.compact-nav {
       display: none;
     }
 
+    #sidebar_content {
+      padding: $spacer;
+    }
+
     > div {
       position: relative;
       float: left;
@@ -377,7 +366,6 @@ body.compact-nav {
     }
 
     h2 {
-      padding: $lineheight $lineheight $lineheight/2;
       font-size: 1.5rem;
     }
 
@@ -683,6 +671,10 @@ body.compact-nav {
     margin-left: auto;
     margin-right: auto;
   }
+
+  > div {
+   padding: $spacer;
+  }
 }
 
 #sidebar {
@@ -746,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;
@@ -763,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;
@@ -810,7 +791,6 @@ tr.turn:hover {
   }
 
   .comments {
-    float: right;
     color: $darkgrey;
   }
 
@@ -828,7 +808,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 {
@@ -949,17 +930,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 {
@@ -988,8 +960,6 @@ tr.turn:hover {
 /* Rules for export sidebar */
 
 .export_form {
-  padding: $lineheight;
-
   .export_area_inputs,
   .export_button {
     text-align: center;
@@ -1033,15 +1003,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 {
@@ -1066,27 +1027,18 @@ tr.turn:hover {
 
 .content-inner {
   position: relative;
-  max-width: 900px;
+  max-width: 960px;
   margin: auto;
   padding: $lineheight;
 }
 
 /* Overrides for pages that use new layout conventions */
 
-.users-new,
-.users-create,
-.users-terms,
-.users-confirm {
-  .content-heading .content-inner {
-    height: 200px;
-  }
-}
-
 .header-illustration {
   background-position: 0 0;
   background-repeat: no-repeat;
-  position: absolute;
-  height: 200px;
+  position: relative;
+  min-height: 200px;
   width: 100%;
   left: 0;
   bottom: 0;
@@ -1106,9 +1058,10 @@ tr.turn:hover {
   &.new-user-arm {
     height: 110px;
     width: 130px;
-    left: 260px;
-    top: 160px;
+    left: 280px;
+    top: 180px;
     background-image: image-url("sign-up-illustration-arm.png");
+    position: absolute;
     z-index: 100;
   }
 }
@@ -1142,47 +1095,11 @@ tr.turn:hover {
 
 /* Rules for the user profile page */
 
-#userinformation {
-  min-height: 100px;
-  .userinformation-inner {
-    float: left;
-  }
-  .user-description {
-    width: 100%;
-    clear: both;
-  }
-}
-
-.admin-user-info small {
-  margin-bottom: $lineheight/2;
-  display: inline;
-  margin-right: $lineheight;
-}
-
 .contact-activity {
   margin-top: $lineheight;
   width: 100%;
 }
 
-.activity-details p {
-  margin-left: 70px;
-  margin-bottom: 0;
-}
-
-.users-show {
-  // Silly exception; remove when user page is redesigned.
-  .content-inner {
-    max-width: none;
-  }
-  p#no_home_location {
-    margin: $lineheight;
-  }
-  .user_thumbnail {
-    margin-top: $lineheight/4;
-    float: left;
-  }
-}
-
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {
@@ -1253,11 +1170,6 @@ tr.turn:hover {
   img.user_thumbnail {
     float: left;
   }
-
-  small.deemphasize {
-    float: left;
-    display: block;
-  }
 }
 
 /* Rules for the diary entry page */
@@ -1439,25 +1351,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 */
@@ -1536,6 +1429,12 @@ img.user_image {
   margin-right: $lineheight;
 }
 
+img.user_image_no_margins {
+  max-width: 100px;
+  max-height: 100px;
+  border: 1px solid $grey;
+}
+
 img.user_thumbnail {
   max-width: 50px;
   max-height: 50px;
@@ -1543,6 +1442,12 @@ img.user_thumbnail {
   margin-right: $lineheight;
 }
 
+img.user_thumbnail_no_margins {
+  max-width: 50px;
+  max-height: 50px;
+  border: 1px solid $grey;
+}
+
 img.user_thumbnail_tiny {
   width: auto;
   height: auto;
@@ -1559,28 +1464,28 @@ abbr.geo {
 
 /* General styles for action lists / subnavs / pager navs */
 
-ul.secondary-actions {
-  font-style: normal;
-  margin-bottom: 0;
-  margin-left: 0;
-  padding: 0;
-  &.pager {
-    display: inline-block;
-    margin-right: 60px;
-  }
-  > li {
-    display: block;
-    float: left;
-    list-style: none;
-    border-left: 1px solid $grey;
-    padding-left: $lineheight/2;
-    margin-right: $lineheight/2;
-    &:first-child {
-      border-left: 0;
-      padding-left: 0;
+
+nav.secondary-actions {
+  margin-left: -11px;
+  overflow: hidden;
+  > ul {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin-bottom: 0;
+    margin-left: -1px;
+    padding: 0;
+    &.pager {
+      display: inline-block;
+      margin-right: 60px;
     }
-    &:last-child {
-      margin-right: 0px;
+    > li {
+      flex-basis: auto;
+      list-style: none;
+      border-left: 1px solid $grey;
+      padding-left: $lineheight/2;
+      margin-right: $lineheight/2;
+      margin-bottom: $lineheight/8;
     }
   }
 }
@@ -1590,18 +1495,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"],
@@ -1656,6 +1549,17 @@ div.secondary-actions {
   }
 }
 
+/* Create a single-line dl */
+
+dl.dl-inline {
+  dt, dd {
+    display: inline-block;
+  }
+  dd {
+    margin-right: 1em;
+  }
+}
+
 /* Customise the background colour of striped tables */
 
 .table-striped > tbody > tr:nth-child(2n+1) > td,
@@ -1707,13 +1611,8 @@ div.secondary-actions {
   }
 }
 
-.diary_post .richtext {
-    margin-top: $lineheight;
-  }
-
 .comments .richtext {
   margin-left: 70px;
-  margin-top: 0;
 }
 
 /* Rules for the user notes list */
@@ -1817,48 +1716,20 @@ div.secondary-actions {
   background-size: cover;
   background-attachment: fixed;
 
-
   .content-inner {
-    position: relative;
-    color: #333;
-    min-width: 320px;
-    max-width: 640px;
-  }
-
-  .text {
-    background: white;
-    padding: 40px;
+    max-width: 760px;
   }
 
   .attr {
-    position: relative;
-    padding: 170px 40px 20px;
-    background: #333;
-    background: rgba(0, 0, 0, .8);
-    margin-bottom: 0;
     margin-top: -20px;
 
     h1 {
-      display: block;
-      color: white;
-      font-weight: 300;
-      font-size: 28px;
       span {
         color: $vibrant-green;
       }
     }
 
-    @include media-breakpoint-up(sm) {
-      h1 {
-        font-size: 34px;
-      }
-    }
-
     .user-image {
-      position: absolute;
-      top: 0px;
-      right: 240px;
-      left: 0px;
       height: 150px;
       background-position: 0 50%;
       background-repeat: no-repeat;
@@ -1868,16 +1739,6 @@ div.secondary-actions {
     }
 
     .byosm {
-      position: absolute;
-      top: 0px;
-      right: 0px;
-      z-index: 1;
-      width: 240px;
-      height: 150px;
-      padding: 20px 20px 20px 40px;
-      font: 500 20px/24px Helvetica, Arial, sans-serif;
-      white-space: nowrap;
-      color: #fff;
       background: $vibrant-green;
     }