mirror of
https://github.com/zombieFox/nightTab.git
synced 2025-01-13 09:28:41 +01:00
[bug] fix css not concatting in correct order
This commit is contained in:
parent
4a77fd43c7
commit
7818228d96
37
gulpfile.js
37
gulpfile.js
@ -35,6 +35,37 @@ const jsDependencies = [
|
||||
path.nodeModules + '/invert-color/lib/invert.min.js'
|
||||
]
|
||||
|
||||
const cssFiles = [
|
||||
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'
|
||||
]
|
||||
|
||||
const jsFiles = [
|
||||
path.src + '/js/helper.js',
|
||||
path.src + '/js/data.js',
|
||||
@ -88,7 +119,7 @@ const build = {
|
||||
.pipe(dest(path.build + '/icons'))
|
||||
},
|
||||
css: function() {
|
||||
return src(path.src + '/css/*.css')
|
||||
return src(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() {
|
||||
return src(path.src + '/css/*.css')
|
||||
return src(cssFiles)
|
||||
.pipe(dest(path.dev + '/css'))
|
||||
})
|
||||
},
|
||||
|
@ -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": {
|
||||
|
@ -9,6 +9,7 @@
|
||||
<!-- css-block -->
|
||||
<link rel="stylesheet" href="css/reset.css">
|
||||
<link rel="stylesheet" href="css/variables.css">
|
||||
<link rel="stylesheet" href="css/utilities.css">
|
||||
<link rel="stylesheet" href="css/base.css">
|
||||
<link rel="stylesheet" href="css/layout.css">
|
||||
<link rel="stylesheet" href="css/edge.css">
|
||||
@ -16,7 +17,6 @@
|
||||
<link rel="stylesheet" href="css/fonts.css">
|
||||
<link rel="stylesheet" href="css/icons.css">
|
||||
<link rel="stylesheet" href="css/state.css">
|
||||
<link rel="stylesheet" href="css/utilities.css">
|
||||
<link rel="stylesheet" href="css/typography.css">
|
||||
<link rel="stylesheet" href="css/spacing.css">
|
||||
<link rel="stylesheet" href="css/button.css">
|
||||
|
@ -1,6 +1,6 @@
|
||||
var version = (function() {
|
||||
|
||||
var current = "3.75.1";
|
||||
var current = "3.75.2";
|
||||
|
||||
var compare = function(a, b) {
|
||||
var pa = a.split(".");
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user