Commit e89066ad authored by  JosephK's avatar JosephK

[WIP] Update + Migration to Bootstrap 4

parent 11541424
......@@ -27,7 +27,7 @@
"html/html-extensions": [".html", ".html.raw"],
"import/resolver": {
"webpack": {
"config": "./config/webpack.config.js"
"config": "./webpack.config.js"
}
}
},
......
......@@ -4,3 +4,5 @@ public/
npm-debug.log
/zanata.xml
pnpm-lock.yaml
tools/backup/
tools/tmp/
image: framasoft/vuefs:latest
stages:
- test
- deploy
test:
stage: test
script:
- npm install -g yaml-lint
- for f in $(find ./app/ -name "*.yml" -type f);do yamllint $f;done;
pages:
stage: deploy
script:
......@@ -36,19 +43,3 @@ production:
- $DEPLOYEMENT_KNOWN_HOSTS
- $DEPLOYEMENT_USER
- $DEPLOYEMENT_HOST
# Push new translations strings to https://trad.framasoft.org
trads:
stage: deploy
image: framasoft/push-trad:latest
script:
- sed -e "s@<project-version>.*</project-version>@<project-version>$CI_COMMIT_REF_SLUG</project-version>@" -i zanata/zanata.xml
- sed -e "s@<project>.*</project>@<project>$CI_PROJECT_NAME</project>@" -i zanata/zanata.xml
- cp -n zanata/zanata.xml zanata.xml
- mkdir -p ${HOME}/.config; echo -e "${ZANATA_CONFIG_FRAMABOT}" > ${HOME}/.config/zanata.ini;
- make push-locales;
only:
refs:
- master
variables:
- $ZANATA_CONFIG_FRAMABOT
puppeteer_skip_chromium_download=true
\ No newline at end of file
......@@ -2,12 +2,3 @@ Le code de la nav est sous double licence,
Creative Commons BY-SA https://creativecommons.org/licenses/by-sa/2.0/
et GNU Free Documentation License https://www.gnu.org/copyleft/fdl.html
Bootstrap est sous licence MIT : https://github.com/twbs/bootstrap
jQuery est sous licence MIT : https://jquery.com/download/
Font-awesome est sous licence SIL OFL 1.1 : https://fortawesome.github.io/Font-Awesome/license/
fquery et fbootstrap sont juste des variantes des fichiers officiels
sur lesquel ont été remplacés :
'jQuery' → 'fQuery'
'$(' → 'f$('
'$.' → 'f$.'
backup-locales:
cp app/locales/*.yml zanata/backup/
mkdir -p tools/backup/
cp -r app/locales/* tools/backup/
restore-locales:
cp zanata/backup/*.yml app/locales/
cp -r tools/backup/* app/locales/
prepare-locales:
rm -f zanata/yml/*.yml zanata/po/*.po zanata/po/*.pot zanata/po/*.err
clean-locales: backup-locales
cd tools && ./cleanyml.sh
clean-locales: backup-locales prepare-locales
zanata/scripts/selfyml2po.sh
zanata/scripts/selfpo2yml.sh
po:
zanata/scripts/yml2po.sh
yml: backup-locales
zanata/scripts/po2yml.sh
push-locales: po
zanata-cli -q -B push --push-type both
pull-locales: prepare-locales
cp zanata/zanata.xml zanata.xml
sed -e 's@<project></project>@<project>$(shell basename $(CURDIR))</project>@' -i zanata.xml
zanata-cli -q -B pull --pull-type both --min-doc-percent 75
make yml
diff-locales:
(meld app/locales/ tools/backup/ &)
preview:
npm run preview
......
<template>
<div id="fnav">
<div id="f-nav" class="f-bs4">
<Nav />
</div>
</template>
......@@ -7,9 +7,14 @@
<script>
import Nav from './components/partials/Nav.vue'
export default {
name: 'fnav',
name: 'f-nav',
components: {
Nav,
}
},
data() {
return {
i18n: process.env.NODE_ENV === 'development' ? this.$i18n.messages : ''
}
},
}
</script>
......@@ -197,8 +197,4 @@
@import "docs";
@import "faq";
@import "participate";
@import "contact";
#framanav_donation {
display: none !important;
}
\ No newline at end of file
@import "contact";
\ No newline at end of file
......@@ -38,12 +38,12 @@
[data-url*="://connard.pro"],
[data-inframe="true"] {
#framafooter,
#framafooter[style] {
display: none !important;
}
#f-footer,
#f-footer[style] {
display: none !important;
}
}
[data-url*="framadate.org/create_"] #framafooter {
[data-url*="framadate.org/create_"] #f-footer {
position: relative !important;
}
}
\ No newline at end of file
@import "bs3/colors";
@import "bs3/links";
// @import "bs3/text";
// @import "bs3/backgrounds";
// @import "bs3/alerts";
// @import "bs3/buttons";
// @import "bs3/carousel";
// @import "bs3/internav";
// @import "bs3/labels";
// @import "bs3/modals";
// @import "bs3/navs";
// @import "bs3/panels";
// @import "bs3/popovers";
@import "bs3/cleaning";
@import "bs3/a11y";
\ No newline at end of file
body {
background: $bgcolor;
font-size:14px;
font-family: "DejaVu Sans", Verdana, Geneva, sans-serif;
color:#333;
}
.container.ombre {
margin-top: 20px;
margin-bottom: 30px;
padding: 20px 30px;
}
h1, h2, h3, h4, h5, h6,
.h1, .h2, .h3, .h4, .h5, .h6 {
font-family: PTSansCaption, GillSans, sans-serif;
font-weight: bold;
color: #616161;
}
h1 {
font-family: "DejaVu Sans",Verdana,Geneva,sans-serif;
font-size: 48px;
}
header .lead, .lead {
font-style:italic;
}
.trait { /* hr */
background-color: #EEE;
height: 11px;
margin: 15px 0px;
border: medium none;
}
.ombre {
background-color: #FFF;
-webkit-box-shadow: $ombre;
-moz-box-shadow: $ombre;
box-shadow: $ombre;
}
.container.ombre {
margin-top: 20px;
margin-bottom: 30px;
padding: 20px 30px;
}
img.ombre {
box-shadow: $img-ombre;
margin:10px;
padding:0;
width:90%;
}
#tuto-faq,
#tuto-video,
#le-logiciel,
#jardin {
p[role="presentation"] {
i, span.glyphicon { /* glyphicon is depreciated */
font-size:50px;
}
}
}
.signature {
font-style: italic;
text-align:right;
color:#795548;
}
\ No newline at end of file
/*!
* Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
// Core variables and mixins
@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables";
@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins";
......
// Core variables and mixins
@import "../../../node_modules/bootstrap/scss/_functions";
@import "../../../node_modules/bootstrap/scss/_variables";
@import "../../../node_modules/bootstrap/scss/_mixins";
// @import "../../../node_modules/bootstrap/scss/_root";
// Reset
// @import "../../../node_modules/bootstrap/scss/_reboot";
// Core CSS
// @import "../../../node_modules/bootstrap/scss/_type";
// @import "../../../node_modules/bootstrap/scss/_images";
// @import "../../../node_modules/bootstrap/scss/_code";
// @import "../../../node_modules/bootstrap/scss/_grid";
// @import "../../../node_modules/bootstrap/scss/_tables";
// @import "../../../node_modules/bootstrap/scss/_forms";
// @import "../../../node_modules/bootstrap/scss/_buttons";
// Components
@import "../../../node_modules/bootstrap/scss/_transitions";
@import "../../../node_modules/bootstrap/scss/_dropdown";
// @import "../../../node_modules/bootstrap/scss/_button-group";
// @import "../../../node_modules/bootstrap/scss/_input-group";
// @import "../../../node_modules/bootstrap/scss/_custom-forms";
// @import "../../../node_modules/bootstrap/scss/_nav";
// @import "../../../node_modules/bootstrap/scss/_navbar";
// @import "../../../node_modules/bootstrap/scss/_card";
// @import "../../../node_modules/bootstrap/scss/_breadcrumb";
// @import "../../../node_modules/bootstrap/scss/_pagination";
// @import "../../../node_modules/bootstrap/scss/_badge";
// @import "../../../node_modules/bootstrap/scss/_jumbotron";
@import "../../../node_modules/bootstrap/scss/_alert";
// @import "../../../node_modules/bootstrap/scss/_progress";
// @import "../../../node_modules/bootstrap/scss/_media";
// @import "../../../node_modules/bootstrap/scss/_list-group";
@import "../../../node_modules/bootstrap/scss/_close";
// Components w/ JavaScript
// @import "../../../node_modules/bootstrap/scss/_toasts";
// @import "../../../node_modules/bootstrap/scss/_modal";
// @import "../../../node_modules/bootstrap/scss/_tooltip";
// @import "../../../node_modules/bootstrap/scss/_popover";
// @import "../../../node_modules/bootstrap/scss/_carousel";
// @import "../../../node_modules/bootstrap/scss/_spinners";
// Utility classes
// @import "../../../node_modules/bootstrap/scss/_utilities";
// @import "../../../node_modules/bootstrap/scss/_print";
// Core variables and mixins
@import "../../../node_modules/bootstrap/scss/_functions";
@import "../../../node_modules/bootstrap/scss/_variables";
@import "../../../node_modules/bootstrap/scss/_mixins";
// @import "../../../node_modules/bootstrap/scss/_root";
// Reset
// @import "../../../node_modules/bootstrap/scss/_reboot";
// Core CSS
@import "../../../node_modules/bootstrap/scss/_type";
// @import "../../../node_modules/bootstrap/scss/_images";
// @import "../../../node_modules/bootstrap/scss/_code";
@import "../../../node_modules/bootstrap/scss/_grid";
// @import "../../../node_modules/bootstrap/scss/_tables";
@import "../../../node_modules/bootstrap/scss/_forms";
@import "../../../node_modules/bootstrap/scss/_buttons";
// Components
@import "../../../node_modules/bootstrap/scss/_transitions";
// @import "../../../node_modules/bootstrap/scss/_dropdown";
// @import "../../../node_modules/bootstrap/scss/_button-group";
@import "../../../node_modules/bootstrap/scss/_input-group";
// @import "../../../node_modules/bootstrap/scss/_custom-forms";
@import "../../../node_modules/bootstrap/scss/_nav";
// @import "../../../node_modules/bootstrap/scss/_navbar";
// @import "../../../node_modules/bootstrap/scss/_card";
// @import "../../../node_modules/bootstrap/scss/_breadcrumb";
// @import "../../../node_modules/bootstrap/scss/_pagination";
// @import "../../../node_modules/bootstrap/scss/_badge";
// @import "../../../node_modules/bootstrap/scss/_jumbotron";
// @import "../../../node_modules/bootstrap/scss/_alert";
// @import "../../../node_modules/bootstrap/scss/_progress";
// @import "../../../node_modules/bootstrap/scss/_media";
// @import "../../../node_modules/bootstrap/scss/_list-group";
// @import "../../../node_modules/bootstrap/scss/_close";
// Components w/ JavaScript
// @import "../../../node_modules/bootstrap/scss/_toasts";
// @import "../../../node_modules/bootstrap/scss/_modal";
@import "../../../node_modules/bootstrap/scss/_tooltip";
@import "../../../node_modules/bootstrap/scss/_popover";
// @import "../../../node_modules/bootstrap/scss/_carousel";
// @import "../../../node_modules/bootstrap/scss/_spinners";
// Utility classes
//@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/utilities";
//@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
// Core variables and mixins
@import "../../../node_modules/bootstrap/scss/_functions";
@import "../../../node_modules/bootstrap/scss/_variables";
@import "../../../node_modules/bootstrap/scss/_mixins";
@import "../../../node_modules/bootstrap/scss/_root";
// Reset
@import "../../../node_modules/bootstrap/scss/_reboot";
// Core CSS
@import "../../../node_modules/bootstrap/scss/_type";
@import "../../../node_modules/bootstrap/scss/_images";
@import "../../../node_modules/bootstrap/scss/_code";
@import "../../../node_modules/bootstrap/scss/_grid";
@import "../../../node_modules/bootstrap/scss/_tables";
@import "../../../node_modules/bootstrap/scss/_forms";
@import "../../../node_modules/bootstrap/scss/_buttons";
// Components
@import "../../../node_modules/bootstrap/scss/_transitions";
@import "../../../node_modules/bootstrap/scss/_dropdown";
@import "../../../node_modules/bootstrap/scss/_button-group";
@import "../../../node_modules/bootstrap/scss/_input-group";
@import "../../../node_modules/bootstrap/scss/_custom-forms";
@import "../../../node_modules/bootstrap/scss/_nav";
@import "../../../node_modules/bootstrap/scss/_navbar";
@import "../../../node_modules/bootstrap/scss/_card";
@import "../../../node_modules/bootstrap/scss/_breadcrumb";
@import "../../../node_modules/bootstrap/scss/_pagination";
@import "../../../node_modules/bootstrap/scss/_badge";
@import "../../../node_modules/bootstrap/scss/_jumbotron";
@import "../../../node_modules/bootstrap/scss/_alert";
@import "../../../node_modules/bootstrap/scss/_progress";
@import "../../../node_modules/bootstrap/scss/_media";
@import "../../../node_modules/bootstrap/scss/_list-group";
@import "../../../node_modules/bootstrap/scss/_close";
// Components w/ JavaScript
@import "../../../node_modules/bootstrap/scss/_toasts";
@import "../../../node_modules/bootstrap/scss/_modal";
@import "../../../node_modules/bootstrap/scss/_tooltip";
@import "../../../node_modules/bootstrap/scss/_popover";
@import "../../../node_modules/bootstrap/scss/_carousel";
@import "../../../node_modules/bootstrap/scss/_spinners";
// Utility classes
@import "../../../node_modules/bootstrap/scss/_utilities";
@import "../../../node_modules/bootstrap/scss/_print";
// Core variables and mixins
@import '../../../node_modules/bootstrap/scss/_functions';
@import '../../../node_modules/bootstrap/scss/_variables';
@import '../../../node_modules/bootstrap/scss/_mixins';
// @import '../../../node_modules/bootstrap/scss/_root';
// Reset
@import '../../../node_modules/bootstrap/scss/_reboot';
// Core CSS
@import '../../../node_modules/bootstrap/scss/_type';
// @import '../../../node_modules/bootstrap/scss/_images';
@import '../../../node_modules/bootstrap/scss/_code';
@import '../../../node_modules/bootstrap/scss/_grid';
// @import '../../../node_modules/bootstrap/scss/_tables';
@import '../../../node_modules/bootstrap/scss/_forms';
@import '../../../node_modules/bootstrap/scss/_buttons';
// Components
@import '../../../node_modules/bootstrap/scss/_transitions';
@import '../../../node_modules/bootstrap/scss/_dropdown';
// @import '../../../node_modules/bootstrap/scss/_button-group';
@import '../../../node_modules/bootstrap/scss/_input-group';
// @import '../../../node_modules/bootstrap/scss/_custom-forms';
@import '../../../node_modules/bootstrap/scss/_nav';
@import '../../../node_modules/bootstrap/scss/_navbar';
@import '../../../node_modules/bootstrap/scss/_card';
// @import '../../../node_modules/bootstrap/scss/_breadcrumb';
// @import '../../../node_modules/bootstrap/scss/_pagination';
// @import '../../../node_modules/bootstrap/scss/_badge';
// @import '../../../node_modules/bootstrap/scss/_jumbotron';
@import '../../../node_modules/bootstrap/scss/_alert';
// @import '../../../node_modules/bootstrap/scss/_progress';
// @import '../../../node_modules/bootstrap/scss/_media';
// @import '../../../node_modules/bootstrap/scss/_list-group';
@import '../../../node_modules/bootstrap/scss/_close';
// Components w/ JavaScript
// @import '../../../node_modules/bootstrap/scss/_toasts';
@import '../../../node_modules/bootstrap/scss/_modal';
@import '../../../node_modules/bootstrap/scss/_tooltip';
@import '../../../node_modules/bootstrap/scss/_popover';
@import '../../../node_modules/bootstrap/scss/_carousel'; /* ~vox ; ~team */
// @import '../../../node_modules/bootstrap/scss/_spinners';
// Utility classes
@import '../../../node_modules/bootstrap/scss/_utilities';
@import '../../../node_modules/bootstrap/scss/_print';
// Core variables and mixins
@import "../../../node_modules/bootstrap/scss/_functions";
@import "../../../node_modules/bootstrap/scss/_variables";
@import "../../../node_modules/bootstrap/scss/_mixins";
// @import "../../../node_modules/bootstrap/scss/_root";
// Reset
@import "../../../node_modules/bootstrap/scss/_reboot";
// Core CSS
@import "../../../node_modules/bootstrap/scss/_type";
// @import "../../../node_modules/bootstrap/scss/_images";
@import "../../../node_modules/bootstrap/scss/_code";
@import "../../../node_modules/bootstrap/scss/_grid";
// @import "../../../node_modules/bootstrap/scss/_tables";
// @import "../../../node_modules/bootstrap/scss/_forms";
@import "../../../node_modules/bootstrap/scss/_buttons";
// Components
@import "../../../node_modules/bootstrap/scss/_transitions";
// @import "../../../node_modules/bootstrap/scss/_dropdown";
// @import "../../../node_modules/bootstrap/scss/_button-group";
// @import "../../../node_modules/bootstrap/scss/_input-group";
// @import "../../../node_modules/bootstrap/scss/_custom-forms";
// @import "../../../node_modules/bootstrap/scss/_nav";
// @import "../../../node_modules/bootstrap/scss/_navbar";
// @import "../../../node_modules/bootstrap/scss/_card";
// @import "../../../node_modules/bootstrap/scss/_breadcrumb";
// @import "../../../node_modules/bootstrap/scss/_pagination";
// @import "../../../node_modules/bootstrap/scss/_badge";
// @import "../../../node_modules/bootstrap/scss/_jumbotron";
// @import "../../../node_modules/bootstrap/scss/_alert";
// @import "../../../node_modules/bootstrap/scss/_progress";
// @import "../../../node_modules/bootstrap/scss/_media";
// @import "../../../node_modules/bootstrap/scss/_list-group";
// @import "../../../node_modules/bootstrap/scss/_close";
// Components w/ JavaScript
// @import "../../../node_modules/bootstrap/scss/_toasts";
// @import "../../../node_modules/bootstrap/scss/_modal";
// @import "../../../node_modules/bootstrap/scss/_tooltip";
// @import "../../../node_modules/bootstrap/scss/_popover";
@import "../../../node_modules/bootstrap/scss/_carousel";
// @import "../../../node_modules/bootstrap/scss/_spinners";
// Utility classes
@import "../../../node_modules/bootstrap/scss/_utilities";
@import "../../../node_modules/bootstrap/scss/_print";
// Core variables and mixins
@import "../../../node_modules/bootstrap/scss/_functions";
@import "../../../node_modules/bootstrap/scss/_variables";
@import "../../../node_modules/bootstrap/scss/_mixins";
// @import "../../../node_modules/bootstrap/scss/_root";
// Reset
@import "../../../node_modules/bootstrap/scss/_reboot";
// Core CSS
@import "../../../node_modules/bootstrap/scss/_type";
// @import "../../../node_modules/bootstrap/scss/_images";
@import "../../../node_modules/bootstrap/scss/_code";
@import "../../../node_modules/bootstrap/scss/_grid";
// @import "../../../node_modules/bootstrap/scss/_tables";
// @import "../../../node_modules/bootstrap/scss/_forms";
@import "../../../node_modules/bootstrap/scss/_buttons";
// Components
@import "../../../node_modules/bootstrap/scss/_transitions";
@import "../../../node_modules/bootstrap/scss/_dropdown";
// @import "../../../node_modules/bootstrap/scss/_button-group";
// @import "../../../node_modules/bootstrap/scss/_input-group";
// @import "../../../node_modules/bootstrap/scss/_custom-forms";
// @import "../../../node_modules/bootstrap/scss/_nav";
// @import "../../../node_modules/bootstrap/scss/_navbar";
// @import "../../../node_modules/bootstrap/scss/_card";
// @import "../../../node_modules/bootstrap/scss/_breadcrumb";
// @import "../../../node_modules/bootstrap/scss/_pagination";
// @import "../../../node_modules/bootstrap/scss/_badge";
// @import "../../../node_modules/bootstrap/scss/_jumbotron";
// @import "../../../node_modules/bootstrap/scss/_alert";
// @import "../../../node_modules/bootstrap/scss/_progress";
// @import "../../../node_modules/bootstrap/scss/_media";
// @import "../../../node_modules/bootstrap/scss/_list-group";
// @import "../../../node_modules/bootstrap/scss/_close";
// Components w/ JavaScript
// @import "../../../node_modules/bootstrap/scss/_toasts";
// @import "../../../node_modules/bootstrap/scss/_modal";
// @import "../../../node_modules/bootstrap/scss/_tooltip";
// @import "../../../node_modules/bootstrap/scss/_popover";
// @import "../../../node_modules/bootstrap/scss/_carousel";
// @import "../../../node_modules/bootstrap/scss/_spinners";
// Utility classes
// @import "../../../node_modules/bootstrap/scss/_utilities";
// @import "../../../node_modules/bootstrap/scss/_print";
\ No newline at end of file
@import "frama/colors";
@import "frama/links";
@import "frama/text";
@import "frama/backgrounds";
@import "frama/alerts";
@import "frama/buttons";
@import "frama/carousel";
@import "frama/internav";
@import "frama/labels";
@import "frama/modals";
@import "frama/navs";
@import "frama/panels";
@import "frama/popovers";
@import "frama/cleaning";
@import "frama/a11y";
/* Variables */
$bgcolor: #eee;
$violet: #6a5687;
......@@ -13,120 +14,45 @@ $img-ombre: 0px 2px 6px rgba(50, 50, 50, 0.4);
$carousel-ombre: 0px 3px 3px rgba(50, 50, 50, 0.5);
$button-ombre: 0px 1px 1px rgba(50, 50, 50, 0.5);
@import "../fonts/ptsans_caption";
/* Frameworks */
// @import 'frameworks/bootstrap3';
// @import 'frameworks/bootstrap4';
body {
background: $bgcolor;
font-size:14px;
}
/* Fonts */
@import '../../../node_modules/fork-awesome/css/fork-awesome.min.css';
@import 'fonts/ptsans_caption';
h1 {
font-family: "DejaVu Sans",Verdana,Geneva,sans-serif;
font-size: 48px;
font-weight: bold;
}
/* Frama */
// @import 'frama/bs3';
// @import 'frama/common';
.lead {
font-style:italic;
}
.container.ombre {
margin-top: 20px;
margin-bottom: 30px;
padding: 20px 30px;
}
#tuto-faq,
#tuto-video,
#le-logiciel,
#jardin {
p[role="presentation"] {
i, span.glyphicon { /* glyphicon is depreciated */
font-size:50px;
}
}
}
body {
font-family: "DejaVu Sans", Verdana, Geneva, sans-serif;
color:#333;
}
h1, h2, h3, h4, h5, h6,
.h1, .h2, .h3, .h4, .h5, .h6 {
font-family: PTSansCaption, GillSans, sans-serif;
font-weight: bold;
color: #616161;
}
h1 {font-family: "DejaVu Sans", Verdana, Geneva, sans-serif; font-weight:bold; }
header .lead {
font-style:italic;
}
.trait { /* hr */
background-color: #EEE;
height: 11px;
margin: 15px 0px;
border: medium none;
}
.ombre {
background-color: #FFF;
-webkit-box-shadow: $ombre;
-moz-box-shadow: $ombre;
box-shadow: $ombre;
}