extern/nightTab
1
0
Fork 0
mirror of https://github.com/zombieFox/nightTab.git synced 2025-08-16 16:51:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

[bug] fix css not concatting in correct order

Browse Source
This commit is contained in:
zombieFox
2019-08-25 23:12:31 +01:00
parent 4a77fd43c7
commit 7818228d96
5 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gulpfile.js
View File

@ -35,6 +35,37 @@ const jsDependencies = [
path.nodeModules + '/invert-color/lib/invert.min.js' 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 = [ const jsFiles = [
path.src + '/js/helper.js', path.src + '/js/helper.js',
path.src + '/js/data.js', path.src + '/js/data.js',
@ -88,7 +119,7 @@ const build = {
.pipe(dest(path.build + '/icons')) .pipe(dest(path.build + '/icons'))
}, },
css: function() { css: function() {
return src(path.src + '/css/*.css') return src(cssFiles)
.pipe(concat(filename.css)) .pipe(concat(filename.css))
.pipe(csso()) .pipe(csso())
.pipe(dest(path.build + '/css')) .pipe(dest(path.build + '/css'))
@ -144,10 +175,10 @@ const dev = {
}) })
}, },
css: function() { css: function() {
watch(path.src + '/css/*.css', { watch(cssFiles, {
ignoreInitial: false ignoreInitial: false
}, function() { }, function() {
return src(path.src + '/css/*.css') return src(cssFiles)
.pipe(dest(path.dev + '/css')) .pipe(dest(path.dev + '/css'))
}) })
}, },

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "nighttab", "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.", "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

2
src/index.html
View File

@ -9,6 +9,7 @@
<!-- css-block --> <!-- css-block -->
<link rel="stylesheet" href="css/reset.css"> <link rel="stylesheet" href="css/reset.css">
<link rel="stylesheet" href="css/variables.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/base.css">
<link rel="stylesheet" href="css/layout.css"> <link rel="stylesheet" href="css/layout.css">
<link rel="stylesheet" href="css/edge.css"> <link rel="stylesheet" href="css/edge.css">
@ -16,7 +17,6 @@
<link rel="stylesheet" href="css/fonts.css"> <link rel="stylesheet" href="css/fonts.css">
<link rel="stylesheet" href="css/icons.css"> <link rel="stylesheet" href="css/icons.css">
<link rel="stylesheet" href="css/state.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/typography.css">
<link rel="stylesheet" href="css/spacing.css"> <link rel="stylesheet" href="css/spacing.css">
<link rel="stylesheet" href="css/button.css"> <link rel="stylesheet" href="css/button.css">

2
src/js/version.js
View File

@ -1,6 +1,6 @@
var version = (function() { var version = (function() {
var current = "3.75.1"; var current = "3.75.2";
var compare = function(a, b) { var compare = function(a, b) {
var pa = a.split("."); var pa = a.split(".");

2
src/manifest.json
View File

@ -2,7 +2,7 @@
"name": "nightTab", "name": "nightTab",
"short_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.", "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, "manifest_version": 2,
"chrome_url_overrides": { "chrome_url_overrides": {
"newtab": "index.html" "newtab": "index.html"