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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 7871e8a41ab3f1c67fcb934194347fae8596d883..7c31b3cb1f20fdf19f4bbfb825ab972cbabad64e 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -16,11 +16,6 @@ time[title] {
 
 #container { position: relative; }
 
-.small_icon {
-  vertical-align: middle;
-  margin-right: $lineheight * 0.25;
-}
-
 /* Rules for icons */
 
 .icon {
@@ -165,10 +160,6 @@ nav.secondary {
   .nav-link {
     padding: 0.2rem;
   }
-
-  #inboxanchor {
-    background-color: lighten($grey, 10%);
-  }
 }
 
 nav.primary, nav.secondary {
@@ -465,10 +456,16 @@ body.small-nav {
 }
 
 .leaflet-popup-content-wrapper,
-.leaflet-popup-tip {
+.leaflet-popup-tip,
+.leaflet-contextmenu,
+.leaflet-contextmenu-item {
   @extend .bg-body, .text-body;
 }
 
+.leaflet-contextmenu-item.over {
+  @extend .bg-body-secondary, .border-secondary, .border-opacity-10;
+}
+
 .leaflet-popup-content-wrapper {
   @extend .rounded-1;
 
@@ -924,11 +921,6 @@ div.secondary-actions {
   .sprite.rules {
     /*rtl:ignore*/ background-position: -350px 0;
   }
-
-  .icon.note {
-    background-color: #333;
-    border-radius: 4px;
-  }
 }
 
 .site-about #content {