From 0846766dd62e2eaefe2fa2e2374f1dec553bce7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sun, 16 May 2021 12:27:15 +0200 Subject: [PATCH] Load leaflet CSS before our styles This way we don't have to use the `!important` flag to override styles. --- app/assets/stylesheets/application.scss | 2 +- app/assets/stylesheets/layout.scss | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 380278a1a..36df2cd69 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -3,6 +3,7 @@ @import "fonts"; @import "font-awesome-sprockets"; @import "font-awesome"; +@import "leaflet"; @import "icons"; @import "mixins/*"; @import "admin"; @@ -29,7 +30,6 @@ @import "jquery-ui/autocomplete"; @import "autocomplete_overrides"; @import "jquery-ui/sortable"; -@import "leaflet"; @import "sticky_overrides"; @import "tags"; @import "admin/**/*"; diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 52a559a08..e4fd19f45 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2596,25 +2596,25 @@ table { .leaflet-bar a { &.leaflet-disabled { - color: #525252 !important; + color: #525252; } } .leaflet-container { .leaflet-control-attribution { - background: rgba(255, 255, 255, 0.9) !important; + background: rgba(255, 255, 255, 0.9); } a { - color: $link !important; + color: $link; } } .leaflet-bottom, .leaflet-pane, .leaflet-top { - z-index: 4 !important; + z-index: 4; } // 24. Homepage