Initial Commit: Use app.css instead of different CSS files in main.php

Update main.php, corrects path.

Adds files to app folder, concats CSS to public folder.

exclude css/app from build

.gitignore

@@ -96,4 +96,5 @@ coverage/
 
 !/js/vendor
 
-js/public
+js/public
+css/public

.travis.yml

@@ -66,7 +66,7 @@ script:
     - phpunit --coverage-clover=coverage.clover tests/unit
     - cd js/
     - grunt karma
-    - ./node_modules/stylelint/dist/cli.js ../css/*.css
+    - ./node_modules/stylelint/dist/cli.js ../css/app/*.css
     - cd ..
 
 

Makefile

@@ -17,6 +17,8 @@ build: clean
 	--exclude-vcs \
 	--exclude-vcs-ignores \
 	--add-file=$(project_dir)/js/public/app.js \
+	--add-file=$(project_dir)/css/public/app.css \
+	--exclude=$(project_dir)/css/app \
 	--exclude=$(project_dir)/js/app \
 	--exclude=$(project_dir)/js/config \
 	--exclude=$(project_dir)/tests \

css/app/calendarlist.css

@@ -279,7 +279,7 @@
 }
 
 .colorpicker .colorpicker-list li.randomcolour {
-	background-image: url('../img/random.svg');
+	background-image: url('../../img/random.svg');
 	background-repeat: no-repeat;
 	background-position: center center;
 }

css/app/datepicker.css

@@ -170,11 +170,11 @@
 /* Overrides */
 
 .glyphicon-chevron-left {
-	background: url("../img/leftarrow.svg") center center no-repeat;
+	background: url("../../img/leftarrow.svg") center center no-repeat;
 }
 
 .glyphicon-chevron-right {
-	background: url("../img/rightarrow.svg") center center no-repeat;
+	background: url("../../img/rightarrow.svg") center center no-repeat;
 }
 
 .glyphicon {

css/app/globals.css

@@ -42,7 +42,7 @@
 }
 
 .icon-timezone {
-	background: url("../img/timezone.svg") center center no-repeat;
+	background: url("../../img/timezone.svg") center center no-repeat;
 	display: block;
 }
 

js/Gruntfile.js

@@ -42,19 +42,26 @@ module.exports = function(grunt) {
 			buildJS: 'app/',
 			productionJS: 'public/',
 			testsJS: '../tests/js/',
-			buildCSS: '../css/'
+			buildCSS: '../css/app/',
+			productionCSS: '../css/public/'
 		},
 
 		concat: {
 			options: {
 				stripBanners: true
 			},
-			dist: {
+			basic: {
 				src: [
 					'<%= meta.configJS %>*.js',
 					'<%= meta.buildJS %>/**/*.js'
 				],
 				dest: '<%= meta.productionJS %>app.js'
+			},
+			extras: {
+				src: [
+					'<%= meta.buildCSS %>*.css'
+				],
+				dest: '<%= meta.productionCSS %>app.css'
 			}
 		},
 
@@ -145,7 +152,7 @@ module.exports = function(grunt) {
 						require('stylelint')()
 					]
 				},
-				src: [ "../css/*.css" ]
+				src: [ "<%= meta.buildCSS %>*.css" ]
 			}
 		}
 

templates/main.php

@@ -24,12 +24,7 @@
 $styles = [
 	'../js/vendor/fullcalendar/dist/fullcalendar',
 	'../js/vendor/jquery-timepicker/jquery.ui.timepicker',
-	'globals',
-	'calendar',
-	'calendarlist',
-	'datepicker',
-	'eventdialog',
-	'settings'
+	'public/app'
 ];
 
 foreach ($styles as $style) {