Merge remote-tracking branch 'upstream/pull/4349'

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 4b62b9af50d31bcb8efd1e83183c6a25745eb42f..1f5d0398e97b2b11433355821a69f11e4ee6c215 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -2,6 +2,34 @@
 @import "bootstrap";
 @import "rails_bootstrap_forms";
 
 @import "bootstrap";
 @import "rails_bootstrap_forms";
 

+/* Bootstrap + r2 fixes */
+
+:root[dir=rtl] {
+  .bs-tooltip-auto[data-popper-placement^="right"] .tooltip-arrow {
+    /* no-r2 */
+    right: unset !important;
+    left: calc(-1 * var(--bs-tooltip-arrow-height)) !important;
+
+    &::before {
+      /* no-r2 */
+      left: unset !important;
+      right: -1px !important;
+    }
+  }
+
+  .bs-tooltip-auto[data-popper-placement^="left"] .tooltip-arrow {
+    /* no-r2 */
+    left: unset !important;
+    right: calc(-1 * var(--bs-tooltip-arrow-height)) !important;
+
+    &::before {
+      /* no-r2 */
+      right: unset !important;
+      left: -1px !important;
+    }
+  }
+}
+

 /* Styles common to large and small screens */
 
 /* Default rules for the body of every page */
 /* Styles common to large and small screens */
 
 /* Default rules for the body of every page */


@@ -19,6 +47,10 @@ small, aside {
   font-size: 12px;
 }
 
   font-size: 12px;
 }
 

+time[title] {
+  text-decoration: underline dotted;
+}
+

 #container { position: relative; }
 
 .small_icon {
 #container { position: relative; }
 
 .small_icon {


@@ -26,10 +58,6 @@ small, aside {
   margin-right: $lineheight * 0.25;
 }
 
   margin-right: $lineheight * 0.25;
 }
 

-[dir=rtl] { /* no-r2 */ text-align: right; }
-
-[dir=ltr] { /* no-r2 */ text-align: left; }
-

 /* Rules for icons */
 
 .icon {
 /* Rules for icons */
 
 .icon {


@@ -290,14 +318,6 @@ body.small-nav {
   font-weight: $font-weight-normal;
 }
 
   font-weight: $font-weight-normal;
 }
 

-/* Rules for the message shown in place of the map when javascript is disabled */
-
-#noscript {
-  z-index: 20000000;
-  margin-left: 400px;
-  margin-top: 50px;
-}
-

 /* Rules for Leaflet maps */
 
 .leaflet-top.leaflet-right,
 /* Rules for Leaflet maps */
 
 .leaflet-top.leaflet-right,


@@ -373,14 +393,6 @@ body.small-nav {
     #sidebar_loader {
       display: none;
     }
     #sidebar_loader {
       display: none;
     }

-
-    #sidebar_content {
-      padding: $spacer;
-    }
-
-    > div {
-      position: relative;
-    }

   }
 
   .overlay-sidebar #sidebar {
   }
 
   .overlay-sidebar #sidebar {


@@ -404,11 +416,6 @@ body.small-nav {
 
   .welcome {
     display: none;
 
   .welcome {
     display: none;

-
-    p {
-      font-size: 110%;
-      font-weight: 300;
-    }

   }
 
   #banner {
   }
 
   #banner {


@@ -418,11 +425,6 @@ body.small-nav {
       display: block;
       width: $sidebarWidth;
     }
       display: block;
       width: $sidebarWidth;
     }

-
-    button.btn-close {
-      background-color: rgba(255, 255, 255, 0.5);
-      opacity: 1.0;
-    }

   }
 
   #map {
   }
 
   #map {


@@ -575,10 +577,6 @@ body.small-nav {
     margin-left: auto;
     margin-right: auto;
   }
     margin-left: auto;
     margin-right: auto;
   }

-
-  > div {
-   padding: $spacer;
-  }

 }
 
 /* Temporary label size override until we remove site-wide font customisation */
 }
 
 /* Temporary label size override until we remove site-wide font customisation */


@@ -708,45 +706,16 @@ tr.turn:hover {
   }
 
   .browse-tag-list {
   }
 
   .browse-tag-list {

-    background-color: $offwhite;

     table-layout: fixed;
     table-layout: fixed;

-    border-collapse: separate;
-    border-spacing: 0;
-    width: 100%;
-    margin-bottom: $spacer;
-
-    th, td {
-      border-bottom: 1px solid $grey;
-    }
+    white-space: pre-wrap;

 
     tr:last-child th, tr:last-child td {
       border-bottom: 0;
     }
 
 
     tr:last-child th, tr:last-child td {
       border-bottom: 0;
     }
 

-    .browse-tag-k,
-    .browse-tag-v {
-      width: 50%;
-      padding: 6px 10px;
-      word-wrap: break-word;
-      white-space: pre-wrap;
-    }
-
-    .browse-tag-k {
-      font-weight: 500;
-      background-color: $offwhite;
-    }
-
-    .browse-tag-v {
-      border-left: 1px solid $grey;
-      background-color: #fff;
-    }
-

     .colour-preview-box {
     .colour-preview-box {

-      float: right;

       width: 14px;
       height: 14px;
       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>;
     }
   }
       // add color via inline css on element: background-color: <tag value>;
     }
   }


@@ -829,11 +798,6 @@ tr.turn:hover {
     bottom: 0;
     width: 100%;
   }
     bottom: 0;
     width: 100%;
   }

-
-  #map {
-    height: 100%;
-    overflow: hidden;
-  }

 }
 
 /* Rules for non-map content pages */
 }
 
 /* Rules for non-map content pages */


@@ -892,15 +856,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-#content.maximised {
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  border: 0;
-  z-index: 2000;
-}
-

 /* Rules for small maps in content areas */
 
 .content_map {
 /* Rules for small maps in content areas */
 
 .content_map {


@@ -932,12 +887,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-/* Rules for the user list */
-
-#user_list {
-  width: 100%;
-}
-

 /* Rules for the diary entry page */
 
 .diary_entries {
 /* Rules for the diary entry page */
 
 .diary_entries {


@@ -982,7 +931,7 @@ tr.turn:hover {
     background: $offwhite;
   }
 
     background: $offwhite;
   }
 

-  .inbox-row-unread {
+  .inbox-row-unread td {

     background: #CBEEA7;
   }
 }
     background: #CBEEA7;
   }
 }


@@ -1085,13 +1034,6 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

-/* Rules for the iD editor */
-
-.id-embed {
-  width: 100%;
-  height: 100%;
-}
-

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