Add tests for member methods on relation models

[rails.git] / app / assets / stylesheets / common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 451d4594859fe1531738372de40726b877f2ec89..75c9213362783a2bb81956b310a0b720db48d1ba 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1,20 +1,4 @@
-/* Parameters */
-$lineheight: 20px;
-$typeheight: 14px;
-
-$offwhite: #f4f4ff;
-$blue: #7092FF;
-$lightblue: #B8C5F0;
-$green: #7ebc6f;
-$grey: #CCC;
-$red: red;
-$lightgrey: #EEE;
-$darkgrey: #AAA;
-$hovercolor: 20%;
-$headerHeight: 54px;
-$sidebarWidth: 300px;
-$keyline: 1px solid $lightgrey;
-$border-radius: 3px;
+@import "parameters";

 
 /* Styles common to large and small screens */
 
 
 /* Styles common to large and small screens */
 


@@ -52,7 +36,9 @@ abbr, acronym {
   cursor: help;
 }
 
   cursor: help;
 }
 

-strong { font-weight: 500; }
+strong {
+  font-weight: bold;
+}

 
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 
 
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 


@@ -123,11 +109,13 @@ body.slim {
 }
 
 h1, h2, h3 {
 }
 
 h1, h2, h3 {

-  font-weight: 500;
+  font-weight: 600;

   line-height: 1.2;
 }
 
   line-height: 1.2;
 }
 

-h4, h5 { font-weight: 500; }
+h4, h5 {
+  font-weight: 500;
+}

 
 h1 {
   font-size: 18px;
 
 h1 {
   font-size: 18px;


@@ -192,7 +180,7 @@ small, aside {
 /* Rules for links */
 
 a {
 /* Rules for links */
 
 a {

-  color: #00f;
+  color: #24d;

   text-decoration: none;
   -webkit-appearance: none;
   outline: 0;
   text-decoration: none;
   -webkit-appearance: none;
   outline: 0;


@@ -221,7 +209,7 @@ table {
     line-height: $lineheight;
   }
   th {
     line-height: $lineheight;
   }
   th {

-    font-weight: 500;
+    font-weight: 600;

     vertical-align: top;
   }
   td {
     vertical-align: top;
   }
   td {


@@ -256,7 +244,7 @@ header {
   height: $headerHeight;
   position: relative;
   z-index: 1001;
   height: $headerHeight;
   position: relative;
   z-index: 1001;

-  font-size: 13px;
+  font-size: 14px;

 
   h1, nav, nav > ul, nav > ul > li, .dropdown {
     display: inline-block;
 
   h1, nav, nav > ul, nav > ul > li, .dropdown {
     display: inline-block;


@@ -264,7 +252,7 @@ header {
 
   > * {
     height: 100%;
 
   > * {
     height: 100%;

-    padding: $lineheight/2 $lineheight;
+    padding: $lineheight/2;

   }
 
   h1, nav.primary {
   }
 
   h1, nav.primary {


@@ -278,13 +266,13 @@ header {
   img.logo {
     width: 30px;
     height: 30px;
   img.logo {
     width: 30px;
     height: 30px;

-    margin-top: -4px;
+    margin-top: -2px;

     vertical-align: middle;
   }
 
   h1 {
     margin: 0;
     vertical-align: middle;
   }
 
   h1 {
     margin: 0;

-    padding: ($lineheight - 3) $lineheight ($lineheight + 3);
+    padding-top: 15px;

 
     a {
       color: #000;
 
     a {
       color: #000;


@@ -366,7 +354,7 @@ nav.secondary {
       color: $darkgrey;
       padding: 5px;
 
       color: $darkgrey;
       padding: 5px;
 

-      &:hover { color: darken($darkgrey, 10%); }
+      &:hover { color: darken($darkgrey, 25%); }

     }
   }
 
     }
   }
 


@@ -376,8 +364,6 @@ nav.secondary {
 
   .user-menu {
     $border: 1px solid $grey;
 
   .user-menu {
     $border: 1px solid $grey;

-
-    font-weight: 500;

     border: $border;
     border-radius: $border-radius;
     margin-left: 10px;
     border: $border;
     border-radius: $border-radius;
     margin-left: 10px;


@@ -404,7 +390,8 @@ nav.secondary {
     &.logged-in > a {
       padding: 0;
       > .user-button {
     &.logged-in > a {
       padding: 0;
       > .user-button {

-        padding: 5px 10px 5px 6px;
+        line-height: 1.8;
+        padding: 5px 10px 3px 6px;

         display: inline-block;
         color: $darkgrey;
       }
         display: inline-block;
         color: $darkgrey;
       }


@@ -421,7 +408,7 @@ nav.secondary {
     border: 0;
     vertical-align: top;
     margin-top: 0px;
     border: 0;
     vertical-align: top;
     margin-top: 0px;

-    margin: 3px 0 0 3px;
+    margin: 4px 0 0 4px;

     border-radius: 2px;
   }
 
     border-radius: 2px;
   }
 


@@ -622,6 +609,7 @@ nav.secondary {
 
 .map-layout {
   #content {
 
 .map-layout {
   #content {

+    overflow: hidden;

     position: absolute;
     top: $headerHeight;
     bottom: 0;
     position: absolute;
     top: $headerHeight;
     bottom: 0;


@@ -639,36 +627,40 @@ nav.secondary {
     float: left;
     width: $sidebarWidth;
     background: #fff;
     float: left;
     width: $sidebarWidth;
     background: #fff;

+    font-size: 12px;

 
 

-    h2, h3, h4 {
+    h2 {

       padding: $lineheight $lineheight $lineheight/2;
     }
 
       padding: $lineheight $lineheight $lineheight/2;
     }
 

-    h4 {
-      font-weight: normal;
-      color: #666;
-      font-size: 12px;
+    h3, h4 {
+      margin-top: $lineheight;
+      margin-bottom: $lineheight/2;
+      font-size: 13px;

     }
 
     .icon.close {
     }
 
     .icon.close {

-      position: absolute;
-      right: $lineheight;
+      float: right;

       cursor: pointer;
     }
       cursor: pointer;
     }

+  }

 
 

-    -webkit-transition: margin 300ms linear;
-       -moz-transition: margin 300ms linear;
-            transition: margin 300ms linear;
+  .welcome {
+    display: none;

   }
 
   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
   }
 
   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;

-    border-radius: 5px;
+    border-bottom-right-radius: 5px;

     overflow: hidden;
     overflow: hidden;

-    margin-top: $typeheight;
-    margin-left: $typeheight;
+    .welcome {
+      display: block;
+    }
+    #sidebar_content {
+      display: none;
+    }

   }
 
   .welcome {
   }
 
   .welcome {


@@ -683,7 +675,7 @@ nav.secondary {
       float: left;
       margin: 0;
       border-radius: 0;
       float: left;
       margin: 0;
       border-radius: 0;

-      font-weight: 400;
+      font-weight: normal;

       padding: .6em;
 
       &.learn-more {
       padding: .6em;
 
       &.learn-more {


@@ -719,6 +711,14 @@ nav.secondary {
       color:#222;
       border:1px solid #ddd;
     }
       color:#222;
       border:1px solid #ddd;
     }

+
+    .tooltip {
+      opacity: 1;
+      border: 1px solid #ccc;
+      .tooltip-arrow {
+        border-top-color: #ccc;
+      }
+    }

   }
 }
 
   }
 }
 


@@ -752,15 +752,11 @@ nav.secondary {
         padding: 2px 6px;
         border-bottom-right-radius: 3px;
         cursor: pointer;
         padding: 2px 6px;
         border-bottom-right-radius: 3px;
         cursor: pointer;

-        font-weight: 500;
+        font-weight: 600;

         font-size: 16px;
         text-stroke: 2px #fff;
         background: rgba(255,255,255,.9);
         font-size: 16px;
         text-stroke: 2px #fff;
         background: rgba(255,255,255,.9);

-        text-shadow:
-         -2px -2px 1px #fff,  
-          2px -2px 1px #fff,
-          -2px 2px 1px #fff,
-           2px 2px 1px #fff;
+        z-index: 2; // For IE9

         input[type="radio"] {
           display: none;
         }
         input[type="radio"] {
           display: none;
         }


@@ -779,6 +775,7 @@ nav.secondary {
       font-size: 13px;
       margin-bottom: 8px;
     }
       font-size: 13px;
       margin-bottom: 8px;
     }

+    li.disabled { color: #999; }

   }
 }
 
   }
 }
 


@@ -838,7 +835,7 @@ nav.secondary {
 }
 
 .leaflet-top {
 }
 
 .leaflet-top {

-  top: $lineheight !important;
+  top: $lineheight/2 !important;

   .leaflet-control {
     margin-right: 0px !important;
     margin-top: 0px !important;
   .leaflet-control {
     margin-right: 0px !important;
     margin-top: 0px !important;


@@ -893,33 +890,38 @@ nav.secondary {
   }
 }
 
   }
 }
 

-#sidebar_content {
+#sidebar {
+  #sidebar_loader,

   .loader,
   .load_more {
     text-align: center;
     margin: $lineheight auto;
   .loader,
   .load_more {
     text-align: center;
     margin: $lineheight auto;

-    width: $lineheight;
+    width: 40px;

     display: block;
   }
 }
 
 /* Rules for the search box */
 
     display: block;
   }
 }
 
 /* Rules for the search box */
 

-#search_form {
+header .search_form {
+  display: none;
+}
+
+.search_form {

   position: relative;
   padding: $lineheight/2;
   background-color: $lightgrey;
 
   position: relative;
   padding: $lineheight/2;
   background-color: $lightgrey;
 

-  #query_wrapper {
+  .query_wrapper {

     position: relative;
     overflow: hidden;
     position: relative;
     overflow: hidden;

+    border-radius: 2px 0 0 2px;

   }
 
   }
 

-  input {
+  input[type=text] {

     width: 100%;
     height: 30px;
     border-right: none;
     width: 100%;
     height: 30px;
     border-right: none;

-    border-radius: 2px 0 0 2px;

 
     transition: 300ms linear;
     -webkit-transition: 300ms linear;
 
     transition: 300ms linear;
     -webkit-transition: 300ms linear;


@@ -938,7 +940,7 @@ nav.secondary {
     border-radius: 0 2px 2px 0;
   }
 
     border-radius: 0 2px 2px 0;
   }
 

-  #describe_location {
+  .describe_location {

     position: absolute;
     top: 6px;
     right: 6px;
     position: absolute;
     top: 6px;
     right: 6px;


@@ -947,48 +949,6 @@ nav.secondary {
   }
 }
 
   }
 }
 

-/* Rules for donation request box */
-
-a.donate {
-  display: block;
-  padding: $lineheight/4 $lineheight;
-  border: 1px solid $green;
-  font-size: $typeheight;
-  line-height: 1.4;
-  text-align: center;
-  border-radius: 2px;
-  color: #222;
-  margin: $lineheight/2 $lineheight;
-
-  &:hover {
-    background: $green;
-    text-decoration: none;
-  }
-}
-
-/* Rules for rotating sidebar ads */
-
-.ad-container {
-  display: block;
-  height: 120px;
-  margin: auto;
-  overflow: hidden;
-  position: relative;
-  border-bottom: 1px solid #ccc;
-
-  a {
-    display: block;
-    width: 165px;
-    margin: auto;
-  }
-
-  .ad {
-    height: 100px;
-    border: 0;
-    background: #fff;
-  }
-}
-

 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey {
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey {


@@ -1002,7 +962,7 @@ a.donate {
   }
 }
 
   }
 }
 

-/* Rules for search results which appear in the popout sidebar */
+/* Rules for search sidebar */

 
 .search_results_entry {
   ul li {
 
 .search_results_entry {
   ul li {


@@ -1023,28 +983,8 @@ a.donate {
   color: #f00;
 }
 
   color: #f00;
 }
 

-/* Rules for data browser information which appears in the popout sidebar */
-
-#browse_content {
-  position: relative;
-  .browse_show_list.button {
-    position: absolute;
-    left: $lineheight;
-    right: $lineheight;
-    bottom: -40px;
-    margin-bottom: 0;
-  }
-  a.more-details {
-    position: absolute;
-    top: 0;
-    right: $lineheight;
-  }
-  ul li {
-    margin-bottom: 0;
-  }
-}
-

 /* Rules for entity history */
 /* Rules for entity history */

+

 #sidebar_content {
   .browse_details {
     position: relative;
 #sidebar_content {
   .browse_details {
     position: relative;


@@ -1056,47 +996,50 @@ a.donate {
   display: none;
 }
 
   display: none;
 }
 

-/* Rules for the changeset list shown by the history tab */
+/* Rules for the history sidebar */

 
 #sidebar .changesets {
   li {
 
 #sidebar .changesets {
   li {

-    padding: $lineheight;
-    border-bottom: $keyline;
+    padding: 15px 20px;
+    border-bottom: 1px solid #ddd;

     cursor: pointer;
 
     &.selected { background: #FFFFE6; }
     /* color is derived from changeset bbox fillColor in history.js */
     cursor: pointer;
 
     &.selected { background: #FFFFE6; }
     /* color is derived from changeset bbox fillColor in history.js */

-
-    h4 {
-      padding: 0;
-    }

   }
 
   }
 

-  .comment a {
-    font-weight: 500;
-    color: #000;
+  h4 {
+    margin: 0;
+    a {
+      color: #000;
+    }

   }
 }
 
   }
 }
 

-/* Rules for the data browser */
+/* Rules for the browse sidebar */

 
 #sidebar_content {
   .browse-section {
 
 #sidebar_content {
   .browse-section {

-    padding: 10px 20px;
+    padding: $lineheight/2 $lineheight;
+    border-bottom: 1px solid #ddd;

 
 

-    h4 {
-      padding: 0;
+    h4:first-child {
+      margin-top: 0;

     }
     }

+  }

 
 

-    .paginate {
-      float: right;
-      padding: 1px 6px;
-      border: 1px solid #eee;
-      border-radius: 3px;
-    }
+  .browse-section:last-of-type {
+    border-bottom: none;
+  }
+
+  .paginate {
+    float: right;
+    padding: 1px 6px;
+    border: 1px solid #eee;
+    border-radius: 3px;

   }
 
   }
 

-  .paginate ul, .note-comments ul {
+  .paginate ul {

     padding-left: 20px;
   }
 
     padding-left: 20px;
   }
 


@@ -1123,26 +1066,25 @@ a.donate {
 
   .browse-tag-list {
     background-color: #F6F6F6;
 
   .browse-tag-list {
     background-color: #F6F6F6;

-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
+    border: 1px solid #ddd;
+    border-radius: 3px;

     font-size: 12px;
     font-size: 12px;

-    margin-left: -$lineheight;
-    margin-right: -$lineheight;
+    table-layout: fixed;
+    border-collapse: separate;

 
 

-    li {
+    th, td {

       border-bottom: 1px solid #ddd;
     }
 
       border-bottom: 1px solid #ddd;
     }
 

-    li:last-child {
+    tr:last-child th, tr:last-child td {

       border-bottom: 0;
     }
 
     .browse-tag-k,
     .browse-tag-v {
       border-bottom: 0;
     }
 
     .browse-tag-k,
     .browse-tag-v {

-      display: inline-block;

       width: 50%;
       width: 50%;

-      float: left;
-      padding: 6px 10px 6px $lineheight;
+      padding: 6px 10px;
+      word-wrap: break-word;

     }
 
     .browse-tag-k {
     }
 
     .browse-tag-k {


@@ -1155,38 +1097,73 @@ a.donate {
       background-color: #fff;
     }
   }
       background-color: #fff;
     }
   }

-}

 
 

-/* Rules for export information which appears in the popout sidebar */
+  .warning {
+    margin: $lineheight/2 0;
+    padding: $lineheight/2;
+    font-size: 90%;
+  }

 
 

-.export_bounds, .export_button {
-  text-align: center;
-}
+  .note-comments li {
+    margin: $lineheight/2 0;

 
 

-.export_area_inputs {
-  margin-bottom: $lineheight/2;
-  input[type="text"] {
-    width: 80px;
-    margin-bottom: 5px;
+    p {
+      margin-left: 10px;
+    }

   }
   }

-}

 
 

-.export_bound {
-  margin: $lineheight/4;
+  .note-description {
+    overflow: hidden;
+    margin: 0 0 10px 10px;
+  }

 }
 
 }
 

-#export_osm {
-  span.small-title { 
-    font-weight: 500;
-    display: block;
-    font-size: 14px;
-    padding-bottom: 5px; 
+/* Rules for export sidebar */
+
+.export_form {
+  padding: $lineheight;
+
+  .export_area_inputs,
+  .export_button {
+    text-align: center;
+  }
+
+  .export_area_inputs {
+    margin-bottom: $lineheight/2;
+    input[type="text"] {
+      width: 80px;
+      text-align: center;
+      margin-bottom: 5px;
+    }
+  }
+
+  .export_boxy {
+    background: #eee;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+
+    #maxlat { margin-top: -1px; }
+    #minlon {
+      float: left;
+      margin-left: -1px;
+    }
+    #maxlon {
+      float: right;
+      margin-right: -1px;
+    }
+    #minlat { margin-bottom: 0; }
+  }
+
+  .export_bound {
+    margin: $lineheight/4;
+  }
+
+  .export_button {
+    margin-top: $lineheight;

   }
 
   dl {
   }
 
   dl {

-    padding-left: 30px;
-    font-size: 13px;
-    color: #666;
+    padding-left: $lineheight/2;

     dd {
       margin-left: 0;
       margin-bottom: 10px;
     dd {
       margin-left: 0;
       margin-bottom: 10px;


@@ -1206,6 +1183,7 @@ a.donate {
 
   #map {
     height: 100%;
 
   #map {
     height: 100%;

+    overflow: hidden;

   }
 }
 
   }
 }
 


@@ -1218,7 +1196,7 @@ a.donate {
 }
 
 .content-body {
 }
 
 .content-body {

-  h1, h2, h3, p {
+  h1, h2, h3, p, ul, ol {

     margin-bottom: $lineheight;
   }
 
     margin-bottom: $lineheight;
   }
 


@@ -1290,7 +1268,7 @@ a.donate {
   right: 0;
   bottom: 0;
   border: 0;
   right: 0;
   bottom: 0;
   border: 0;

-  z-index: 1000;
+  z-index: 2000;

 }
 
 #slim_container {
 }
 
 #slim_container {


@@ -1424,6 +1402,10 @@ a.donate {
 }
 
 .user-view {
 }
 
 .user-view {

+  // Silly exception; remove when user page is redesigned.
+  .content-inner {
+    max-width: none;
+  }

   p#no_home_location {
     margin: $lineheight;
   }
   p#no_home_location {
     margin: $lineheight;
   }


@@ -1573,7 +1555,7 @@ a.donate {
     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;
     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;

-    height: 10em;
+    height: 20em;

   }
 
   #decline {
   }
 
   #decline {


@@ -1582,11 +1564,6 @@ a.donate {
       background: darken($lightblue, $hovercolor);
     }
   }
       background: darken($lightblue, $hovercolor);
     }
   }

-
-  .form-row {
-    margin: auto;
-    max-width: 370px;
-  }

 }
 
 /* Rules for the account settings page */
 }
 
 /* Rules for the account settings page */


@@ -1697,6 +1674,10 @@ a.donate {
   vertical-align: middle;
 }
 
   vertical-align: middle;
 }
 

+.inbox-sent {
+  white-space: nowrap;
+}
+

 .inbox-mark-unread,
 .inbox-mark-read,
 .inbox-delete {
 .inbox-mark-unread,
 .inbox-mark-read,
 .inbox-delete {


@@ -1764,7 +1745,7 @@ a.donate {
   h2 {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
   h2 {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;

-    font-weight: 500;
+    font-weight: bold;

     font-size: 12px;
     background-color: #c00;
     color: #fff;
     font-size: 12px;
     background-color: #c00;
     color: #fff;


@@ -1797,7 +1778,7 @@ a.donate {
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;

-    font-weight: 500;
+    font-weight: bold;

     line-height: 1.5;
   }
   label.standard-label.secondary {
     line-height: 1.5;
   }
   label.standard-label.secondary {


@@ -1927,7 +1908,6 @@ ul.secondary-actions {
 
 div.secondary-actions {
   padding: 10px;
 
 div.secondary-actions {
   padding: 10px;

-  border-top: 1px solid #ccc;

   text-align: center;
 }
 
   text-align: center;
 }
 


@@ -1993,7 +1973,7 @@ a.button {
     float: left;
     border-radius: 0;
     margin:0;
     float: left;
     border-radius: 0;
     margin:0;

-    min-width: 100px;
+    min-width: 75px;

     max-width: 180px;
     border-right:1px solid white;
     text-overflow: ellipsis;
     max-width: 180px;
     border-right:1px solid white;
     text-overflow: ellipsis;


@@ -2208,66 +2188,6 @@ a.button {
   }
 }
 
   }
 }
 

-/* Rules for the notes interface */
-
-.leaflet-popup-content .note {
-  padding-top: $lineheight/2;
-}
-
-.leaflet-popup-content .note {
-  h2 {
-    margin-bottom: $lineheight/2;
-  }
-
-  div {
-    margin-top: $lineheight/2;
-  }
-
-  .permalink {
-    position: absolute;
-    top: $lineheight/4;
-    left: $lineheight/4;
-    min-width: 15px;
-    min-height: 15px;
-  }
-
-  .permalink span {
-    display: none;
-    padding-left: $lineheight;
-  }
-
-  .permalink:hover span {
-    display: block;
-  }
-
-  .warning {
-    display: block;
-    background-color: #ffe0cc;
-    padding: 4px 6px;
-    margin-bottom: $lineheight/2;
-  }
-
-  .comment_body {
-    margin-top: 2px;
-    margin-bottom: 2px;
-
-    p {
-      margin-top: 0px;
-      margin-bottom: 0px;
-    }
-  }
-
-  .comment {
-    width: 100%;
-    height: 100px;
-  }
-
-  .buttons {
-    margin-top: $lineheight/4;
-    text-align: right;
-  }
-}
-

 /* Rules for the iD editor */
 
 .id-embed {
 /* Rules for the iD editor */
 
 .id-embed {