diff --git a/.gitignore b/.gitignore index 8d4ae25..7bf6eb1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bower_components +node_modules diff --git a/css/.gitignore b/css/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/css/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/css/style.css b/css/style.css deleted file mode 100644 index 07a746f..0000000 --- a/css/style.css +++ /dev/null @@ -1,44 +0,0 @@ -body { - display: flex; - min-height: 100vh; - flex-direction: column; -} - -#main { - flex: 1 0 auto; -} - -nav i.material-icons { - display: inline; - font-size: 1rem; -} - -nav .tabs .tab a { - color: white; -} - -nav .tabs .indicator { - background-color: #fff59d; -} - -#toast-container { - top: inherit; - bottom: 10%; -} - -#toast a { - text-transform: uppercase; -} - -#grilleBieres a { - width: 90%; - padding: 25px; - height: 100px; - font-size: 3em; -} - -footer.page-footer { - margin-top: 0; - padding-top: 0; -} - diff --git a/gulpfile.js b/gulpfile.js new file mode 100644 index 0000000..b3bf3db --- /dev/null +++ b/gulpfile.js @@ -0,0 +1,39 @@ +var gulp = require('gulp'); +// var source = require('vinyl-source-stream'); +// var buffer = require('vinyl-buffer'); +var gutil = require('gulp-util'); +// var uglify = require('gulp-uglify'); +// var sourcemaps = require('gulp-sourcemaps'); +// var reactify = require('reactify'); +var sass = require('gulp-sass'); +// var fs = require('fs-extra'); +var exec = require('child_process').exec; +var path = require('path'); +// var install = require("gulp-install"); + +gulp.task('style', function() { + gulp.src('./scss/style.scss') + .pipe(sass().on('error', sass.logError)) + .pipe(gulp.dest('./css'));; +}); + +gulp.task('style:watch', function() { + gulp.watch('./scss/style.scss', ['style']); +}); + +gulp.task('clean', function() { + fs.removeSync(__dirname+'/bower_components'); + fs.removeSync(__dirname+'/lib'); +}); + +gulp.task('install', function() { + // gulp.src(['./bower.json', './package.json']) // FIXME Doesn't work + // .pipe(install()); +}); + +gulp.task('bootstrap', ['install', 'style']); + +gulp.task('watch', ['bootstrap', 'style:watch']); + +gulp.task('default', ['watch']); + diff --git a/index.html b/index.html index 66dc76e..054fa56 100644 --- a/index.html +++ b/index.html @@ -7,8 +7,6 @@ 10⁵ - - diff --git a/package.json b/package.json new file mode 100644 index 0000000..3617325 --- /dev/null +++ b/package.json @@ -0,0 +1,23 @@ +{ + "name": "10p5-server", + "version": "0.0.0", + "description": "Client web pour le système de paiment de 10⁵", + "main": "gulpfile.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/GeoffreyFrogeye/10p5-server.git" + }, + "author": "Le Club Info Polytech Lille ", + "license": "UNLICENSED", + "bugs": { + "url": "https://github.com/GeoffreyFrogeye/10p5-server/issues" + }, + "homepage": "https://github.com/GeoffreyFrogeye/10p5-server#readme", + "devDependencies": { + "gulp": "^3.9.1", + "gulp-sass": "^2.3.1" + } +} diff --git a/scss/style.scss b/scss/style.scss new file mode 100644 index 0000000..4a2112f --- /dev/null +++ b/scss/style.scss @@ -0,0 +1,66 @@ +@charset "UTF-8"; + +// Importation des Mixins de Materialize +@import "../lib/Materialize/sass/components/mixins"; +@import "../lib/Materialize/sass/components/color"; + +// Définition de la couleur principale de Materialize +$primary-color: color("red", "lighten-2") !default; +$primary-color-light: lighten($primary-color, 15%) !default; +$primary-color-dark: darken($primary-color, 15%) !default; + +$secondary-color: color("indigo", "lighten-1") !default; +$success-color: color("green", "base") !default; +$error-color: color("pink", "base") !default; +$link-color: color("blue", "darken-1") !default; + +// Import du reste de Materialize +@import "../lib/Materialize/sass/materialize.scss"; + +// Import des icônes Material Design +@import "../lib/material-design-icons/iconfont/material-icons.css"; + +body { + display: flex; + min-height: 100vh; + flex-direction: column; +} + +#main { + flex: 1 0 auto; +} + +nav i.material-icons { + display: inline; + font-size: 1rem; +} + +nav .tabs .tab a { + color: white; +} + +nav .tabs .indicator { + background-color: #fff59d; +} + +#toast-container { + top: inherit; + bottom: 10%; +} + +#toast a { + text-transform: uppercase; +} + +#grilleBieres a { + width: 90%; + padding: 25px; + height: 100px; + font-size: 3em; +} + +footer.page-footer { + margin-top: 0; + padding-top: 0; +} + -- libgit2 0.21.2