hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-19 07:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix fontAwesome variable name, remove unused npm dependencies

Browse Source
This commit is contained in:
Florian BLOUET
2015-12-02 18:15:32 +01:00
parent 261339ecd5
commit bb52ece5f4
4 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@@ -14,7 +14,6 @@
"gulp-cssmin": "^0.1.7", "gulp-cssmin": "^0.1.7",
"gulp-debug": "^2.1.2", "gulp-debug": "^2.1.2",
"gulp-install": "^0.6.0", "gulp-install": "^0.6.0",
"gulp-mocha-phantomjs": "^0.10.1",
"gulp-qunit": "^1.2.1", "gulp-qunit": "^1.2.1",
"gulp-rename": "^1.2.2", "gulp-rename": "^1.2.2",
"gulp-sass": "^2.1.0", "gulp-sass": "^2.1.0",
@@ -22,10 +21,8 @@
"gulp-util": "^3.0.7", "gulp-util": "^3.0.7",
"gulp-watch": "^4.3.5", "gulp-watch": "^4.3.5",
"jake": "latest", "jake": "latest",
"mocha-phantomjs": ">=2.0 <3.0",
"path": "^0.12.7", "path": "^0.12.7",
"tmp": "0.0.23", "tmp": "0.0.23",
"uglify-js": "latest",
"wrench": "^1.5.8" "wrench": "^1.5.8"
}, },
"engines" : { "engines" : {

11
resources/gulp/test.js
View File

@@ -1,19 +1,8 @@
var gulp = require('gulp'); var gulp = require('gulp');
var qunit = require('gulp-qunit'); var qunit = require('gulp-qunit');
var mochaPhantomjs = require('gulp-mocha-phantomjs');
var config = require('./config.js'); var config = require('./config.js');
gulp.task('mocha_phantomjs', function () {
return gulp.src('www/scripts/tests/!*.html')
.pipe(mochaPhantomjs({
'reporter': 'dot',
'setting': [
'loadImages=false'
]
}));
});
gulp.task('test-components', function () { gulp.task('test-components', function () {
return gulp.start('test-prod'); return gulp.start('test-prod');
}); });

2
resources/www/_shared/styles/_variables.scss
View File

@@ -1,4 +1,4 @@
$fontAwesomePath: '/assets/common/font' !default; // dist path $FontAwesomePath: '/assets/common/font' !default; // dist path
$iconsPath: '/assets/common/images/icons/' !default; $iconsPath: '/assets/common/images/icons/' !default;
$mainMenuHeight: 40px !default; $mainMenuHeight: 40px !default;

5
resources/www/authentication/styles/main.scss
View File

@@ -1,10 +1,7 @@
// @import '../../account/styles/main';
// @import '../../../../www/bower_components/normalize-css/normalize'; // not extension for inline import
@import '../../_shared/styles/variables'; @import '../../_shared/styles/variables';
@import 'variables'; @import 'variables';
@import '../../vendors/bootstrap/bootstrap'; @import '../../vendors/bootstrap/bootstrap';
@import '../../account/styles/skin'; @import '../../account/styles/skin';
//@import '../../../../plugins/login.scss';
@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss'; @import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss';
@import '../../../../www/bower_components/jquery-ui/themes/base/jquery.ui.autocomplete'; // not extension for inline import @import '../../../../www/bower_components/jquery-ui/themes/base/jquery.ui.autocomplete'; // not extension for inline import