Switch to bootstrap for dropdowns and tooltips

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 13576af4e83cdb4dc8dcb50999d8082628b7f7ff..88b3e29f1b5dc495780f6278f4b77b008e119cf9 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -3,69 +3,10 @@
 
 /* Styles common to large and small screens */
 
 
 /* Styles common to large and small screens */
 

-/* Minimal CSS reset */
-
-html, body, ul, ol, li, form, fieldset, legend, input {
-  margin: 0;
-  padding: 0;
-  border: 0;
-}
-
-fieldset,img { border: 0; }
-
-legend { color: #000; }
-
-sup {
-  vertical-align: super;
-  font-size: smaller;
-}
-
-sub {
-  vertical-align: sub;
-  font-size: smaller;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-li { list-style: none; }
-
-input,
-select,
-textarea,
-body { font: #{$typeheight}/#{$lineheight} "Helvetica Neue",Arial,sans-serif; }
-
-abbr, acronym {
-  text-decoration: underline dotted;
-  cursor: help;
-}
-
-strong {
-  font-weight: bold;
-}
-
-/* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
-
-.clearfix:before,
-.clearfix:after {
-    content: " ";
-    display: table;
-}
-
-.clearfix:after {
-    clear: both;
-}
-

 .fillL { background-color: white; }
 
 /* Default rules for the body of every page */
 
 .fillL { background-color: white; }
 
 /* Default rules for the body of every page */
 

-* {
-  box-sizing: border-box;
-}
-

 body {
   font-family: 'Helvetica Neue',Arial,sans-serif;
   font-size: $typeheight;
 body {
   font-family: 'Helvetica Neue',Arial,sans-serif;
   font-size: $typeheight;


@@ -151,15 +92,6 @@ a {
   }
 }
 
   }
 }
 

-/* Rules for horizontal lines */
-
-hr {
-  border: none;
-  background-color: $grey;
-  color: $grey;
-  height: 1px;
-}
-

 /* General styles for tables */
 
 table {
 /* General styles for tables */
 
 table {


@@ -208,7 +140,7 @@ header {
   z-index: 1001;
   font-size: 14px;
 
   z-index: 1001;
   font-size: 14px;
 

-  h1, nav, nav > ul, nav > ul > li, .dropdown {
+  h1, nav, nav > ul, nav > ul > li {

     display: inline-block;
   }
 
     display: inline-block;
   }
 


@@ -247,67 +179,16 @@ header {
       color: #000;
     }
   }
       color: #000;
     }
   }

-}
-
-nav.primary {
-  > ul {
-    $border: 1px solid $green;
-
-    border: $border;
-    border-radius: $border-radius;
-
-    > li {
-      border-right: $border;
-      float: left;
-      &:last-child {
-        border-right: 0;
-      }
-      > a:hover { background: lighten($green, 30%); }
-      &.current > a:hover { background: $green; }
-      &.disabled > a:hover { background: lighten($green, 38%); }
-      &.dropdown {
-        > a.tab { border-right: 1px solid lighten($green, 30%); }
-        &.current > a.tab { border-right: 1px solid lighten($green, 10%); }
-      }
-    }
-  }
-
-  a.tab,
-  .dropdown-toggle {
-    display: inline-block;
-    font-weight: 500;
-    color: $green;
-    padding: 5px 15px;
-  }
-
-  .dropdown-toggle {
-    padding: 5px 6px;
-  }
-
-  .caret {
-    border-top-color: $green;
-    margin-top: 10px;
-  }
-
-  .disabled a {
-    color: $grey;
-    cursor: default;

 
 

-    .caret {
-      border-top-color: $grey;
-    }
+  .btn {
+    font-size: 14px;

   }
   }

+}

 
 

-  > ul li.current {
-    background-color: $green;
-
-    .tab {
-      color: #fff;
-    }

 
 

-    .caret {
-      border-top-color: #fff;
-    }
+nav.primary {
+  .btn-outline-primary {
+    @include button-outline-variant($green, $white);

   }
 }
 
   }
 }
 


@@ -315,70 +196,32 @@ nav.secondary {
   position: absolute;
   right: 0;
 
   position: absolute;
   right: 0;
 

-  > ul {
-    vertical-align: middle;
-    a, .dropdown-toggle {
-      display: inline-block;
-      text-decoration: none;
-      color: $darkgrey;
-      padding: 5px;
-
-      &:hover { color: darken($darkgrey, 25%); }
-    }
+  .nav-link {
+    padding: 0.2rem;
+    color: $darkgrey;

   }
 
   > ul li.current a {
     color: darken($darkgrey, 25%);
   }
 
   }
 
   > ul li.current a {
     color: darken($darkgrey, 25%);
   }
 

-  .user-menu {
-    $border: 1px solid $grey;
-    border: $border;
-    border-radius: $border-radius;
-    margin-left: 10px;
-
-    > li {
-      border-right: $border;
-      float: left;
-      &:last-child {
-        border-right: 0;
-
-        > a {
-          border-radius: 0 $border-radius $border-radius 0;
-        }
-      }
-      &:first-child > a { border-radius: $border-radius 0 0 $border-radius; }
-      &:hover a { background: lighten($darkgrey, 30%); }
-    }
-
-    a {
-      padding: 5px 15px;
-
-    }
-
-    &.logged-in > a {
-      padding: 0;
-      > .user-button {
-        line-height: 1.8;
-        padding: 5px 10px 3px 6px;
-        display: inline-block;
-        color: $darkgrey;
-      }
-      &:hover > .user-button { color: darken($darkgrey, 5%); }
+  .login-menu {
+    .btn-outline-secondary {
+      @include button-outline-variant($darkgrey);

     }
   }
 
     }
   }
 

-  .caret {
-    border-top-color: $grey;
-    margin-top: 9px;
+  .user-menu {
+    .btn-outline-secondary {
+      @include button-outline-variant($darkgrey, $darkgrey, white, $darkgrey);
+      // @include button-outline-variant($grey, $grey, white, $grey);
+      border-color: $grey;
+    }

   }
 
   img.user_thumbnail_tiny {
     border: 0;
   }
 
   img.user_thumbnail_tiny {
     border: 0;

-    vertical-align: top;
-    margin-top: 0px;
-    margin: 4px 0 0 4px;
-    border-radius: 2px;
+    border-radius: 3px;

   }
 
   #inboxanchor {
   }
 
   #inboxanchor {


@@ -392,25 +235,14 @@ nav.secondary {
   }
 
   .dropdown-menu {
   }
 
   .dropdown-menu {

-    left: auto;
-    right: -1px;
-    border-radius: 3px 0 3px 3px;
-

     .count-number {
     .count-number {

-      float: right;
-      padding: 0 5px;
-      margin: 0;
+      font-size: 14px;

     }
   }
 }
 
 #compact-secondary-nav {
   display: none;
     }
   }
 }
 
 #compact-secondary-nav {
   display: none;

-  ul li a {
-    width: 100%;
-    color: #333;
-    &:hover { color: #fff; }
-  }

 }
 
 body.compact {
 }
 
 body.compact {


@@ -1003,9 +835,7 @@ header .search_forms,
 
 #sidebar .search_results_entry {
   ul li {
 
 #sidebar .search_results_entry {
   ul li {

-    border-bottom: $keyline;

     cursor: pointer;
     cursor: pointer;

-    &:first-child { border-top: $keyline; }

     &.selected { background: $list-highlight; }
   }
 
     &.selected { background: $list-highlight; }
   }
 


@@ -1078,21 +908,12 @@ tr.turn:hover {
 
 #sidebar .changesets {
   li {
 
 #sidebar .changesets {
   li {

-    padding: 15px 20px;
-    border-bottom: 1px solid $grey;

     cursor: pointer;
 
     &.selected { background: $list-highlight; }
     /* color is derived from changeset bbox fillColor in history.js */
   }
 
     cursor: pointer;
 
     &.selected { background: $list-highlight; }
     /* color is derived from changeset bbox fillColor in history.js */
   }
 

-  h4 {
-    margin: 0;
-    a {
-      color: #000;
-    }
-  }
-

   .comments {
     float: right;
     color: $darkgrey;
   .comments {
     float: right;
     color: $darkgrey;


@@ -1132,10 +953,6 @@ tr.turn:hover {
     border-radius: 3px;
   }
 
     border-radius: 3px;
   }
 

-  .paginate ul {
-    padding-left: 20px;
-  }
-

   .browse-field {
     margin-bottom: 10px;
 
   .browse-field {
     margin-bottom: 10px;
 


@@ -1144,7 +961,7 @@ tr.turn:hover {
       font-size: 12px;
       border: 1px solid $grey;
       border-radius: 4px 4px 0 0;
       font-size: 12px;
       border: 1px solid $grey;
       border-radius: 4px 4px 0 0;

-      background-color: #F6F6F6;
+      background-color: $offwhite;

     }
 
     p {
     }
 
     p {


@@ -1158,10 +975,9 @@ tr.turn:hover {
   }
 
   .browse-tag-list {
   }
 
   .browse-tag-list {

-    background-color: #F6F6F6;
+    background-color: $offwhite;

     border: 1px solid $grey;
     border-radius: 3px;
     border: 1px solid $grey;
     border-radius: 3px;

-    font-size: 12px;

     table-layout: fixed;
     border-collapse: separate;
 
     table-layout: fixed;
     border-collapse: separate;
 


@@ -1183,7 +999,7 @@ tr.turn:hover {
 
     .browse-tag-k {
       font-weight: 500;
 
     .browse-tag-k {
       font-weight: 500;

-      background-color: #F6F6F6;
+      background-color: $offwhite;

     }
 
     .browse-tag-v {
     }
 
     .browse-tag-v {


@@ -1193,8 +1009,8 @@ tr.turn:hover {
 
     .colour-preview-box {
       float: right;
 
     .colour-preview-box {
       float: right;

-      width: 12px;
-      height: 12px;
+      width: 14px;
+      height: 14px;

       margin: 4px 0px;
       border: 1px solid rgba(0, 0, 0, .1);
       // add color via inline css on element: background-color: <tag value>;
       margin: 4px 0px;
       border: 1px solid rgba(0, 0, 0, .1);
       // add color via inline css on element: background-color: <tag value>;


@@ -1247,17 +1063,14 @@ tr.turn:hover {
 
   .query-results {
     display: none;
 
   .query-results {
     display: none;

+    padding-bottom: $lineheight/2;

 
     h3 {
 
     h3 {

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

     }
 
     ul {
       li {
     }
 
     ul {
       li {

-        padding: 15px 20px;
-        border-bottom: 1px solid $grey;
-

         &.query-result {
           cursor: pointer;
         }
         &.query-result {
           cursor: pointer;
         }


@@ -1463,7 +1276,7 @@ tr.turn:hover {
 /* Rules for the edit trace form */
 
 .edit_trace {
 /* Rules for the edit trace form */
 
 .edit_trace {

-  .form-row p {
+  .standard-form-row p {

     margin-bottom: 0px;
   }
 
     margin-bottom: 0px;
   }
 


@@ -1520,10 +1333,6 @@ tr.turn:hover {
   margin-bottom: 0;
 }
 
   margin-bottom: 0;
 }
 

-#friends-container .contact-activity ul {
-  margin-left: 70px;
-}
-

 .users-show {
   // Silly exception; remove when user page is redesigned.
   .content-inner {
 .users-show {
   // Silly exception; remove when user page is redesigned.
   .content-inner {


@@ -1921,15 +1730,6 @@ tr.turn:hover {
     margin-bottom: 0px;
     padding: $lineheight/4;
   }
     margin-bottom: 0px;
     padding: $lineheight/4;
   }

-
-  ul {
-    padding-left: $lineheight;
-
-    li {
-      font-size: 12px;
-      list-style: disc;
-    }
-  }

 }
 
 /* Rules for forms */
 }
 
 /* Rules for forms */


@@ -1961,11 +1761,11 @@ tr.turn:hover {
     padding-top: $lineheight;
     border-top: 1px solid $lightgrey;
   }
     padding-top: $lineheight;
     border-top: 1px solid $lightgrey;
   }

-  .horizontal-list .form-row {
+  .horizontal-list .standard-form-row {

     float: left;
     padding-right: 10px;
   }
     float: left;
     padding-right: 10px;
   }

-  .form-row {
+  .standard-form-row {

     margin-bottom: $lineheight/2;
   }
   .form-list {
     margin-bottom: $lineheight/2;
   }
   .form-list {


@@ -1973,7 +1773,8 @@ tr.turn:hover {
   }
   .form-list li {
     margin-bottom: 5px;
   }
   .form-list li {
     margin-bottom: 5px;

-   }
+    list-style-type: none;
+  }

   input[type="checkbox"],
   input[type="radio"] {
     float: left;
   input[type="checkbox"],
   input[type="radio"] {
     float: left;


@@ -2051,19 +1852,13 @@ abbr.geo {
   border-bottom: none;
 }
 
   border-bottom: none;
 }
 

-/* Rules for RSS buttons */
-
-.rsssmall {
-  position: relative;
-  top: 3px;
-}
-

 /* General styles for action lists / subnavs / pager navs */
 
 ul.secondary-actions {
   font-style: normal;
   margin-bottom: 0;
   margin-left: 0;
 /* 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;
   &.pager {
     display: inline-block;
     margin-right: 60px;


@@ -2258,20 +2053,6 @@ a.button {
     margin: 0;
     color: $darkgrey;
   }
     margin: 0;
     color: $darkgrey;
   }

-
-  ul, ol {
-    padding-left: $lineheight;
-    margin-bottom: $lineheight;
-    margin-left: $lineheight;
-  }
-
-  ul > li {
-    list-style: disc;
-  }
-
-  ol > li {
-    list-style: decimal;
-  }

 }
 
 .diary_post .richtext {
 }
 
 .diary_post .richtext {


@@ -2386,131 +2167,6 @@ input.richtext_title[type="text"] {
   height: 100%;
 }
 
   height: 100%;
 }
 

-/* Rules for dropdown menus */
-
-.dropdown {
-  position: relative;
-}
-
-.dropdown-toggle {
-  *margin-bottom: -3px;
-}
-
-.dropdown-toggle:active,
-.open .dropdown-toggle {
-  outline: 0;
-}
-
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  vertical-align: top;
-  border-top: 4px solid #000000;
-  border-right: 4px solid transparent;
-  border-left: 4px solid transparent;
-  content: "";
-}
-
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
-}
-
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: -1px;
-  z-index: 1000;
-  display: none;
-  float: left;
-  min-width: 160px;
-  padding: 5px 0;
-  margin: 0;
-  list-style: none;
-  background-color: #ffffff;
-  border: 1px solid $grey;
-  border-radius: 0 3px 3px;
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  background-clip: padding-box;
-}
-
-.dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-
-.dropdown-menu .divider {
-  *width: 100%;
-  height: 1px;
-  margin: 9px 1px;
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: $lightgrey;
-  border-bottom: 1px solid #ffffff;
-}
-
-.dropdown-menu > li > a {
-  display: block;
-  padding: 3px 10px;
-  clear: both;
-  font-weight: normal;
-  line-height: 20px;
-  color: #333333;
-  white-space: nowrap;
-}
-
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus,
-.dropdown-submenu:hover > a,
-.dropdown-submenu:focus > a {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: $green;
-}
-
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: $green;
-  outline: 0;
-}
-
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  color: $darkgrey;
-}
-
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  text-decoration: none;
-  cursor: default;
-  background-color: transparent;
-  background-image: none;
-}
-
-.open {
-  *z-index: 1000;
-}
-
-.open > .dropdown-menu {
-  display: block;
-}
-
-.dropdown-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 990;
-}
-

 /* Rules for the "Welcome" page */
 .site-welcome, .site-fixthemap {
   .center {
 /* Rules for the "Welcome" page */
 .site-welcome, .site-fixthemap {
   .center {


@@ -2597,53 +2253,12 @@ input.richtext_title[type="text"] {
   background-size: cover;
   background-attachment: fixed;
 
   background-size: cover;
   background-attachment: fixed;
 

-  .caption {
-    max-width: 200px;
-    font: 13px/20px Helvetica, Arial, sans-serif;
-    position: fixed;
-    text-align: right;
-    right: 20px;
-    bottom: 60px;
-    text-shadow: #000 0px 1px 5px;
-    color: $lightgrey;
-    opacity: 0.8;
-    display: none;
-  }
-
-  .caption a {
-    color: white;
-    white-space: nowrap;
-    text-decoration: none;
-  }
-
-  a.next {
-    display: block;
-    position: fixed;
-    right: 10px;
-    bottom: 10px;
-    width: 40px;
-    height: 40px;
-    border-radius: 5px;
-    text-indent: -9999px;
-    overflow: hidden;
-    background: image-url('about/sprite.png') -120px 0px no-repeat;
-    background-color: #000;
-    background-color: rgba(0, 0, 0, 0.5);
-  }

 
   .content-inner {
     position: relative;
     color: #333;
     min-width: 320px;
     max-width: 640px;
 
   .content-inner {
     position: relative;
     color: #333;
     min-width: 320px;
     max-width: 640px;

-
-    .section {
-      margin-bottom: 30px;
-    }
-
-    .section:last-child {
-      margin-bottom: 0;
-    }

   }
 
   .text {
   }
 
   .text {


@@ -2703,10 +2318,6 @@ input.richtext_title[type="text"] {
     }
   }
 
     }
   }
 

-  h2 {
-    margin-bottom: 10px;
-  }
-

   .icon {
     width: 30px;
     height: 30px;
   .icon {
     width: 30px;
     height: 30px;


@@ -2754,47 +2365,8 @@ input.richtext_title[type="text"] {
   opacity: 0.7;
 }
 
   opacity: 0.7;
 }
 

-.report-related-block {
-  display:inline-block;
-}
-
-.report-block {
-  width:475px;
-  float:left;
-  margin-right:100px;
-}
-
-.related-reports {
-  width: 280px;
-  float: right;
-
-  ul {
-    padding-left: $lineheight;
-    margin-bottom: 0;
-
-    li {
-      list-style: disc;
-    }
-  }
-}
-
-.issue-comments {
-  width:475px;
-}
-

 .issues-list {
   td:nth-child(2) {
     white-space: nowrap;
   }
 }
 .issues-list {
   td:nth-child(2) {
     white-space: nowrap;
   }
 }

-
-.report-disclaimer {
-  ul {
-    padding-left: $lineheight;
-    margin-bottom: 0;
-
-    li {
-      list-style: disc;
-    }
-  }
-}