From 3714c614c8d46ae1c437e6443ad35bca76721afc Mon Sep 17 00:00:00 2001 From: echarp Date: Sat, 14 Jul 2018 00:49:33 +0200 Subject: [PATCH] Cleaned up sass imports --- app/assets/stylesheets/all.sass | 4 ---- app/assets/stylesheets/application.sass | 7 +++++++ app/assets/stylesheets/form.sass | 6 +++--- app/assets/stylesheets/maps.sass | 3 --- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/all.sass b/app/assets/stylesheets/all.sass index 129c7378..c000916d 100644 --- a/app/assets/stylesheets/all.sass +++ b/app/assets/stylesheets/all.sass @@ -1,7 +1,3 @@ -@import font-awesome-sprockets -@import font-awesome -@import leaflet.awesome-markers - * height: auto padding: 0 diff --git a/app/assets/stylesheets/application.sass b/app/assets/stylesheets/application.sass index 2249bc9c..62407436 100644 --- a/app/assets/stylesheets/application.sass +++ b/app/assets/stylesheets/application.sass @@ -15,7 +15,14 @@ @import jquery-ui/autocomplete @import jquery-ui/menu @import jquery.tagsinput + @import font-awesome-sprockets @import font-awesome + @import flag-icon + +@import leaflet +@import leaflet.markercluster +@import leaflet.awesome-markers + @import * diff --git a/app/assets/stylesheets/form.sass b/app/assets/stylesheets/form.sass index 6aa716cd..1368b9db 100644 --- a/app/assets/stylesheets/form.sass +++ b/app/assets/stylesheets/form.sass @@ -1,6 +1,3 @@ -@import font-awesome-sprockets -@import font-awesome - $border: none $radius: 4px $shadow: 0 0 2px darkgray @@ -21,6 +18,9 @@ body.mce-content-body margin-top: 0 margin-bottom: 0 +legend + margin-left: 0 + .field color: #666 border: $border diff --git a/app/assets/stylesheets/maps.sass b/app/assets/stylesheets/maps.sass index 92264f28..feaafd35 100644 --- a/app/assets/stylesheets/maps.sass +++ b/app/assets/stylesheets/maps.sass @@ -1,6 +1,3 @@ -@import leaflet -@import leaflet.markercluster - #map height: 60em box-shadow: 0 0 1em SteelBlue