Use Activerecord '#or' method for queries

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1b200ded7e412e8c459cb946f3b95e2e27cc9df5..aa2c95a99b12a8dbdff083dfb7d6e205fd53c410 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -324,10 +324,6 @@ body.small-nav {
   .overlay-sidebar #sidebar #banner {
     display: none;
   }
   .overlay-sidebar #sidebar #banner {
     display: none;
   }

-
-  .leaflet-top.leaflet-right {
-    top: 10px !important;
-  }

 }
 
 /* Utility for styling notification numbers */
 }
 
 /* Utility for styling notification numbers */


@@ -351,6 +347,15 @@ body.small-nav {
 
 /* Rules for Leaflet maps */
 
 
 /* Rules for Leaflet maps */
 

+.leaflet-top.leaflet-right,
+.leaflet-top.leaflet-left {
+  height: 100%;
+  column-gap: 10px;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: wrap-reverse;
+}
+

 .leaflet-control .control-button {
   display: block;
   height: 40px;
 .leaflet-control .control-button {
   display: block;
   height: 40px;


@@ -460,6 +465,11 @@ 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 {


@@ -1047,49 +1057,24 @@ tr.turn:hover {
   width: 100%;
 }
 
   width: 100%;
 }
 

-/* Rules for the diary list page */
-
-.diary_post {
-  position: relative;
-  padding-top: $lineheight;
-  padding-bottom: $lineheight/2;
-  border-top: 1px solid $grey;
-
-  &.deleted {
-    background-color: #fee;
-  }
-}
-

 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {
     height: 400px;
     display: none;
 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {
     height: 400px;
     display: none;

-    margin-bottom: $lineheight;

   }
   .comments {
     max-width: 740px;
   }
   .diary-comment {
     border-top: 1px dashed $grey;
   }
   .comments {
     max-width: 740px;
   }
   .diary-comment {
     border-top: 1px dashed $grey;

-    padding-top: $lineheight/2;
-    padding-bottom: $lineheight/2;

     &:first-child {
     &:first-child {

-      margin-top: $lineheight/2;
-      padding-top: $lineheight;

       border-top: 1px solid $grey;
     }
       border-top: 1px solid $grey;
     }

-    &.deleted {
-      background-color: #fee;
-    }

     p {
       margin-bottom: $lineheight/2;
     }
     p {
       margin-bottom: $lineheight/2;
     }

-    .comment-heading {
-      margin-bottom: 0;
-      margin-top: 0;
-    }

   }
 }
 
   }
 }
 


@@ -1132,11 +1117,6 @@ tr.turn:hover {
 /* Rules for messages pages */
 
 .messages {
 /* Rules for messages pages */
 
 .messages {

-  button[type="submit"] {
-    margin: auto;
-    white-space: nowrap;
-  }
-

   .inbox-row {
     background: $offwhite;
   }
   .inbox-row {
     background: $offwhite;
   }


@@ -1146,18 +1126,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-.inbox-row .inbox-mark-read {
-  display: none !important;
-}
-
-.inbox-sent {
-  white-space: nowrap;
-}
-
-.inbox-row-unread .inbox-mark-unread {
-  display: none !important;
-}
-

 .search_form {
   background-color: $lightgrey;
 
 .search_form {
   background-color: $lightgrey;
 


@@ -1227,6 +1195,8 @@ div.secondary-actions {
   code {
     background: $lightgrey;
     padding: 2px 3px;
   code {
     background: $lightgrey;
     padding: 2px 3px;

+    direction: inherit; /* fix for Bootstrap < 5.2 */
+    unicode-bidi: unset; /* fix for Bootstrap < 5.2 */

   }
 
   pre {
   }
 
   pre {


@@ -1255,14 +1225,6 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

-/* Rules for the user notes list */
-
-.note_list {
-  tr.creator {
-    background-color: $offwhite;
-  }
-}
-

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