FEATURE: add scripts and styles into gulpfile

2017-02-10 02:13:03 +01:00
parent 724478d0c9
commit 0d22a14604
11 changed files with 548 additions and 74 deletions
@@ -48,7 +48,7 @@
 }

 .text-primary {
-	color: $color-primary;
+	color: $color-primary !important;
 }

 .text-muted {
@@ -1,6 +1,6 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,800,700,600);

-@import '_variables';
+@import 'variables';
@import 'bootstrap/scss/_variables';
@import 'bootstrap/scss/_mixins';
@import '_common/_styles/mixins';
@@ -6,6 +6,7 @@
 /*************************************************************
 *					  Colors Definitions
 **************************************************************/
+@import '../../../../public/css/admin/theme';

 $color-primary: #85CE36 !default;
 $color-primary-light: lighten($color-primary, 10%) !default; 
@@ -1,4 +1,4 @@
-@import "../imports";
+@import "../main";

 .app {
 	position: relative;