- move compiled css into version tag folder
- remove base-url from inline-images. path is resolved by compass (images_dir) - commend out compass configs that get overwritten in gulpfile - update gulpfile to build into version tag folder - update paths in css and templates accordingly
This commit is contained in:
@@ -7,8 +7,8 @@ require 'compass/import-once/activate'
|
||||
|
||||
http_path = "/"
|
||||
# project_path = ''
|
||||
css_dir = 'public/css'
|
||||
sass_dir = 'sass'
|
||||
# css_dir = 'public/css'
|
||||
# sass_dir = 'sass'
|
||||
images_dir = 'public/img'
|
||||
generated_images_path = 'img_cache'
|
||||
# javascripts_dir = 'javascripts'
|
||||
|
||||
114
gulpfile.js
114
gulpfile.js
@@ -94,61 +94,6 @@ let uglifyJsOptions = {
|
||||
toplevel: false
|
||||
};
|
||||
|
||||
// Sourcemaps options
|
||||
// https://www.npmjs.com/package/gulp-sourcemaps
|
||||
|
||||
// -- Plugin options ----------------------------------------------------------
|
||||
|
||||
let gZipOptions = {
|
||||
append: false, // disables default append ext .gz
|
||||
extension: 'gz', // use "custom" ext: .gz
|
||||
threshold: '1kb', // min size required to compress a file
|
||||
deleteMode: PATH.JS.DIST_BUILD, // replace *.gz files if size < 'threhold'
|
||||
gzipOptions: {
|
||||
level: 9 // zlib.Gzip compression level [0-9]
|
||||
},
|
||||
skipGrowingFiles: true // use orig. files in case of *.gz size > orig. size
|
||||
};
|
||||
|
||||
let brotliOptions = {
|
||||
extension: 'br', // use "custom" ext: .br
|
||||
mode: 1, // compression mode for UTF-8 formatted text
|
||||
quality: 11, // quality [1 worst - 11 best]
|
||||
skipLarger: true // use orig. files in case of *.br size > orig. size
|
||||
};
|
||||
|
||||
let compassOptions = {
|
||||
config_file: './config.rb',
|
||||
css: 'public/css',
|
||||
sass: 'sass',
|
||||
time: true, // show execution time
|
||||
sourcemap: true
|
||||
};
|
||||
|
||||
let compressionExt = [gZipOptions.extension, brotliOptions.extension];
|
||||
|
||||
// -- Error output ------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* print error box output
|
||||
* @param title
|
||||
* @param example
|
||||
*/
|
||||
let printError = (title, example) => {
|
||||
let cliLineLength = (cliBoxLength - 8);
|
||||
|
||||
gutil.log('').log(chalk.red( '= ERROR ' + '=' . repeat(cliLineLength)));
|
||||
gutil.log(chalk.red(title));
|
||||
if(example){
|
||||
gutil.log(`
|
||||
${chalk.gray(example)}
|
||||
`);
|
||||
}
|
||||
gutil.log(chalk.red('='.repeat(cliBoxLength))).log('');
|
||||
};
|
||||
|
||||
// == Settings ========================================================================================================
|
||||
|
||||
// parse pathfinder.ini config file for relevant data
|
||||
let tagVersion;
|
||||
try{
|
||||
@@ -189,6 +134,59 @@ let CONF = {
|
||||
DEBUG: false
|
||||
};
|
||||
|
||||
// Sourcemaps options
|
||||
// https://www.npmjs.com/package/gulp-sourcemaps
|
||||
|
||||
// -- Plugin options ----------------------------------------------------------
|
||||
|
||||
let gZipOptions = {
|
||||
append: false, // disables default append ext .gz
|
||||
extension: 'gz', // use "custom" ext: .gz
|
||||
threshold: '1kb', // min size required to compress a file
|
||||
deleteMode: PATH.JS.DIST_BUILD, // replace *.gz files if size < 'threhold'
|
||||
gzipOptions: {
|
||||
level: 9 // zlib.Gzip compression level [0-9]
|
||||
},
|
||||
skipGrowingFiles: true // use orig. files in case of *.gz size > orig. size
|
||||
};
|
||||
|
||||
let brotliOptions = {
|
||||
extension: 'br', // use "custom" ext: .br
|
||||
mode: 1, // compression mode for UTF-8 formatted text
|
||||
quality: 11, // quality [1 worst - 11 best]
|
||||
skipLarger: true // use orig. files in case of *.br size > orig. size
|
||||
};
|
||||
|
||||
let compassOptions = {
|
||||
config_file: './config.rb',
|
||||
css: 'public/css/' + CONF.TAG,
|
||||
sass: 'sass',
|
||||
time: true, // show execution time
|
||||
sourcemap: true
|
||||
};
|
||||
|
||||
let compressionExt = [gZipOptions.extension, brotliOptions.extension];
|
||||
|
||||
// -- Error output ------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* print error box output
|
||||
* @param title
|
||||
* @param example
|
||||
*/
|
||||
let printError = (title, example) => {
|
||||
let cliLineLength = (cliBoxLength - 8);
|
||||
|
||||
gutil.log('').log(chalk.red( '= ERROR ' + '=' . repeat(cliLineLength)));
|
||||
gutil.log(chalk.red(title));
|
||||
if(example){
|
||||
gutil.log(`
|
||||
${chalk.gray(example)}
|
||||
`);
|
||||
}
|
||||
gutil.log(chalk.red('='.repeat(cliBoxLength))).log('');
|
||||
};
|
||||
|
||||
// == Helper methods ==================================================================================================
|
||||
|
||||
/**
|
||||
@@ -485,7 +483,7 @@ gulp.task('task:cleanJsBuild', () => del([PATH.JS.DIST_BUILD]));
|
||||
/**
|
||||
* clean CSS build dir
|
||||
*/
|
||||
gulp.task('task:cleanCssBuild', () => del([PATH.ASSETS.DIST + '/css']));
|
||||
gulp.task('task:cleanCssBuild', () => del([PATH.ASSETS.DIST + '/css/' + CONF.TAG]));
|
||||
|
||||
/**
|
||||
* clean JS destination (final) dir
|
||||
@@ -667,7 +665,7 @@ gulp.task('task:sass', () => {
|
||||
trackFile(data, {src: 'startSize', src_percent: 'percent', uglify: 'endSize'});
|
||||
return chalk.green('Build CSS file "' + data.fileName + '"');
|
||||
}))
|
||||
.pipe(gulp.dest(PATH.ASSETS.DIST + '/css'));
|
||||
.pipe(gulp.dest(PATH.ASSETS.DIST + '/css/' + CONF.TAG));
|
||||
});
|
||||
|
||||
/**
|
||||
@@ -679,7 +677,7 @@ gulp.task('task:cleanCss', () => {
|
||||
compatibility: '*',
|
||||
level: 2
|
||||
}))
|
||||
.pipe(gulp.dest(PATH.ASSETS.DIST +'/css'));
|
||||
.pipe(gulp.dest(PATH.ASSETS.DIST +'/css/' + CONF.TAG));
|
||||
});
|
||||
|
||||
// == Helper tasks ====================================================================================================
|
||||
|
||||
File diff suppressed because one or more lines are too long
51
public/css/v1.3.4/pathfinder.css
Normal file
51
public/css/v1.3.4/pathfinder.css
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -50,7 +50,7 @@
|
||||
|
||||
<meta name="google-site-verification" content="sHoh0gfMw3x1wiwLTK5OsKsxt7kRgxi69hRgWEGh9DQ" /> {* Youtube verification code *}
|
||||
|
||||
<set pathCSS="{{ @BASE . '/public/css/pathfinder.css?' . @PATHFINDER.VERSION }}" />
|
||||
<set pathCSS="{{ @BASE . '/public/css/' . @PATHFINDER.VERSION . '/pathfinder.css' }}" />
|
||||
<set pathJSApp="{{ @BASE . '/' . @tplPathJs . '/app' }}" />
|
||||
<set pathJSRequire="{{ @BASE . '/' . @tplPathJs . '/lib/require.js' }}" />
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ $link-hover-color: darken($link-color, 15%);
|
||||
//
|
||||
//## Font, line-height, and color for body text, headings, and more.
|
||||
|
||||
$pf-font-path: "../fonts" !default;
|
||||
$pf-font-path: "../../fonts" !default;
|
||||
|
||||
@font-face {
|
||||
font-family: 'Oxygen';
|
||||
@@ -105,7 +105,7 @@ $headings-color: inherit;
|
||||
//
|
||||
//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.
|
||||
|
||||
$icon-font-path: "../fonts/";
|
||||
$icon-font-path: "../../fonts/";
|
||||
$icon-font-name: "glyphicons-halflings-regular";
|
||||
$icon-font-svg-id: "glyphicons_halflingsregular";
|
||||
|
||||
@@ -805,7 +805,7 @@ $animation-ajax-dropdown: "flipInY";
|
||||
//
|
||||
//##
|
||||
|
||||
$base-url: "../img";
|
||||
$base-url: "../../img";
|
||||
//urage: background-image: url("#{$base-url}/images/bg.png");
|
||||
|
||||
$html-background-image: "";
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
}
|
||||
|
||||
.pf-icon-dotlan{
|
||||
background: inline-image("#{$base-url}/icons/dotlan_logo.png");
|
||||
background: inline-image("/icons/dotlan_logo.png");
|
||||
width: 17px;
|
||||
height: 17px;
|
||||
opacity: 0.8;
|
||||
@@ -16,7 +16,7 @@
|
||||
}
|
||||
|
||||
.pf-icon-wormhol-es{
|
||||
background: inline-image("#{$base-url}/icons/wormhol_es_logo.png");
|
||||
background: inline-image("/icons/wormhol_es_logo.png");
|
||||
width: 17px;
|
||||
height: 17px;
|
||||
opacity: 0.8;
|
||||
|
||||
@@ -232,7 +232,7 @@ $mapWrapperMaxWidth: $mapWidth + 35px;
|
||||
|
||||
// 20x20px grid background
|
||||
.pf-grid-small{
|
||||
background: inline-image("#{$base-url}/grid_40x40.png") !important;
|
||||
background: inline-image("/grid_40x40.png") !important;
|
||||
}
|
||||
|
||||
.pf-map{
|
||||
|
||||
@@ -371,7 +371,7 @@ yx-axis
|
||||
.mCSB_scrollTools .mCSB_buttonLeft,
|
||||
.mCSB_scrollTools .mCSB_buttonRight{
|
||||
//background-image: url(mCSB_buttons.png); /* css sprites */
|
||||
background: inline-image("#{$base-url}/custom-scrollbar/mCSB_buttons.png"); /* css sprites */
|
||||
background: inline-image("/custom-scrollbar/mCSB_buttons.png"); /* css sprites */
|
||||
background-repeat: no-repeat;
|
||||
opacity: 0.4; filter: "alpha(opacity=40)"; -ms-filter: "alpha(opacity=40)";
|
||||
}
|
||||
|
||||
2
sass/library/fontawesome/_variables.scss
vendored
2
sass/library/fontawesome/_variables.scss
vendored
@@ -1,7 +1,7 @@
|
||||
// Variables
|
||||
// --------------------------
|
||||
|
||||
$fa-font-path: "../fonts" !default;
|
||||
$fa-font-path: "../../fonts" !default;
|
||||
$fa-font-size-base: 16px !default;
|
||||
$fa-css-prefix: fa !default;
|
||||
$fa-version: "5.0.2" !default;
|
||||
|
||||
Reference in New Issue
Block a user