[bug] fix css not concatting in correct order

Author: zombieFox

gulpfile.js

@@ -35,6 +35,37 @@ const jsDependencies = [
 path.nodeModules+'/invert-color/lib/invert.min.js'
 ]
 
+constcssFiles=[
+path.src+'/css/reset.css',
+path.src+'/css/variables.css',
+path.src+'/css/utilities.css',
+path.src+'/css/base.css',
+path.src+'/css/layout.css',
+path.src+'/css/edge.css',
+path.src+'/css/animation.css',
+path.src+'/css/fonts.css',
+path.src+'/css/icons.css',
+path.src+'/css/state.css',
+path.src+'/css/typography.css',
+path.src+'/css/spacing.css',
+path.src+'/css/button.css',
+path.src+'/css/form.css',
+path.src+'/css/shade.css',
+path.src+'/css/modal.css',
+path.src+'/css/tip.css',
+path.src+'/css/menu.css',
+path.src+'/css/header.css',
+path.src+'/css/date.css',
+path.src+'/css/clock.css',
+path.src+'/css/greeting.css',
+path.src+'/css/transitional.css',
+path.src+'/css/search.css',
+path.src+'/css/background.css',
+path.src+'/css/link.css',
+path.src+'/css/auto-suggest.css',
+path.src+'/css/fontawesome.css'
+]
+
 constjsFiles=[
 path.src+'/js/helper.js',
 path.src+'/js/data.js',
@@ -88,7 +119,7 @@ const build ={
 .pipe(dest(path.build+'/icons'))
 },
 css: function(){
-returnsrc(path.src+'/css/*.css')
+returnsrc(cssFiles)
 .pipe(concat(filename.css))
 .pipe(csso())
 .pipe(dest(path.build+'/css'))
@@ -144,10 +175,10 @@ const dev ={
 })
 },
 css: function(){
-watch(path.src+'/css/*.css',{
+watch(cssFiles,{
 ignoreInitial: false
 },function(){
-returnsrc(path.src+'/css/*.css')
+returnsrc(cssFiles)
 .pipe(dest(path.dev+'/css'))
 })
 },

package.json

@@ -1,6 +1,6 @@
 {
 "name": "nighttab",
-"version": "3.75.1",
+"version": "3.75.2",
 "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
 "main": "index.js",
 "scripts":{

src/index.html

@@ -9,14 +9,14 @@
 <!-- css-block -->
 <linkrel="stylesheet" href="css/reset.css">
 <linkrel="stylesheet" href="css/variables.css">
+<linkrel="stylesheet" href="css/utilities.css">
 <linkrel="stylesheet" href="css/base.css">
 <linkrel="stylesheet" href="css/layout.css">
 <linkrel="stylesheet" href="css/edge.css">
 <linkrel="stylesheet" href="css/animation.css">
 <linkrel="stylesheet" href="css/fonts.css">
 <linkrel="stylesheet" href="css/icons.css">
 <linkrel="stylesheet" href="css/state.css">
-<linkrel="stylesheet" href="css/utilities.css">
 <linkrel="stylesheet" href="css/typography.css">
 <linkrel="stylesheet" href="css/spacing.css">
 <linkrel="stylesheet" href="css/button.css">

src/js/version.js

@@ -1,6 +1,6 @@
 varversion=(function(){
 
-varcurrent="3.75.1";
+varcurrent="3.75.2";
 
 varcompare=function(a,b){
 varpa=a.split(".");

src/manifest.json

@@ -2,7 +2,7 @@
 "name": "nightTab",
 "short_name": "nightTab",
 "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
-"version": "3.75.1",
+"version": "3.75.2",
 "manifest_version": 2,
 "chrome_url_overrides":{
 "newtab": "index.html"