mise à jours de gulp

This commit is contained in:
armansansd 2021-09-15 11:27:17 +02:00
parent f24ba9e0db
commit 7c78fb39f4
20 changed files with 38094 additions and 15884 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,11 +0,0 @@
@media (min-width: 48rem) {
:root {
font-size: calc(1rem + ((1vw - .48rem) * 1.389));
/* .48rem = viewportWidthMinimum /100 */
/* 1.389rem = 100 * fontSizeDifference / viewportWidthDifference */ } }
@media (min-width: 120em) {
:root {
font-size: 2rem; } }
/*# sourceMappingURL=variables.css.map */

View File

@ -1 +0,0 @@
{"version":3,"file":"variables.css","sources":["setup/variables.scss"],"sourcesContent":["$font-extra: 2rem;\n$font-big: 1.2rem;\n$font-medium: .8rem;\n$font-normal: .6rem;\n@media (min-width: 48rem) {\n\t:root {\n\t font-size: calc(1rem + ((1vw - .48rem) * 1.389));\n\t /* .48rem = viewportWidthMinimum /100 */\n\t /* 1.389rem = 100 * fontSizeDifference / viewportWidthDifference */\n\t}\n }\n \n @media (min-width: 120em) {\n\t:root {\n\t font-size: 2rem;\n\t}\n }"],"mappings":"AAIA,MAAM,EAAL,SAAS,EAAE,KAAK;EAChB,AAAA,KAAK,CAAC;IACJ,SAAS,EAAE,qCAAI;IACf,wCAAwC;IACxC,mEAAmE,EACpE;;AAGA,MAAM,EAAL,SAAS,EAAE,KAAK;EAClB,AAAA,KAAK,CAAC;IACJ,SAAS,EAAE,IAAK,GACjB","names":[]}

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -1,51 +1,39 @@
const {
src,
dest,
parallel,
series,
watch
} = require('gulp');
var gulp = require('gulp');
var livereload = require('gulp-livereload')
var uglify = require('gulp-uglifyjs');
var sass = require('gulp-sass');
var autoprefixer = require('gulp-autoprefixer');
var sourcemaps = require('gulp-sourcemaps');
var imagemin = require('gulp-imagemin');
var pngquant = require('imagemin-pngquant');
const uglify = require('gulp-uglify');
const rename = require('gulp-rename');
const sass = require('gulp-sass')(require('sass'));
const autoprefixer = require('gulp-autoprefixer');
const cssnano = require('gulp-cssnano');
const concat = require('gulp-concat');
const clean = require('gulp-clean');
//const imagemin = require('gulp-imagemin');
const changed = require('gulp-changed');
const browsersync = require('browser-sync').create();
const webpack = require('webpack');
const webpackStream = require('webpack-stream');
const compiler = require('webpack')
gulp.task('imagemin', function () {
return gulp.src('./images/*')
.pipe(imagemin({
progressive: true,
svgoPlugins: [{removeViewBox: false}],
use: [pngquant()]
}))
.pipe(gulp.dest('./images'));
});
function clear() {
return src('./assets/*', {
read: false
})
.pipe(clean());
}
// JS function
gulp.task('sass', function () {
gulp.src('./sass/**/*.scss')
.pipe(sourcemaps.init())
.pipe(sass({
//outputStyle: 'compressed',
includePaths: ['node_modules/foundation-sites/scss']
}).on('error', sass.logError))
.pipe(sourcemaps.write('./'))
.pipe(gulp.dest('./css'));
});
/*gulp.task('uglify', function() {
gulp.src('./lib/*.js')
.pipe(uglify('main.js'))
.pipe(gulp.dest('./js'))
});*/
gulp.task('packing', function () {
return gulp
.src('./lib/*.js')
function js() {
const source = './lib/*.js';
return src(source)
.pipe(webpackStream({
mode: "production",
plugins: [
@ -70,16 +58,36 @@ gulp.task('packing', function () {
}
))
.pipe(gulp.dest('js/'));
});
.pipe(dest('./assets/js/'));
}
// CSS function
gulp.task('watch', function(){
livereload.listen();
function css() {
const source = './sass/**/*.scss';
gulp.watch('./sass/**/**/*.scss', ['sass']);
gulp.watch('./lib/*.js', ['packing']);
gulp.watch(['./css/style.css', './**/*.twig', './js/*.js'], function (files){
livereload.changed(files)
});
});
return src(source)
.pipe(changed(source))
.pipe(sass({
outputStyle: 'compressed',
includePaths: ['./node_modules/foundation-sites/scss']}
))
.pipe(autoprefixer({
overrideBrowserslist: ['last 2 versions', 'ie >= 9', 'android >= 4.4', 'ios >= 7'],
cascade: false
}))
.pipe(rename({
extname: '.min.css'
}))
.pipe(cssnano())
.pipe(dest('./assets/css/'))
.pipe(browsersync.stream());
}
function watchFiles() {
watch('./sass/**/**/*.scss', css);
watch('./lib/*.js', js);
}
exports.default = series(clear, parallel(js, css));
exports.watch = parallel(watchFiles);

View File

@ -8,7 +8,7 @@ $(function(){
if( navigator.userAgent.match(/Android/i) || navigator.userAgent.match(/webOS/i) || navigator.userAgent.match(/iPhone/i) || navigator.userAgent.match(/iPad/i) || navigator.userAgent.match(/iPod/i) || navigator.userAgent.match(/BlackBerry/i)){
mobile = true;
}
}
if($(".path-frontpage").length > 0){

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -4,24 +4,33 @@
"description": "Gulp dependencies for Popsu d9",
"main": "gulpfile.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
"test": ""
},
"author": "Armansansd",
"license": "GPL",
"author": "",
"license": "ISC",
"devDependencies": {
"css-loader": "^5.2.6",
"foundation-sites": "^6.6.3",
"gulp": "^3.9.0",
"gulp-autoprefixer": "^3.0.2",
"gulp-imagemin": "^2.3.0",
"gulp-livereload": "^3.8.0",
"gulp-sass": "^2.0.4",
"gulp-sourcemaps": "^1.5.2",
"gulp-uglifyjs": "^0.6.2",
"imagemin-pngquant": "^4.2.0",
"browser-sync": "^2.27.5",
"foundation-sites": "^6.7.2",
"glob-parent": "^5.1.2",
"gulp": "^4.0.2",
"gulp-autoprefixer": "^8.0.0",
"gulp-changed": "^4.0.3",
"gulp-clean": "^0.4.0",
"gulp-cli": "^2.3.0",
"gulp-concat": "^2.6.1",
"gulp-cssnano": "^2.1.3",
"gulp-imagemin": "^8.0.0",
"gulp-rename": "^2.0.0",
"gulp-sass": "^5.0.0",
"gulp-uglify": "^3.0.2",
"lodash": "^4.17.21",
"minimatch": "^3.0.2",
"node": "^16.9.1",
"sass": "^1.40.1",
"sass-migrator": "^1.5.2",
"slick-carousel": "^1.8.1",
"style-loader": "^2.0.0",
"webpack": "^5.38.1",
"webpack-stream": "^6.1.2"
"webpack": "^5.52.1",
"webpack-stream": "^7.0.0",
"yargs-parser": "^18.1.1"
}
}

View File

@ -1,9 +1,9 @@
global-css:
css:
theme:
css/styles.css: {}
assets/css/styles.min.css: {}
global-js:
js:
js/main.js: {}
assets/js/main.js: {}
dependencies:
- core/jquery

View File

@ -277,7 +277,7 @@
height: 7rem;
position: relative;
// background: red;
background: center / contain no-repeat url(../images/popsu-home-logo.png);
background: center / contain no-repeat url(../../images/popsu-home-logo.png);
margin: -9% 0 3rem 0 !important;
@include breakpoint(small down) {
margin: -20% 0 3rem 0 !important;

View File

@ -159,7 +159,7 @@
}
}
.main_logo{
background: center / contain no-repeat url(../images/POPSU_1.svg);
background: center / contain no-repeat url(../../images/POPSU_1.svg);
}
}
&.programme-2{
@ -169,7 +169,7 @@
}
}
.main_logo{
background: center / contain no-repeat url(../images/POPSU_2.svg);
background: center / contain no-repeat url(../../images/POPSU_2.svg);
}
}
&.programme-3{
@ -180,7 +180,7 @@
}
.main_logo{
background: center / contain no-repeat url(../images/POPSU_Europe.svg);
background: center / contain no-repeat url(../../images/POPSU_Europe.svg);
}
}
&.programme-4{
@ -191,7 +191,7 @@
}
.main_logo{
background: center / contain no-repeat url(../images/POPSU_logo.svg);
background: center / contain no-repeat url(../../images/POPSU_logo.svg);
}
}
&.programme-5{
@ -202,7 +202,7 @@
}
.main_logo{
background: center / contain no-repeat url(../images/POPSU_monde.svg);
background: center / contain no-repeat url(../../images/POPSU_monde.svg);
}
}
&.programme-6{
@ -213,7 +213,7 @@
}
.main_logo{
background: center / contain no-repeat url(../images/POPSU_territoires.svg);
background: center / contain no-repeat url(../../images/POPSU_territoires.svg);
}
}
&.programme-7{
@ -224,7 +224,7 @@
}
.main_logo{
background: center / contain no-repeat url(../images/POPSU_metropoles.svg);
background: center / contain no-repeat url(../../images/POPSU_metropoles.svg);
}
}
.layout-content{

View File

@ -154,7 +154,7 @@
display: block;
font-size: 0;
color: transparent;
background: left / contain no-repeat url(../images/POPSU_logo.svg);
background: left / contain no-repeat url(../../images/POPSU_logo.svg);
}
}
@ -348,14 +348,14 @@ footer{
display: block;
color: transparent;
font-size: 0;
background: left / contain no-repeat url(../images/gouv.svg);
background: left / contain no-repeat url(../../images/gouv.svg);
}
.logo-puca{
height: 100%;
display: block;
color: transparent;
font-size: 0;
background: left / contain no-repeat url(../images/puca.svg);
background: left / contain no-repeat url(../../images/puca.svg);
margin-top: .5rem;
}
@ -390,21 +390,21 @@ footer{
display: block;
font-size: 0;
color: transparent;
background: left / contain no-repeat url(../images/tw.svg);
background: left / contain no-repeat url(../../images/tw.svg);
}
a[href*='linkedin']{
height: 100%;
display: block;
font-size: 0;
color: transparent;
background: left / contain no-repeat url(../images/ln.svg);
background: left / contain no-repeat url(../../images/ln.svg);
}
a[href*='youtube']{
height: 100%;
display: block;
font-size: 0;
color: transparent;
background: left / contain no-repeat url(../images/yt.svg);
background: left / contain no-repeat url(../../images/yt.svg);
}
}
}

View File

@ -1,6 +1,6 @@
@font-face {
font-family: 'duke';
src: url('../fonts/Duke_Fill.otf') format('opentype');
src: url('../../fonts/Duke_Fill.otf') format('opentype');
font-weight: 400;
font-style: normal;
}
@ -9,8 +9,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenobd-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenobd-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenobd-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenobd-webfont.woff') format('woff');
font-weight: 600;
font-style: normal;
@ -21,8 +21,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenobdit-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenobdit-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenobdit-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenobdit-webfont.woff') format('woff');
font-weight: 600;
font-style: italic;
@ -33,8 +33,8 @@
@font-face {
font-family: 'trueno_outline';
src: url('../fonts/trueno/truenobdol-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenobdol-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenobdol-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenobdol-webfont.woff') format('woff');
font-weight: 600;
font-style: normal;
@ -45,8 +45,8 @@
@font-face {
font-family: 'trueno_outline';
src: url('../fonts/trueno/truenobdolit-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenobdolit-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenobdolit-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenobdolit-webfont.woff') format('woff');
font-weight: 600;
font-style: italic;
@ -57,8 +57,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenoblk-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoblk-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoblk-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoblk-webfont.woff') format('woff');
font-weight: 800;
font-style: normal;
@ -69,8 +69,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenoblkit-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoblkit-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoblkit-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoblkit-webfont.woff') format('woff');
font-weight: 800;
font-style: italic;
@ -81,8 +81,8 @@
@font-face {
font-family: 'trueno_outline';
src: url('../fonts/trueno/truenoblkol-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoblkol-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoblkol-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoblkol-webfont.woff') format('woff');
font-weight: 800;
font-style: normal;
@ -93,8 +93,8 @@
@font-face {
font-family: 'trueno_outline';
src: url('../fonts/trueno/truenoblkolit-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoblkolit-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoblkolit-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoblkolit-webfont.woff') format('woff');
font-weight: 800;
font-style: italic;
@ -105,8 +105,8 @@
@font-face {
font-family: 'truenoextrabold';
src: url('../fonts/trueno/truenoexbd-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoexbd-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoexbd-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoexbd-webfont.woff') format('woff');
font-weight: 900;
font-style: normal;
@ -117,8 +117,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenoexbdit-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoexbdit-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoexbdit-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoexbdit-webfont.woff') format('woff');
font-weight: 900;
font-style: italic;
@ -129,8 +129,8 @@
@font-face {
font-family: 'trueno_outline';
src: url('../fonts/trueno/truenoexbdol-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoexbdol-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoexbdol-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoexbdol-webfont.woff') format('woff');
font-weight: 900;
font-style: normal;
@ -139,8 +139,8 @@
@font-face {
font-family: 'trueno_outline';
src: url('../fonts/trueno/truenoexbdolit-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoexbdolit-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoexbdolit-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoexbdolit-webfont.woff') format('woff');
font-weight: 900;
font-style: italic;
@ -149,8 +149,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenolt-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenolt-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenolt-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenolt-webfont.woff') format('woff');
font-weight: 300;
font-style: normal;
@ -161,8 +161,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenoltit-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoltit-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoltit-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoltit-webfont.woff') format('woff');
font-weight: 300;
font-style: italic;
@ -173,8 +173,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenorg-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenorg-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenorg-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenorg-webfont.woff') format('woff');
font-weight: 400;
font-style: normal;
@ -185,8 +185,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenorgit-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenorgit-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenorgit-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenorgit-webfont.woff') format('woff');
font-weight: 400;
font-style: italic;
@ -197,8 +197,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenosbd-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenosbd-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenosbd-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenosbd-webfont.woff') format('woff');
font-weight: 500;
font-style: normal;
@ -209,8 +209,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenosbdit-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenosbdit-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenosbdit-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenosbdit-webfont.woff') format('woff');
font-weight: 500;
font-style: italic;
@ -221,8 +221,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenoultblk-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoultblk-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoultblk-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoultblk-webfont.woff') format('woff');
font-weight: 1000;
font-style: normal;
@ -233,8 +233,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenoultblkit-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoultblkit-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoultblkit-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoultblkit-webfont.woff') format('woff');
font-weight: 1000;
font-style: italic;
@ -245,8 +245,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenoultlt-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoultlt-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoultlt-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoultlt-webfont.woff') format('woff');
font-weight: 100;
font-style: normal;
@ -257,8 +257,8 @@
@font-face {
font-family: 'trueno';
src: url('../fonts/trueno/truenoultltit-webfont.woff2') format('woff2'),
url('../fonts/trueno/truenoultltit-webfont.woff') format('woff');
src: url('../../fonts/trueno/truenoultltit-webfont.woff2') format('woff2'),
url('../../fonts/trueno/truenoultltit-webfont.woff') format('woff');
font-weight: 100;
font-style: italic;

View File

@ -104,9 +104,9 @@ iframe{
.slick-arrow{
font-size: 0;
background: center / 40% no-repeat url(../images/fleche.svg);
background: center / 40% no-repeat url(../../images/fleche.svg);
@include breakpoint(small down) {
background: center / 100% no-repeat url(../images/fleche.svg);
background: center / 100% no-repeat url(../../images/fleche.svg);
}
}

View File

@ -463,7 +463,7 @@ $input-background-focus: $white;
$input-background-disabled: $light-gray;
$input-border: 1px solid $medium-gray;
$input-border-focus: 1px solid $dark-gray;
$input-padding: $form-spacing / 2;
$input-padding: $form-spacing * 0.5;
$input-shadow: inset 0 1px 2px rgba($black, 0.1);
$input-shadow-focus: 0 0 5px $medium-gray;
$input-cursor-disabled: not-allowed;
@ -809,7 +809,7 @@ $table-row-stripe-hover: darken($table-background, $table-color-scale + $table-h
$table-is-striped: true;
$table-striped-background: smart-scale($table-background, $table-color-scale);
$table-stripe: even;
$table-head-background: smart-scale($table-background, $table-color-scale / 2);
$table-head-background: smart-scale($table-background, $table-color-scale * 0.5);
$table-head-row-hover: darken($table-head-background, $table-hover-scale);
$table-foot-background: smart-scale($table-background, $table-color-scale);
$table-foot-row-hover: darken($table-foot-background, $table-hover-scale);

View File

@ -14,7 +14,7 @@ $col-1: #61ab32;
$bck-col: #eff2f9;
$lightblue: #98d0d9;
$trame: center/80% linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,.5)), url(../images/motif_croix.svg) ;
$trame: center/80% linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,.5)), url(../../images/motif_croix.svg) ;
@media (min-width: 48rem) {