#23: Isolate custom select2 styles

timble · Mar 24, 2017 · 60aee9d · 60aee9d
1 parent 79b9c27
commit 60aee9d
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 1,995 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -25,7 +25,8 @@ module.exports = function(grunt) {
                 files: {
                     'application/site/public/theme/muhimu/css/default.css': 'application/site/public/theme/muhimu/css/default.scss',
                     'application/site/public/theme/muhimu/css/fonts.css': 'application/site/public/theme/muhimu/css/fonts.scss',
-                    'application/site/public/theme/muhimu/css/ie.css': 'application/site/public/theme/muhimu/css/ie.scss'
+                    'application/site/public/theme/muhimu/css/ie.css': 'application/site/public/theme/muhimu/css/ie.scss',
+                    'application/site/public/theme/muhimu/css/select2.css': 'application/site/public/theme/muhimu/css/select2.scss'
                 }
             }
         },
@@ -65,7 +66,10 @@ module.exports = function(grunt) {
             },
             site: {
                 files: {
-                    'application/site/public/theme/muhimu/css/default.css': 'application/site/public/theme/muhimu/css/default.css'
+                    'application/site/public/theme/muhimu/css/default.css': 'application/site/public/theme/muhimu/css/default.css',
+                    'application/site/public/theme/muhimu/css/ie.css': 'application/site/public/theme/muhimu/css/ie.css',
+                    'application/site/public/theme/muhimu/css/fonts.css': 'application/site/public/theme/muhimu/css/fonts.css',
+                    'application/site/public/theme/muhimu/css/select2.css': 'application/site/public/theme/muhimu/css/select2.css'
                 }
             }
         },

diff --git a/application/site/component/bin/view/relations/templates/default.html.php b/application/site/component/bin/view/relations/templates/default.html.php
@@ -11,6 +11,7 @@
 <? $site = escape(object('application')->getCfg('site' )) ?>
 
 <style src="assets://application/components/select2/select2.css" />
+<style src="assets://application/css/select2.css" />
 
 <script src="assets://application/js/jquery.js" />
 <script src="assets://application/components/select2/select2.js" />

diff --git a/application/site/component/districts/view/relations/templates/default_search.html.php b/application/site/component/districts/view/relations/templates/default_search.html.php
@@ -14,6 +14,7 @@
 ?>
 
 <style src="assets://application/components/select2/select2.css" />
+<style src="assets://application/css/select2.css" />
 
 <script src="assets://application/js/jquery.js" />
 <script src="assets://application/components/select2/select2.js" />

diff --git a/application/site/public/theme/muhimu/css/default.css b/application/site/public/theme/muhimu/css/default.css
diff --git a/application/site/public/theme/muhimu/css/default.scss b/application/site/public/theme/muhimu/css/default.scss
@@ -7,7 +7,6 @@
 @import 'utilities/functions';
 
 // External components
-@import 'utilities/select2';
 @import 'utilities/system';
 
 // Reset

diff --git a/application/site/public/theme/muhimu/css/fonts.css b/application/site/public/theme/muhimu/css/fonts.css