From d85e8a7343c78755d2605a541a3bbdf4313fa9ab Mon Sep 17 00:00:00 2001 From: JosephK Date: Thu, 13 Sep 2018 15:08:13 +0200 Subject: [PATCH] Update from VueFS --- app/App.vue | 1 + app/assets/scss/bootstrap.scss | 56 ++ app/assets/scss/frama/a11y.scss | 41 ++ app/assets/scss/frama/alerts.scss | 28 + app/assets/scss/frama/backgrounds.scss | 19 + app/assets/scss/frama/buttons.scss | 285 ++++++++ app/assets/scss/frama/carousel.scss | 89 +++ app/assets/scss/frama/cleaning.scss | 18 + app/assets/scss/frama/colors.scss | 207 ++++++ app/assets/scss/frama/internav.scss | 22 + app/assets/scss/frama/labels.scss | 32 + app/assets/scss/frama/links.scss | 17 + app/assets/scss/frama/modals.scss | 4 + app/assets/scss/frama/navs.scss | 6 + app/assets/scss/frama/panels.scss | 29 + app/assets/scss/frama/popovers.scss | 14 + app/assets/scss/frama/text.scss | 68 ++ app/assets/scss/main.scss | 957 +------------------------ app/components/pages/Home.vue | 73 +- app/components/partials/Header.vue | 4 +- app/components/partials/I18n.vue | 9 +- app/data.yml | 48 +- app/index.js | 10 +- app/locales/en.yml | 64 +- app/locales/fr.yml | 67 +- app/locales/it.yml | 64 +- package-lock.json | 6 +- package.json | 2 +- 28 files changed, 1112 insertions(+), 1128 deletions(-) create mode 100644 app/assets/scss/bootstrap.scss create mode 100644 app/assets/scss/frama/a11y.scss create mode 100644 app/assets/scss/frama/alerts.scss create mode 100644 app/assets/scss/frama/backgrounds.scss create mode 100644 app/assets/scss/frama/buttons.scss create mode 100644 app/assets/scss/frama/carousel.scss create mode 100644 app/assets/scss/frama/cleaning.scss create mode 100644 app/assets/scss/frama/colors.scss create mode 100644 app/assets/scss/frama/internav.scss create mode 100644 app/assets/scss/frama/labels.scss create mode 100644 app/assets/scss/frama/links.scss create mode 100644 app/assets/scss/frama/modals.scss create mode 100644 app/assets/scss/frama/navs.scss create mode 100644 app/assets/scss/frama/panels.scss create mode 100644 app/assets/scss/frama/popovers.scss create mode 100644 app/assets/scss/frama/text.scss diff --git a/app/App.vue b/app/App.vue index 29fc316..1f6151b 100644 --- a/app/App.vue +++ b/app/App.vue @@ -2,6 +2,7 @@
diff --git a/app/assets/scss/bootstrap.scss b/app/assets/scss/bootstrap.scss new file mode 100644 index 0000000..f3a6fca --- /dev/null +++ b/app/assets/scss/bootstrap.scss @@ -0,0 +1,56 @@ +/*! + * 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"; + +// Reset and dependencies +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/normalize"; +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/print"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/glyphicons"; + +// Core CSS +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/scaffolding"; +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/type"; +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/code"; +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/grid"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/tables"; +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/forms"; +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/buttons"; + +// Components +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/component-animations"; +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/dropdowns"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/button-groups"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/input-groups"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/navs"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/navbar"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/pagination"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/pager"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/labels"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/badges"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/jumbotron"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/thumbnails"; +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/alerts"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/progress-bars"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/media"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/list-group"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/panels"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed"; +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/wells"; +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/close"; + +// Components w/ JavaScript +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/modals"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/popovers"; +// @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/carousel"; + +// Utility classes +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/utilities"; +@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities"; diff --git a/app/assets/scss/frama/a11y.scss b/app/assets/scss/frama/a11y.scss new file mode 100644 index 0000000..115b2de --- /dev/null +++ b/app/assets/scss/frama/a11y.scss @@ -0,0 +1,41 @@ +/* a11y (https://github.com/paypal/bootstrap-accessibility-plugin) */ +.btn:focus, +.btn.active:focus { + outline: dotted 1px black; +} + +.btn-primary:focus, +.btn-primary.active:focus, +.btn-success:focus, +.btn-success.active:focus, +.btn-info:focus, +.btn-info.active:focus, +.btn-warning:focus, +.btn-warning.active:focus, +.btn-danger:focus, +.btn-danger.active:focus, +.btn-soutenir:focus, +.btn-soutenir.active:focus { + outline: dotted 1px white; +} + +a:focus { + outline: dotted 1px black; +} + +.bg-primary a:focus, +a.bg-primary:focus { + outline: dotted 1px white; +} + +.close:hover, .close:focus { + outline: dotted 1px black; +} + +.nav > li > a:focus { + outline: dotted 1px black; +} + +cite { + font-style:italic; +} diff --git a/app/assets/scss/frama/alerts.scss b/app/assets/scss/frama/alerts.scss new file mode 100644 index 0000000..fc40821 --- /dev/null +++ b/app/assets/scss/frama/alerts.scss @@ -0,0 +1,28 @@ +.alert-success a:not(.btn), +.alert-success a:hover:not(.btn), +.alert-success { + color: #304219; + background:#E3EBC7; + border-color: #C0D481; +} +.alert-info a:not(.btn), +.alert-info a:hover:not(.btn), +.alert-info { + color: #0C5B7A; + background-color: #E1F8FC; + border-color: #B2D5DB; +} +.alert-warning a:not(.btn), +.alert-danger a:hover:not(.btn), +.alert-warning { + color: #A15014 !important; + background-color: #FFEBB5; + border-color: #FFCF4F; +} +.alert-danger a:not(.btn), +.alert-danger a:hover:not(.btn), +.alert-danger { + color: #AB2909 !important; + background-color: #fde0dc; + border-color: #E0B3A8; +} diff --git a/app/assets/scss/frama/backgrounds.scss b/app/assets/scss/frama/backgrounds.scss new file mode 100644 index 0000000..dde6bb2 --- /dev/null +++ b/app/assets/scss/frama/backgrounds.scss @@ -0,0 +1,19 @@ +.bg-primary, +.bg-primary a:not(.btn), +a.bg-primary:focus:not(.btn), +a.bg-primary:hover:not(.btn) { + color: #fff; + background-color: #6A5687; +} +.bg-success, a.bg-success:hover:not(.btn) { + background-color: #E3EBC7; +} +.bg-info, a.bg-info:hover:not(.btn) { + background-color: #E1F8FC; +} +.bg-warning, a.bg-warning:hover:not(.btn) { + background-color: #FFEBB5; +} +.bg-danger,a.bg-danger:hover:not(.btn) { + background-color: #fde0dc; +} diff --git a/app/assets/scss/frama/buttons.scss b/app/assets/scss/frama/buttons.scss new file mode 100644 index 0000000..a172046 --- /dev/null +++ b/app/assets/scss/frama/buttons.scss @@ -0,0 +1,285 @@ +.btn-default { + color: #333; + background-color: #fff; + border-color: #bdbdbd; +} +.btn-default:hover, +.btn-default:focus, +.btn-default:active, +.btn-default.active, +.open > .dropdown-toggle.btn-default { + color: #333; + background-color: #e0e0e0; + border-color: #949494; +} +.btn-default.disabled, +.btn-default[disabled], +fieldset[disabled] .btn-default, +.btn-default.disabled:hover, +.btn-default[disabled]:hover, +fieldset[disabled] .btn-default:hover, +.btn-default.disabled:focus, +.btn-default[disabled]:focus, +fieldset[disabled] .btn-default:focus, +.btn-default.disabled:active, +.btn-default[disabled]:active, +fieldset[disabled] .btn-default:active, +.btn-default.disabled.active, +.btn-default[disabled].active, +fieldset[disabled] .btn-default.active { + background-color: #fff; + border-color: #bdbdbd; +} +.btn-default .badge { + color: #fff; + background-color: #757575; +} +.btn-primary { + color: #fff; + text-shadow: 0 0 3px rgba(0, 0, 0, 0.7); + background-color: #6A5687; + border-color: #6A5687; +} +.btn-primary:hover, +.btn-primary:focus, +.btn-primary:active, +.btn-primary.active, +.open > .dropdown-toggle.btn-primary { + color: #fff; + background-color: #635182; + border-color: #635182; +} +.btn-primary.disabled, +.btn-primary[disabled], +fieldset[disabled] .btn-primary, +.btn-primary.disabled:hover, +.btn-primary[disabled]:hover, +fieldset[disabled] .btn-primary:hover, +.btn-primary.disabled:focus, +.btn-primary[disabled]:focus, +fieldset[disabled] .btn-primary:focus, +.btn-primary.disabled:active, +.btn-primary[disabled]:active, +fieldset[disabled] .btn-primary:active, +.btn-primary.disabled.active, +.btn-primary[disabled].active, +fieldset[disabled] .btn-primary.active { + background-color: #6A5687; + border-color: #6A5687; +} +.btn-primary .badge { + color: #6A5687; + text-shadow: none; + background-color: #fff; +} +.btn-success { + color: #fff; + text-shadow: 0 0 3px rgba(0, 0, 0, 0.7); + background-color: #677835; + border-color: #677835; +} +.btn-success:hover, +.btn-success:focus, +.btn-success:active, +.btn-success.active, +.open > .dropdown-toggle.btn-success { + color: #fff; + background-color: #52632A; + border-color: #52632A; +} +.btn-success.disabled, +.btn-success[disabled], +fieldset[disabled] .btn-success, +.btn-success.disabled:hover, +.btn-success[disabled]:hover, +fieldset[disabled] .btn-success:hover, +.btn-success.disabled:focus, +.btn-success[disabled]:focus, +fieldset[disabled] .btn-success:focus, +.btn-success.disabled:active, +.btn-success[disabled]:active, +fieldset[disabled] .btn-success:active, +.btn-success.disabled.active, +.btn-success[disabled].active, +fieldset[disabled] .btn-success.active { + background-color: #677835; + border-color: #677835; +} +.btn-success .badge { + color: #677835; + text-shadow: none; + background-color: #fff; +} +.btn-info { + color: #fff; + text-shadow: 0 0 3px rgba(0, 0, 0, 0.7); + background-color: #11809E; + border-color: #11809E; +} +.btn-info:hover, +.btn-info:focus, +.btn-info:active, +.btn-info.active, +.open > .dropdown-toggle.btn-info { + color: #fff; + background-color: #0C5B7A; + border-color: #0C5B7A; +} +.btn-info.disabled, +.btn-info[disabled], +fieldset[disabled] .btn-info, +.btn-info.disabled:hover, +.btn-info[disabled]:hover, +fieldset[disabled] .btn-info:hover, +.btn-info.disabled:focus, +.btn-info[disabled]:focus, +fieldset[disabled] .btn-info:focus, +.btn-info.disabled:active, +.btn-info[disabled]:active, +fieldset[disabled] .btn-info:active, +.btn-info.disabled.active, +.btn-info[disabled].active, +fieldset[disabled] .btn-info.active { + background-color: #11809E; + border-color: #11809E; +} +.btn-info .badge { + color: #0C5B7A; + text-shadow: none; + background-color: #fff; +} +.btn-warning { + color: #fff; + text-shadow: 0 0 3px rgba(0, 0, 0, 0.7); + background-color: #EB7239; + border-color: #EB7239; +} +.btn-warning:hover, +.btn-warning:focus, +.btn-warning:active, +.btn-warning.active, +.open > .dropdown-toggle.btn-warning { + color: #fff; + background-color: #DE6933; + border-color: #DE6933; +} +.btn-warning.disabled, +.btn-warning[disabled], +fieldset[disabled] .btn-warning, +.btn-warning.disabled:hover, +.btn-warning[disabled]:hover, +fieldset[disabled] .btn-warning:hover, +.btn-warning.disabled:focus, +.btn-warning[disabled]:focus, +fieldset[disabled] .btn-warning:focus, +.btn-warning.disabled:active, +.btn-warning[disabled]:active, +fieldset[disabled] .btn-warning:active, +.btn-warning.disabled.active, +.btn-warning[disabled].active, +fieldset[disabled] .btn-warning.active { + background-color: #EB7239; + border-color: #EB7239; +} +.btn-warning .badge { + color: #C05827; + text-shadow: none; + background-color: #fff; +} +.btn-danger { + color: #fff; + text-shadow: 0 0 3px rgba(0, 0, 0, 0.7); + background-color: #CC2D18; + border-color: #CC2D18; +} +.btn-danger:hover, +.btn-danger:focus, +.btn-danger:active, +.btn-danger.active, +.open > .dropdown-toggle.btn-danger { + color: #fff; + background-color: #B82E12; + border-color: #B82E12; +} +.btn-danger.disabled, +.btn-danger[disabled], +fieldset[disabled] .btn-danger, +.btn-danger.disabled:hover, +.btn-danger[disabled]:hover, +fieldset[disabled] .btn-danger:hover, +.btn-danger.disabled:focus, +.btn-danger[disabled]:focus, +fieldset[disabled] .btn-danger:focus, +.btn-danger.disabled:active, +.btn-danger[disabled]:active, +fieldset[disabled] .btn-danger:active, +.btn-danger.disabled.active, +.btn-danger[disabled].active, +fieldset[disabled] .btn-danger.active { + background-color: #CC2D18; + border-color: #CC2D18; +} +.btn-danger .badge { + color: #C42D16; + text-shadow: none; + background-color: #fff; +} + +.navbar-default .navbar-nav > li > a.btn-soutenir, +.btn-soutenir { + color: #fff !important; + text-shadow: 0 0 3px rgba(0, 0, 0, 0.5); + background-color: #DBA306; + border-color: #DBA306; +} +.navbar-default .navbar-nav > li > a.btn-soutenir:hover, +.navbar-default .navbar-nav > li > a.btn-soutenir:focus, +.navbar-default .navbar-nav > li > a.btn-soutenir:active, +.btn-soutenir:hover, +.btn-soutenir:focus, +.btn-soutenir:active, +.btn-soutenir.active, +.open > .dropdown-toggle.btn-soutenir { + color: #fff; + background-color: #C48a1b; + border-color: #C48a1b; +} + +.btn-link { + font-weight: normal; + color: #0C5B7A; + cursor: pointer; + border-radius: 0; +} +.btn-link, +.btn-link:active, +.btn-link[disabled], +fieldset[disabled] .btn-link { + background-color: transparent; + -webkit-box-shadow: none; + box-shadow: none; +} +.btn-link, +.btn-link:hover, +.btn-link:focus, +.btn-link:active { + border-color: transparent; +} +.btn-link:hover, +.btn-link:focus { + color: #635182; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover, +fieldset[disabled] .btn-link:hover, +.btn-link[disabled]:focus, +fieldset[disabled] .btn-link:focus { + color: #757575; + text-decoration: none; +} +.btn-link .badge { + color: #fff; + text-shadow: none; + background-color: #757575; +} diff --git a/app/assets/scss/frama/carousel.scss b/app/assets/scss/frama/carousel.scss new file mode 100644 index 0000000..d2e8a70 --- /dev/null +++ b/app/assets/scss/frama/carousel.scss @@ -0,0 +1,89 @@ +.carousel-container { + .carousel { + margin: 1em; + + a { + border-bottom: none; + } + + img { + width: 100%; + margin: 0; + } + } + + .carousel-inner { + padding-bottom: 75px; + box-shadow: $carousel-ombre; + + > .item { + transition: -webkit-transform .6s ease-in-out; + transition: transform .6s ease-in-out; + transition: transform .6s ease-in-out, -webkit-transform .6s ease-in-out; + + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + -webkit-perspective: 1000px; + perspective: 1000px; + display: none; + } + > .item.active, + > .item.next, + > .item.prev { + display: block; + } + > .item.active ~ .item.active { + display: none; /* prevent double slides bug */ + } + } + + .carousel-control.right, .carousel-control.left{ + background-image: none; + color: #eee; + } + + .play-pause { + position: absolute; + margin-top: -110px; + margin-left: 60px; + left: 0%; + + button { + cursor: pointer; + font-size: 30px; + z-index: 1000; + background: #f3f3f3; + border-radius: 30px; + color: #767676; + width: 40px; + height: 40px; + padding-left: 4px; + padding-top: 0px; + position: absolute; + opacity: 1; + text-shadow:none; + box-shadow: $button-ombre; + border-color: transparent; + + &:hover { + color: #555; + } + } + } + + .carousel-caption { + background: #f3f3f3; + bottom:-75px; + color: #333; + left: 0; + right: 0; + position: absolute; + height: 78px ; + text-shadow: none; + border-top: 1px solid #ddd; + + h4 { + border: none; + } + } +} diff --git a/app/assets/scss/frama/cleaning.scss b/app/assets/scss/frama/cleaning.scss new file mode 100644 index 0000000..2a8dd02 --- /dev/null +++ b/app/assets/scss/frama/cleaning.scss @@ -0,0 +1,18 @@ +h1 a, h2 a, h3 a, h4 a, h5 a, h6 a, +.breadcrumb a, +a.btn, +a.label, +.nav-pills a, +.nav-container a, +.dropdown-menu a, +.nav a, +menu a { text-decoration:none !important;} + +#mypads .container.ombre { + margin-top:0; + margin-bottom:0; +} + +.modal-open .modal-backdrop { + z-index: 9 !important; +} diff --git a/app/assets/scss/frama/colors.scss b/app/assets/scss/frama/colors.scss new file mode 100644 index 0000000..7ed339d --- /dev/null +++ b/app/assets/scss/frama/colors.scss @@ -0,0 +1,207 @@ +/* Anciennes classes * + * Couleur des Framatitre */ +.violet, .frama { color: #6A5687; } +.orange, .soft { color: #EB7239; } +.bleu, .logiciel { color: #0C5B7A; } +.rouge, .culture { color: #CC2D18; } +.vert, .services { color: #8E9C48; } +.jaune, .vrac { color: #C48A1B; } + +/* Classes pour utiliser la couleur de titre en arrière plan */ +.fond-frama { background-color: #6A5687; } +.fond-soft { background-color: #EB7239; } +.fond-logiciel { background-color: #0C5B7A; } +.fond-culture { background-color: #CC2D18; } +.fond-services { background-color: #8E9C48; } +.fond-vrac { background-color: #C48A1B; } + +/* Nouvelles classes * + * f = frama violet ; v = vert ; b = bleu ; j = jaune ; r = rouge ; o = orange ; m = marron ; g = gris + * fb_ = background ; fc_ = color */ + +/* Ref #6A5687 = RGB(106,86,135) = HSV(264,36,53) */ +.fb_f0 { background-color: #EDE6F5;} +.fb_f1 { background-color: #D3C5E8;} +.fb_f2 { background-color: #B49CD9;} +.fb_f3 { background-color: #9876CC;} +.fb_f4 { background-color: #8157C2;} +.fb_f5 { background-color: #6A5687;} /* btn-primary */ +.fb_f6 { background-color: #635182;} +.fb_f7 { background-color: #574778;} +.fb_f8 { background-color: #4E4070;} +.fb_f9 { background-color: #3E3363;} + +.fc_f0 { color: #EDE6F5;} +.fc_f1 { color: #D3C5E8;} +.fc_f2 { color: #B49CD9;} +.fc_f3 { color: #9876CC;} +.fc_f4 { color: #8157C2;} +.fc_f5 { color: #6A5687;} /* .frama */ +.fc_f6 { color: #635182;} /* a:hover */ +.fc_f7 { color: #574778;} +.fc_f8 { color: #4E4070;} +.fc_f9 { color: #3E3363;} + +/* Ref #8E9C48 = RGB(142,156,72) = HSV(70,54,61) */ +.fb_v0 { background-color: #F4F7E9;} +.fb_v1 { background-color: #E3EBC7;} +.fb_v2 { background-color: #D2E0A6;} +.fb_v3 { background-color: #C0D481;} +.fb_v4 { background-color: #B3CC66;} +.fb_v5 { background-color: #8E9C48;} /* btn-success */ +.fb_v6 { background-color: #7D8C3F;} +.fb_v7 { background-color: #677835;} +.fb_v8 { background-color: #52632A;} +.fb_v9 { background-color: #304219;} + +.fc_v0 { color: #F4F7E9;} +.fc_v1 { color: #E3EBC7;} +.fc_v2 { color: #D2E0A6;} +.fc_v3 { color: #C0D481;} +.fc_v4 { color: #B3CC66;} +.fc_v5 { color: #8E9C48;} /* .services */ +.fc_v6 { color: #7D8C3F;} +.fc_v7 { color: #677835;} +.fc_v8 { color: #52632A;} +.fc_v9 { color: #304219;} + +/* Ref #0C5B7A = RGB(12,91,122) = HSV(197,90,48) */ +.fb_b0 { background-color: #E1F8FC;} +.fb_b1 { background-color: #B2D5DB;} +.fb_b2 { background-color: #83C9D6;} +.fb_b3 { background-color: #58C3D6;} +.fb_b4 { background-color: #38BED6;} +.fb_b5 { background-color: #18B7D4;} +.fb_b6 { background-color: #16A7C4;} +.fb_b7 { background-color: #1290B0;} +.fb_b8 { background-color: #11809E;} /* btn-info */ +.fb_b9 { background-color: #0C5B7A;} + +.fc_b0 { color: #E1F8FC;} +.fc_b1 { color: #B2D5DB;} +.fc_b2 { color: #83C9D6;} +.fc_b3 { color: #58C3D6;} +.fc_b4 { color: #38BED6;} +.fc_b5 { color: #18B7D4;} +.fc_b6 { color: #16A7C4;} +.fc_b7 { color: #1290B0;} +.fc_b8 { color: #11809E;} +.fc_b9 { color: #0C5B7A;} /* a .logiciel */ + +/* Ref #C48A1B = RGB(196,168,27) = HSV(39,86,77) */ +.fb_j0 { background-color: #FFF8E3;} +.fb_j1 { background-color: #FFEBB5;} +.fb_j2 { background-color: #FFDD82;} +.fb_j3 { background-color: #FFCF4F;} +.fb_j4 { background-color: #FFC529;} +.fb_j5 { background-color: #DBA306;} /* btn-soutenir */ +.fb_j6 { background-color: #C48A1B;} +.fb_j7 { background-color: #C47E1B;} +.fb_j8 { background-color: #BA5D17;} +.fb_j9 { background-color: #A15014;} + +.fc_j0 { color: #FFF8E3;} +.fc_j1 { color: #FFEBB5;} +.fc_j2 { color: #FFDD82;} +.fc_j3 { color: #FFCF4F;} +.fc_j4 { color: #FFC529;} +.fc_j5 { color: #DBA306;} +.fc_j6 { color: #C48A1B;} /* .vrac */ +.fc_j7 { color: #C47E1B;} +.fc_j8 { color: #BA5D17;} +.fc_j9 { color: #A15014;} + +/* Ref #CC2D18 = RGB(204,45,24) = HSV(7,88,80) */ +.fb_r0 { background-color: #fde0dc;} +.fb_r1 { background-color: #f9bdbb;} +.fb_r2 { background-color: #f69988;} +.fb_r3 { background-color: #f36c60;} +.fb_r4 { background-color: #e84e40;} +.fb_r5 { background-color: #CC2D18;} /* btn-danger */ +.fb_r6 { background-color: #C42D16;} +.fb_r7 { background-color: #B82E12;} +.fb_r8 { background-color: #AB2A0E;} +.fb_r9 { background-color: #AB2909;} + +.fc_r0 { color: #fde0dc;} +.fc_r1 { color: #f9bdbb;} +.fc_r2 { color: #f69988;} +.fc_r3 { color: #f36c60;} +.fc_r4 { color: #e84e40;} +.fc_r5 { color: #CC2D18;} /* .culture */ +.fc_r6 { color: #C42D16;} +.fc_r7 { color: #B82E12;} +.fc_r8 { color: #AB2A0E;} +.fc_r9 { color: #AB2909;} + +/* Ref #EB7239 = RGB(235,114,57) = HSV(19,76,92) */ +.fb_o0 { background-color: #FAEBE8;} +.fb_o1 { background-color: #EBD1C5;} +.fb_o2 { background-color: #EBB69D;} +.fb_o3 { background-color: #EB9B76;} +.fb_o4 { background-color: #EB8657;} +.fb_o5 { background-color: #EB7239;} /* btn-warning */ +.fb_o6 { background-color: #DE6933;} +.fb_o7 { background-color: #D1602C;} +.fb_o8 { background-color: #C05827;} +.fb_o9 { background-color: #A8491D;} + +.fc_o0 { color: #FAEBE8;} +.fc_o1 { color: #EBD1C5;} +.fc_o2 { color: #EBB69D;} +.fc_o3 { color: #EB9B76;} +.fc_o4 { color: #EB8657;} +.fc_o5 { color: #EB7239;} /* .soft */ +.fc_o6 { color: #DE6933;} +.fc_o7 { color: #D1602C;} +.fc_o8 { color: #C05827;} +.fc_o9 { color: #A8491D;} + +/* Ref #A1887F = RGB(161,136,127) = HSV(16,21,63) */ +.fb_m0 { background-color: #efebe9;} +.fb_m1 { background-color: #d7ccc8;} +.fb_m2 { background-color: #bcaaa4;} +.fb_m3 { background-color: #a1887f;} +.fb_m4 { background-color: #8d6e63;} +.fb_m5 { background-color: #795548;} +.fb_m6 { background-color: #6d4c41;} +.fb_m7 { background-color: #5d4037;} +.fb_m8 { background-color: #4e342e;} +.fb_m9 { background-color: #3e2723;} + +.fc_m0 { color: #efebe9;} +.fc_m1 { color: #d7ccc8;} +.fc_m2 { color: #bcaaa4;} +.fc_m3 { color: #a1887f;} +.fc_m4 { color: #8d6e63;} +.fc_m5 { color: #795548;} /* .signature */ +.fc_m6 { color: #6d4c41;} +.fc_m7 { color: #5d4037;} +.fc_m8 { color: #4e342e;} +.fc_m9 { color: #3e2723;} + +/* Ref #949494 = RGB(148,148,148) = HSV(0,0,58) */ +.fb_g0 { background-color: #fafafa;} /* body */ +.fb_g1 { background-color: #f5f5f5;} +.fb_g2 { background-color: #eeeeee;} /* .trait */ +.fb_g3 { background-color: #e0e0e0;} /* footer */ +.fb_g4 { background-color: #bdbdbd;} /* footer border */ +.fb_g5 { background-color: #949494;} +.fb_g6 { background-color: #757575;} +.fb_g7 { background-color: #616161;} +.fb_g8 { background-color: #666666;} +.fb_g9 { background-color: #333333;} + +.fc_g0 { color: #fafafa;} +.fc_g1 { color: #f5f5f5;} +.fc_g2 { color: #eeeeee;} +.fc_g3 { color: #e0e0e0;} +.fc_g4 { color: #bdbdbd;} +.fc_g5 { color: #949494;} +.fc_g6 { color: #757575;} /* muted */ +.fc_g7 { color: #616161;} /* hn, footer hn */ +.fc_g8 { color: #666666;} +.fc_g9 { color: #333333;} /* text */ + +.fc_light { color: #fff;} +.fc_dark { color: #333;} diff --git a/app/assets/scss/frama/internav.scss b/app/assets/scss/frama/internav.scss new file mode 100644 index 0000000..4330bbf --- /dev/null +++ b/app/assets/scss/frama/internav.scss @@ -0,0 +1,22 @@ +#internav ul { + margin-top: 0px; + margin-bottom: -10px; +} +#internav li a { + color: #666; + padding: 12px 15px; + text-decoration: none; + border:none !important; + line-height: 14px; +} +#internav li a:hover, +#internav li a:focus, +#internav li a.active { + background: #767676; + color: #fff; +} + +#internav form div { + margin-top: 4px; + margin-left: 25px +} diff --git a/app/assets/scss/frama/labels.scss b/app/assets/scss/frama/labels.scss new file mode 100644 index 0000000..7572b8f --- /dev/null +++ b/app/assets/scss/frama/labels.scss @@ -0,0 +1,32 @@ +.label-default { + background-color: #757575; +} +.label-default[href]:hover, +.label-default[href]:focus { + background-color: #757575; +} +.label-primary, +.label-primary[href]:hover, +.label-primary[href]:focus { + background-color: #6A5687; +} +.label-success, +.label-success[href]:hover, +.label-success[href]:focus { + background-color: #677835; +} +.label-info, +.label-info[href]:hover, +.label-info[href]:focus { + background-color: #11809E; +} +.label-warning, +.label-warning[href]:hover, +.label-warning[href]:focus { + background-color: #C05827; +} +.label-danger, +.label-danger[href]:hover, +.label-danger[href]:focus { + background-color: #CC2D18; +} diff --git a/app/assets/scss/frama/links.scss b/app/assets/scss/frama/links.scss new file mode 100644 index 0000000..8b79899 --- /dev/null +++ b/app/assets/scss/frama/links.scss @@ -0,0 +1,17 @@ +a { color:#0C5B7A; } + +a, a:link { + text-decoration:underline; + -moz-text-decoration-style: dotted; + -webkit-text-decoration-style: dotted; + -ms-text-decoration-style: dotted; + text-decoration-style: dotted; +} +a:hover, a:focus { + color:#635182; + text-decoration:underline; + -moz-text-decoration-style: solid; + -webkit-text-decoration-style: solid; + -ms-text-decoration-style: solid; + text-decoration-style: solid; +} diff --git a/app/assets/scss/frama/modals.scss b/app/assets/scss/frama/modals.scss new file mode 100644 index 0000000..b60d6c8 --- /dev/null +++ b/app/assets/scss/frama/modals.scss @@ -0,0 +1,4 @@ +.modal-header h1,.modal-header h2,.modal-header h3, +.modal-header h4,.modal-header h5,.modal-header h6 { + font-size: 24px; +} diff --git a/app/assets/scss/frama/navs.scss b/app/assets/scss/frama/navs.scss new file mode 100644 index 0000000..cab79ed --- /dev/null +++ b/app/assets/scss/frama/navs.scss @@ -0,0 +1,6 @@ +.nav-pills > li.active > a, +.nav-pills > li.active > a:hover, +.nav-pills > li.active > a:focus { + color: #fff; + background-color: #6A5687; +} diff --git a/app/assets/scss/frama/panels.scss b/app/assets/scss/frama/panels.scss new file mode 100644 index 0000000..7053584 --- /dev/null +++ b/app/assets/scss/frama/panels.scss @@ -0,0 +1,29 @@ +.panel-primary { border-color: #6A5687; } +.panel-primary > .panel-heading { color: #fff; background-color: #6A5687; border-color: #6A5687; } +.panel-primary > .panel-heading + .panel-collapse > .panel-body { border-top-color: #6A5687; } +.panel-primary > .panel-heading .badge { color: #6A5687; } +.panel-primary > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #6A5687; } + +.panel-success { border-color: #677835; } +.panel-success > .panel-heading { color: #fff; background-color: #677835; border-color: #677835; } +.panel-success > .panel-heading + .panel-collapse > .panel-body { border-top-color: #677835; } +.panel-success > .panel-heading .badge { color: #677835; } +.panel-success > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #677835; } + +.panel-info { border-color: #11809E; } +.panel-info > .panel-heading { color: #fff; background-color: #11809E; border-color: #11809E; } +.panel-info > .panel-heading + .panel-collapse > .panel-body { border-top-color: #11809E; } +.panel-info > .panel-heading .badge { color: #11809E; } +.panel-info > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #11809E; } + +.panel-warning { border-color: #EB7239; } +.panel-warning > .panel-heading { color: #fff; background-color: #EB7239; border-color: #EB7239; } +.panel-warning > .panel-heading + .panel-collapse > .panel-body { border-top-color: #EB7239; } +.panel-warning > .panel-heading .badge { color: #EB7239; } +.panel-warning > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #EB7239; } + +.panel-danger { border-color: #CC2D18; } +.panel-danger > .panel-heading { color: #fff; background-color: #CC2D18; border-color: #CC2D18; } +.panel-danger > .panel-heading + .panel-collapse > .panel-body { border-top-color: #CC2D18; } +.panel-danger > .panel-heading .badge { color: #CC2D18; } +.panel-danger > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #CC2D18; } diff --git a/app/assets/scss/frama/popovers.scss b/app/assets/scss/frama/popovers.scss new file mode 100644 index 0000000..68d02ce --- /dev/null +++ b/app/assets/scss/frama/popovers.scss @@ -0,0 +1,14 @@ +.popover { + -moz-border-radius:3px; + -webkit-border-radius:3px; + border-radius:3px; +} + +.popover.bottom>.arrow:after,.popover.right>.arrow:after,.popover.top>.arrow:after,.popover.left>.arrow:after { + border-color:transparent; +} + +.popover .popover-title { + background:rgba(0,0,0,0.05); + line-height:18px; +} diff --git a/app/assets/scss/frama/text.scss b/app/assets/scss/frama/text.scss new file mode 100644 index 0000000..a9256a6 --- /dev/null +++ b/app/assets/scss/frama/text.scss @@ -0,0 +1,68 @@ +.text-muted, +.text-muted a, +a.text-muted { + color: #757575; +} + +.text-muted a:hover, +.text-muted a:focus, +a.text-muted:hover, +a.text-muted:focus { + color: #616161; +} +.text-primary, +.text-primary a, +a.text-primary { + color: #6A5687; +} +.text-primary a:hover, +.text-primary a:focus, +a.text-primary:hover, +a.text-primary:focus { + color: #635182; +} +.text-success, +.text-success a, +a.text-success { + color: #677835; +} +.text-success a:hover, +.text-success a:focus, +a.text-success:hover, +a.text-success:focus { + color: #52632A; +} +.text-info, +.text-info a, +a.text-info { + color: #11809E; +} +.text-info a:hover, +.text-info a:focus, +a.text-info:hover, +a.text-info:focus { + color: #0C5B7A; +} +.text-warning, +.text-warning a, +a.text-warning { + color: #C05827; +} +.text-warning a:hover, +.text-warning a:focus, +a.text-warning:hover, +a.text-warning:focus { + color: #A8491D; +} +.text-danger, +.text-danger a, +a.text-danger { + color: #B82E12; + +} +.text-danger a:hover, +.text-danger a:focus, +a.text-danger:hover, +a.text-danger:focus { + color: #AB2A0E; +} diff --git a/app/assets/scss/main.scss b/app/assets/scss/main.scss index 3ea7418..e97c537 100644 --- a/app/assets/scss/main.scss +++ b/app/assets/scss/main.scss @@ -19,7 +19,7 @@ body { } h1 { - font-family: "DejaVu Sans",Verdana,Geneva,sans-serif !important; + font-family: "DejaVu Sans",Verdana,Geneva,sans-serif; font-size: 48px; font-weight: bold; } @@ -34,10 +34,10 @@ h1 { padding: 20px 30px; } -#tuto-faq p > .glyphicon, -#tuto-video p > .glyphicon, -#le-logiciel p > .glyphicon, -#jardin p > .glyphicon { +#tuto-faq p[role="presentation"] i, +#tuto-video > p[role="presentation"] i, +#le-logiciel > p[role="presentation"] i, +#jardin > p[role="presentation"] i { font-size:50px; } @@ -114,934 +114,19 @@ a.btn-primary, a.btn-soutenir, a.btn-info { margin-top: 15px; } -/************ - * Couleurs * - ************/ - -/* Anciennes classes * - * Couleur des Framatitre */ -.violet, .frama { color: $violet; } -.orange, .soft { color: $orange; } -.bleu, .logiciel { color: $bleu; } -.rouge, .culture { color: $rouge; } -.vert, .services { color: $vert; } -.jaune, .vrac { color: $jaune; } - -#howColor strong, -.rainbow { - background-image: -webkit-gradient( linear, left top, right top, color-stop(0, $rouge), color-stop(0.10, $orange), color-stop(0.25, $jaune), color-stop(0.42, $vert), color-stop(0.65, $bleu),color-stop(0.90, $violet) ); - background-image: gradient( linear, left top, right top, color-stop(0, $rouge), color-stop(0.10, $orange), color-stop(0.25, $jaune), color-stop(0.42, $vert), color-stop(0.65, $bleu),color-stop(0.90, $violet) ); - color:transparent; - -webkit-background-clip: text; - background-clip: text; -} - -/* Classes pour utiliser la couleur de titre en arrière plan */ -.fond-frama { background-color: $violet; } -.fond-soft { background-color: $orange; } -.fond-logiciel { background-color: $bleu; } -.fond-culture { background-color: $rouge; } -.fond-services { background-color: $vert; } -.fond-vrac { background-color: $jaune; } - -/* Nouvelles classes * - * f = frama violet ; v = vert ; b = bleu ; j = jaune ; r = rouge ; o = orange ; m = marron ; g = gris - * fb_ = background ; fc_ = color */ - -/* Ref #6A5687 = RGB(106,86,135) = HSV(264,36,53) */ -.fb_f0 { background-color: #EDE6F5;} -.fb_f1 { background-color: #D3C5E8;} -.fb_f2 { background-color: #B49CD9;} -.fb_f3 { background-color: #9876CC;} -.fb_f4 { background-color: #8157C2;} -.fb_f5 { background-color: #6A5687;} /* btn-primary */ -.fb_f6 { background-color: #635182;} -.fb_f7 { background-color: #574778;} -.fb_f8 { background-color: #4E4070;} -.fb_f9 { background-color: #3E3363;} - -.fc_f0 { color: #EDE6F5;} -.fc_f1 { color: #D3C5E8;} -.fc_f2 { color: #B49CD9;} -.fc_f3 { color: #9876CC;} -.fc_f4 { color: #8157C2;} -.fc_f5 { color: #6A5687;} /* .frama */ -.fc_f6 { color: #635182;} /* a:hover */ -.fc_f7 { color: #574778;} -.fc_f8 { color: #4E4070;} -.fc_f9 { color: #3E3363;} - -/* Ref #8E9C48 = RGB(142,156,72) = HSV(70,54,61) */ -.fb_v0 { background-color: #F4F7E9;} -.fb_v1 { background-color: #E3EBC7;} -.fb_v2 { background-color: #D2E0A6;} -.fb_v3 { background-color: #C0D481;} -.fb_v4 { background-color: #B3CC66;} -.fb_v5 { background-color: #8E9C48;} /* btn-success */ -.fb_v6 { background-color: #7D8C3F;} -.fb_v7 { background-color: #677835;} -.fb_v8 { background-color: #52632A;} -.fb_v9 { background-color: #304219;} - -.fc_v0 { color: #F4F7E9;} -.fc_v1 { color: #E3EBC7;} -.fc_v2 { color: #D2E0A6;} -.fc_v3 { color: #C0D481;} -.fc_v4 { color: #B3CC66;} -.fc_v5 { color: #8E9C48;} /* .services */ -.fc_v6 { color: #7D8C3F;} -.fc_v7 { color: #677835;} -.fc_v8 { color: #52632A;} -.fc_v9 { color: #304219;} - -/* Ref #0C5B7A = RGB(12,91,122) = HSV(197,90,48) */ -.fb_b0 { background-color: #E1F8FC;} -.fb_b1 { background-color: #B2D5DB;} -.fb_b2 { background-color: #83C9D6;} -.fb_b3 { background-color: #58C3D6;} -.fb_b4 { background-color: #38BED6;} -.fb_b5 { background-color: #18B7D4;} -.fb_b6 { background-color: #16A7C4;} -.fb_b7 { background-color: #1290B0;} -.fb_b8 { background-color: #11809E;} /* btn-info */ -.fb_b9 { background-color: #0C5B7A;} - -.fc_b0 { color: #E1F8FC;} -.fc_b1 { color: #B2D5DB;} -.fc_b2 { color: #83C9D6;} -.fc_b3 { color: #58C3D6;} -.fc_b4 { color: #38BED6;} -.fc_b5 { color: #18B7D4;} -.fc_b6 { color: #16A7C4;} -.fc_b7 { color: #1290B0;} -.fc_b8 { color: #11809E;} -.fc_b9 { color: #0C5B7A;} /* a .logiciel */ - -/* Ref #C48A1B = RGB(196,168,27) = HSV(39,86,77) */ -.fb_j0 { background-color: #FFF8E3;} -.fb_j1 { background-color: #FFEBB5;} -.fb_j2 { background-color: #FFDD82;} -.fb_j3 { background-color: #FFCF4F;} -.fb_j4 { background-color: #FFC529;} -.fb_j5 { background-color: #DBA306;} /* btn-soutenir */ -.fb_j6 { background-color: #C48A1B;} -.fb_j7 { background-color: #C47E1B;} -.fb_j8 { background-color: #BA5D17;} -.fb_j9 { background-color: #A15014;} - -.fc_j0 { color: #FFF8E3;} -.fc_j1 { color: #FFEBB5;} -.fc_j2 { color: #FFDD82;} -.fc_j3 { color: #FFCF4F;} -.fc_j4 { color: #FFC529;} -.fc_j5 { color: #DBA306;} -.fc_j6 { color: #C48A1B;} /* .vrac */ -.fc_j7 { color: #C47E1B;} -.fc_j8 { color: #BA5D17;} -.fc_j9 { color: #A15014;} - -/* Ref #CC2D18 = RGB(204,45,24) = HSV(7,88,80) */ -.fb_r0 { background-color: #fde0dc;} -.fb_r1 { background-color: #f9bdbb;} -.fb_r2 { background-color: #f69988;} -.fb_r3 { background-color: #f36c60;} -.fb_r4 { background-color: #e84e40;} -.fb_r5 { background-color: #CC2D18;} /* btn-danger */ -.fb_r6 { background-color: #C42D16;} -.fb_r7 { background-color: #B82E12;} -.fb_r8 { background-color: #AB2A0E;} -.fb_r9 { background-color: #AB2909;} - -.fc_r0 { color: #fde0dc;} -.fc_r1 { color: #f9bdbb;} -.fc_r2 { color: #f69988;} -.fc_r3 { color: #f36c60;} -.fc_r4 { color: #e84e40;} -.fc_r5 { color: #CC2D18;} /* .culture */ -.fc_r6 { color: #C42D16;} -.fc_r7 { color: #B82E12;} -.fc_r8 { color: #AB2A0E;} -.fc_r9 { color: #AB2909;} - -/* Ref #EB7239 = RGB(235,114,57) = HSV(19,76,92) */ -.fb_o0 { background-color: #FAEBE8;} -.fb_o1 { background-color: #EBD1C5;} -.fb_o2 { background-color: #EBB69D;} -.fb_o3 { background-color: #EB9B76;} -.fb_o4 { background-color: #EB8657;} -.fb_o5 { background-color: #EB7239;} /* btn-warning */ -.fb_o6 { background-color: #DE6933;} -.fb_o7 { background-color: #D1602C;} -.fb_o8 { background-color: #C05827;} -.fb_o9 { background-color: #A8491D;} - -.fc_o0 { color: #FAEBE8;} -.fc_o1 { color: #EBD1C5;} -.fc_o2 { color: #EBB69D;} -.fc_o3 { color: #EB9B76;} -.fc_o4 { color: #EB8657;} -.fc_o5 { color: #EB7239;} /* .soft */ -.fc_o6 { color: #DE6933;} -.fc_o7 { color: #D1602C;} -.fc_o8 { color: #C05827;} -.fc_o9 { color: #A8491D;} - -/* Ref #A1887F = RGB(161,136,127) = HSV(16,21,63) */ -.fb_m0 { background-color: #efebe9;} -.fb_m1 { background-color: #d7ccc8;} -.fb_m2 { background-color: #bcaaa4;} -.fb_m3 { background-color: #a1887f;} -.fb_m4 { background-color: #8d6e63;} -.fb_m5 { background-color: #795548;} -.fb_m6 { background-color: #6d4c41;} -.fb_m7 { background-color: #5d4037;} -.fb_m8 { background-color: #4e342e;} -.fb_m9 { background-color: #3e2723;} - -.fc_m0 { color: #efebe9;} -.fc_m1 { color: #d7ccc8;} -.fc_m2 { color: #bcaaa4;} -.fc_m3 { color: #a1887f;} -.fc_m4 { color: #8d6e63;} -.fc_m5 { color: #795548;} /* .signature */ -.fc_m6 { color: #6d4c41;} -.fc_m7 { color: #5d4037;} -.fc_m8 { color: #4e342e;} -.fc_m9 { color: #3e2723;} - -/* Ref #949494 = RGB(148,148,148) = HSV(0,0,58) */ -.fb_g0 { background-color: #fafafa;} /* body */ -.fb_g1 { background-color: #f5f5f5;} -.fb_g2 { background-color: #eeeeee;} /* .trait */ -.fb_g3 { background-color: #e0e0e0;} /* footer */ -.fb_g4 { background-color: #bdbdbd;} /* footer border */ -.fb_g5 { background-color: #949494;} -.fb_g6 { background-color: #757575;} -.fb_g7 { background-color: #616161;} -.fb_g8 { background-color: #666666;} -.fb_g9 { background-color: #333333;} - -.fc_g0 { color: #fafafa;} -.fc_g1 { color: #f5f5f5;} -.fc_g2 { color: #eeeeee;} -.fc_g3 { color: #e0e0e0;} -.fc_g4 { color: #bdbdbd;} -.fc_g5 { color: #949494;} -.fc_g6 { color: #757575;} /* muted */ -.fc_g7 { color: #616161;} /* hn, footer hn */ -.fc_g8 { color: #666666;} -.fc_g9 { color: #333333;} /* text */ - -.fc_light { color: #fff;} -.fc_dark { color: #333;} - -a { color:#0C5B7A; } - -a, a:link { - text-decoration:underline; - -moz-text-decoration-style: dotted; - -webkit-text-decoration-style: dotted; - -ms-text-decoration-style: dotted; - text-decoration-style: dotted; -} -a:hover, a:focus { - color:#635182; - text-decoration:underline; - -moz-text-decoration-style: solid; - -webkit-text-decoration-style: solid; - -ms-text-decoration-style: solid; - text-decoration-style: solid; -} - -#results #main_results a:visited { // Framabee only - color:#635182 !important; -} - -/* Text */ -.text-muted, -.text-muted a, -a.text-muted { - color: #757575; -} - -.text-muted a:hover, -.text-muted a:focus, -a.text-muted:hover, -a.text-muted:focus { - color: #616161; -} -.text-primary, -.text-primary a, -a.text-primary { - color: #6A5687; -} -.text-primary a:hover, -.text-primary a:focus, -a.text-primary:hover, -a.text-primary:focus { - color: #635182; -} -.text-success, -.text-success a, -a.text-success { - color: #677835; -} -.text-success a:hover, -.text-success a:focus, -a.text-success:hover, -a.text-success:focus { - color: #52632A; -} -.text-info, -.text-info a, -a.text-info { - color: #11809E; -} -.text-info a:hover, -.text-info a:focus, -a.text-info:hover, -a.text-info:focus { - color: #0C5B7A; -} -.text-warning, -.text-warning a, -a.text-warning { - color: #C05827; -} -.text-warning a:hover, -.text-warning a:focus, -a.text-warning:hover, -a.text-warning:focus { - color: #A8491D; -} -.text-danger, -.text-danger a, -a.text-danger { - color: #B82E12; - -} -.text-danger a:hover, -.text-danger a:focus, -a.text-danger:hover, -a.text-danger:focus { - color: #AB2A0E; -} - -/* Background */ -.bg-primary, -.bg-primary a:not(.btn), -a.bg-primary:focus:not(.btn), -a.bg-primary:hover:not(.btn) { - color: #fff; - background-color: #6A5687; -} -.bg-success, a.bg-success:hover:not(.btn) { - background-color: #E3EBC7; -} -.bg-info, a.bg-info:hover:not(.btn) { - background-color: #E1F8FC; -} -.bg-warning, a.bg-warning:hover:not(.btn) { - background-color: #FFEBB5; -} -.bg-danger,a.bg-danger:hover:not(.btn) { - background-color: #fde0dc; -} - -/* Alerts */ -.alert-success a:not(.btn), -.alert-success a:hover:not(.btn), -.alert-success { - color: #304219; - background:#E3EBC7; - border-color: #C0D481; -} -.alert-info a:not(.btn), -.alert-info a:hover:not(.btn), -.alert-info { - color: #0C5B7A; - background-color: #E1F8FC; - border-color: #B2D5DB; -} -.alert-warning a:not(.btn), -.alert-danger a:hover:not(.btn), -.alert-warning { - color: #A15014 !important; - background-color: #FFEBB5; - border-color: #FFCF4F; -} -.alert-danger a:not(.btn), -.alert-danger a:hover:not(.btn), -.alert-danger { - color: #AB2909 !important; - background-color: #fde0dc; - border-color: #E0B3A8; -} - -/* Buttons */ -.btn-default { - color: #333; - background-color: #fff; - border-color: #bdbdbd; -} -.btn-default:hover, -.btn-default:focus, -.btn-default:active, -.btn-default.active, -.open > .dropdown-toggle.btn-default { - color: #333; - background-color: #e0e0e0; - border-color: #949494; -} -.btn-default.disabled, -.btn-default[disabled], -fieldset[disabled] .btn-default, -.btn-default.disabled:hover, -.btn-default[disabled]:hover, -fieldset[disabled] .btn-default:hover, -.btn-default.disabled:focus, -.btn-default[disabled]:focus, -fieldset[disabled] .btn-default:focus, -.btn-default.disabled:active, -.btn-default[disabled]:active, -fieldset[disabled] .btn-default:active, -.btn-default.disabled.active, -.btn-default[disabled].active, -fieldset[disabled] .btn-default.active { - background-color: #fff; - border-color: #bdbdbd; -} -.btn-default .badge { - color: #fff; - background-color: #757575; -} -.btn-primary { - color: #fff; - text-shadow: 0 0 3px rgba(0, 0, 0, 0.7); - background-color: #6A5687; - border-color: #6A5687; -} -.btn-primary:hover, -.btn-primary:focus, -.btn-primary:active, -.btn-primary.active, -.open > .dropdown-toggle.btn-primary { - color: #fff; - background-color: #635182; - border-color: #635182; -} -.btn-primary.disabled, -.btn-primary[disabled], -fieldset[disabled] .btn-primary, -.btn-primary.disabled:hover, -.btn-primary[disabled]:hover, -fieldset[disabled] .btn-primary:hover, -.btn-primary.disabled:focus, -.btn-primary[disabled]:focus, -fieldset[disabled] .btn-primary:focus, -.btn-primary.disabled:active, -.btn-primary[disabled]:active, -fieldset[disabled] .btn-primary:active, -.btn-primary.disabled.active, -.btn-primary[disabled].active, -fieldset[disabled] .btn-primary.active { - background-color: #6A5687; - border-color: #6A5687; -} -.btn-primary .badge { - color: #6A5687; - text-shadow: none; - background-color: #fff; -} -.btn-success { - color: #fff; - text-shadow: 0 0 3px rgba(0, 0, 0, 0.7); - background-color: #677835; - border-color: #677835; -} -.btn-success:hover, -.btn-success:focus, -.btn-success:active, -.btn-success.active, -.open > .dropdown-toggle.btn-success { - color: #fff; - background-color: #52632A; - border-color: #52632A; -} -.btn-success.disabled, -.btn-success[disabled], -fieldset[disabled] .btn-success, -.btn-success.disabled:hover, -.btn-success[disabled]:hover, -fieldset[disabled] .btn-success:hover, -.btn-success.disabled:focus, -.btn-success[disabled]:focus, -fieldset[disabled] .btn-success:focus, -.btn-success.disabled:active, -.btn-success[disabled]:active, -fieldset[disabled] .btn-success:active, -.btn-success.disabled.active, -.btn-success[disabled].active, -fieldset[disabled] .btn-success.active { - background-color: #677835; - border-color: #677835; -} -.btn-success .badge { - color: #677835; - text-shadow: none; - background-color: #fff; -} -.btn-info { - color: #fff; - text-shadow: 0 0 3px rgba(0, 0, 0, 0.7); - background-color: #11809E; - border-color: #11809E; -} -.btn-info:hover, -.btn-info:focus, -.btn-info:active, -.btn-info.active, -.open > .dropdown-toggle.btn-info { - color: #fff; - background-color: #0C5B7A; - border-color: #0C5B7A; -} -.btn-info.disabled, -.btn-info[disabled], -fieldset[disabled] .btn-info, -.btn-info.disabled:hover, -.btn-info[disabled]:hover, -fieldset[disabled] .btn-info:hover, -.btn-info.disabled:focus, -.btn-info[disabled]:focus, -fieldset[disabled] .btn-info:focus, -.btn-info.disabled:active, -.btn-info[disabled]:active, -fieldset[disabled] .btn-info:active, -.btn-info.disabled.active, -.btn-info[disabled].active, -fieldset[disabled] .btn-info.active { - background-color: #11809E; - border-color: #11809E; -} -.btn-info .badge { - color: #0C5B7A; - text-shadow: none; - background-color: #fff; -} -.btn-warning { - color: #fff; - text-shadow: 0 0 3px rgba(0, 0, 0, 0.7); - background-color: #EB7239; - border-color: #EB7239; -} -.btn-warning:hover, -.btn-warning:focus, -.btn-warning:active, -.btn-warning.active, -.open > .dropdown-toggle.btn-warning { - color: #fff; - background-color: #DE6933; - border-color: #DE6933; -} -.btn-warning.disabled, -.btn-warning[disabled], -fieldset[disabled] .btn-warning, -.btn-warning.disabled:hover, -.btn-warning[disabled]:hover, -fieldset[disabled] .btn-warning:hover, -.btn-warning.disabled:focus, -.btn-warning[disabled]:focus, -fieldset[disabled] .btn-warning:focus, -.btn-warning.disabled:active, -.btn-warning[disabled]:active, -fieldset[disabled] .btn-warning:active, -.btn-warning.disabled.active, -.btn-warning[disabled].active, -fieldset[disabled] .btn-warning.active { - background-color: #EB7239; - border-color: #EB7239; -} -.btn-warning .badge { - color: #C05827; - text-shadow: none; - background-color: #fff; -} -.btn-danger { - color: #fff; - text-shadow: 0 0 3px rgba(0, 0, 0, 0.7); - background-color: #CC2D18; - border-color: #CC2D18; -} -.btn-danger:hover, -.btn-danger:focus, -.btn-danger:active, -.btn-danger.active, -.open > .dropdown-toggle.btn-danger { - color: #fff; - background-color: #B82E12; - border-color: #B82E12; -} -.btn-danger.disabled, -.btn-danger[disabled], -fieldset[disabled] .btn-danger, -.btn-danger.disabled:hover, -.btn-danger[disabled]:hover, -fieldset[disabled] .btn-danger:hover, -.btn-danger.disabled:focus, -.btn-danger[disabled]:focus, -fieldset[disabled] .btn-danger:focus, -.btn-danger.disabled:active, -.btn-danger[disabled]:active, -fieldset[disabled] .btn-danger:active, -.btn-danger.disabled.active, -.btn-danger[disabled].active, -fieldset[disabled] .btn-danger.active { - background-color: #CC2D18; - border-color: #CC2D18; -} -.btn-danger .badge { - color: #C42D16; - text-shadow: none; - background-color: #fff; -} - -.navbar-default .navbar-nav > li > a.btn-soutenir, -.btn-soutenir { - color: #fff !important; - text-shadow: 0 0 3px rgba(0, 0, 0, 0.5); - background-color: #DBA306; - border-color: #DBA306; -} -.navbar-default .navbar-nav > li > a.btn-soutenir:hover, -.navbar-default .navbar-nav > li > a.btn-soutenir:focus, -.navbar-default .navbar-nav > li > a.btn-soutenir:active, -.btn-soutenir:hover, -.btn-soutenir:focus, -.btn-soutenir:active, -.btn-soutenir.active, -.open > .dropdown-toggle.btn-soutenir { - color: #fff; - background-color: #C48a1b; - border-color: #C48a1b; -} - -.btn-link { - font-weight: normal; - color: #0C5B7A; - cursor: pointer; - border-radius: 0; -} -.btn-link, -.btn-link:active, -.btn-link[disabled], -fieldset[disabled] .btn-link { - background-color: transparent; - -webkit-box-shadow: none; - box-shadow: none; -} -.btn-link, -.btn-link:hover, -.btn-link:focus, -.btn-link:active { - border-color: transparent; -} -.btn-link:hover, -.btn-link:focus { - color: #635182; - text-decoration: underline; - background-color: transparent; -} -.btn-link[disabled]:hover, -fieldset[disabled] .btn-link:hover, -.btn-link[disabled]:focus, -fieldset[disabled] .btn-link:focus { - color: #757575; - text-decoration: none; -} -.btn-link .badge { - color: #fff; - text-shadow: none; - background-color: #757575; -} - -/* Labels */ -.label-default { - background-color: #757575; -} -.label-default[href]:hover, -.label-default[href]:focus { - background-color: #757575; -} -.label-primary, -.label-primary[href]:hover, -.label-primary[href]:focus { - background-color: #6A5687; -} -.label-success, -.label-success[href]:hover, -.label-success[href]:focus { - background-color: #677835; -} -.label-info, -.label-info[href]:hover, -.label-info[href]:focus { - background-color: #11809E; -} -.label-warning, -.label-warning[href]:hover, -.label-warning[href]:focus { - background-color: #C05827; -} -.label-danger, -.label-danger[href]:hover, -.label-danger[href]:focus { - background-color: #CC2D18; -} - -/* Nav pills */ -.nav-pills > li.active > a, -.nav-pills > li.active > a:hover, -.nav-pills > li.active > a:focus { - color: #fff; - background-color: #6A5687; -} - -/* Panel */ -.panel-primary { border-color: #6A5687; } -.panel-primary > .panel-heading { color: #fff; background-color: #6A5687; border-color: #6A5687; } -.panel-primary > .panel-heading + .panel-collapse > .panel-body { border-top-color: #6A5687; } -.panel-primary > .panel-heading .badge { color: #6A5687; } -.panel-primary > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #6A5687; } - -.panel-success { border-color: #677835; } -.panel-success > .panel-heading { color: #fff; background-color: #677835; border-color: #677835; } -.panel-success > .panel-heading + .panel-collapse > .panel-body { border-top-color: #677835; } -.panel-success > .panel-heading .badge { color: #677835; } -.panel-success > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #677835; } - -.panel-info { border-color: #11809E; } -.panel-info > .panel-heading { color: #fff; background-color: #11809E; border-color: #11809E; } -.panel-info > .panel-heading + .panel-collapse > .panel-body { border-top-color: #11809E; } -.panel-info > .panel-heading .badge { color: #11809E; } -.panel-info > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #11809E; } - -.panel-warning { border-color: #EB7239; } -.panel-warning > .panel-heading { color: #fff; background-color: #EB7239; border-color: #EB7239; } -.panel-warning > .panel-heading + .panel-collapse > .panel-body { border-top-color: #EB7239; } -.panel-warning > .panel-heading .badge { color: #EB7239; } -.panel-warning > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #EB7239; } - -.panel-danger { border-color: #CC2D18; } -.panel-danger > .panel-heading { color: #fff; background-color: #CC2D18; border-color: #CC2D18; } -.panel-danger > .panel-heading + .panel-collapse > .panel-body { border-top-color: #CC2D18; } -.panel-danger > .panel-heading .badge { color: #CC2D18; } -.panel-danger > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #CC2D18; } - -/* Modal header title */ -.modal-header h1,.modal-header h2,.modal-header h3, -.modal-header h4,.modal-header h5,.modal-header h6 { - font-size: 24px; -} - -/* Popover (import Mattermost) */ -.popover { - -moz-border-radius:3px; - -webkit-border-radius:3px; - border-radius:3px; -} - -.popover.bottom>.arrow:after,.popover.right>.arrow:after,.popover.top>.arrow:after,.popover.left>.arrow:after { - border-color:transparent; -} - -.popover .popover-title { - background:rgba(0,0,0,0.05); - line-height:18px; -} - -/* Navigation interne (hors container) */ - -#internav ul { - margin-top: 0px; - margin-bottom: -10px; -} -#internav li a { - color: #666; - padding: 12px 15px; - text-decoration: none; - border:none !important; - line-height: 14px; -} -#internav li a:hover, -#internav li a:focus, -#internav li a.active { - background: #767676; - color: #fff; -} - -#internav form div { - margin-top: 4px; - margin-left: 25px -} - -/* Carousel */ -.carousel { - margin:1em auto 4em; - max-width:1060px; -} - -.carousel-inner { - padding-bottom:75px; - box-shadow: $carousel-ombre; -} - -.carousel-inner > .item { - position: absolute; - top: -999999em; - display: block; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} -.carousel-inner > .active { - top: 0; -} -.carousel-inner > .active, -.carousel-inner > .next, -.carousel-inner > .prev { - position: relative; -} -.carousel-inner > .next, -.carousel-inner > .prev { - position: absolute; - top: 0; - width: 100%; -} - -.carousel-control.right, .carousel-control.left{ - background-image:none !important; - color:#eee!important; -} - -#play-pause { - position: absolute; - margin-top: -100px; - margin-left:30px; - left: 0%; -} - -#play-pause a { - cursor: pointer; - font-size: 30px; - z-index: 1000 !important; - background: #f3f3f3 !important; - border-radius: 30px; - color: #767676 !important; - width: 40px; - height: 40px; - padding-left: 2px; - padding-top: 2px; - position:absolute!important; - opacity:1; - text-shadow:none; - box-shadow:0px 1px 1px rgba(50, 50, 50, 0.5); -} -#play-pause a:hover { - color: #555 !important; -} - -/* Carousel Wordpress */ -#imageslider #play-pause { - margin-top: 20px; - margin-left: 0; - background: none !important; -} - -.carousel a{ - border-bottom: none!important; -} - -.carousel-caption{ - background: #f3f3f3 !important; - bottom:-75px!important; - color: #333 !important; - left:0!important; - right:0!important; - position:absolute!important; - height:78px !important; - text-shadow:none; - border-top:1px solid #ddd; -} - -.carousel-caption .h3 { - margin-top:10px; -} - -.carousel img { - width:100%; - margin:0; -} - -/* Cleaning */ -h1 a, h2 a, h3 a, h4 a, h5 a, h6 a, -.breadcrumb a, -a.btn, -a.label, -.nav-pills a, -.nav-container a, -.dropdown-menu a, -.nav a, -menu a { text-decoration:none !important;} - -#mypads .container.ombre { - margin-top:0; - margin-bottom:0; -} - -/* a11y (https://github.com/paypal/bootstrap-accessibility-plugin) */ -.btn:focus, -.btn.active:focus { - outline: dotted 1px black; -} - -.btn-primary:focus, -.btn-primary.active:focus, -.btn-success:focus, -.btn-success.active:focus, -.btn-info:focus, -.btn-info.active:focus, -.btn-warning:focus, -.btn-warning.active:focus, -.btn-danger:focus, -.btn-danger.active:focus, -.btn-soutenir:focus, -.btn-soutenir.active:focus { - outline: dotted 1px white; -} - -a:focus { - outline: dotted 1px black; -} - -.bg-primary a:focus, -a.bg-primary:focus { - outline: dotted 1px white; -} - -.close:hover, .close:focus { - outline: dotted 1px black; -} - -.nav > li > a:focus { - outline: dotted 1px black; -} - -cite { - font-style:italic; -} - -.modal-open .modal-backdrop { - z-index: 9 !important; -} +@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"; diff --git a/app/components/pages/Home.vue b/app/components/pages/Home.vue index 4869f31..3702c00 100644 --- a/app/components/pages/Home.vue +++ b/app/components/pages/Home.vue @@ -9,7 +9,7 @@ -

{{ $t('warning.title') }}

+

@@ -18,9 +18,9 @@
- {{ $t('public.title') }} +
- +
- {{ $t('public.warning') }} -
- {{ $t('public.samename') }} + +
+
@@ -46,7 +46,8 @@
@@ -60,10 +61,10 @@
-

{{ $t('what.title') }}

-

{{ $t('what.desc') }}

-

{{ $t('what.desc2') }}

-

{{ $t('how.title') }}

+

+

+

+

diff --git a/app/components/partials/Header.vue b/app/components/partials/Header.vue index b2949a8..4764b06 100644 --- a/app/components/partials/Header.vue +++ b/app/components/partials/Header.vue @@ -4,9 +4,9 @@

- +

-

{{ $t("meta.lead") }}

+

diff --git a/app/components/partials/I18n.vue b/app/components/partials/I18n.vue index 69523bc..1e8eca5 100644 --- a/app/components/partials/I18n.vue +++ b/app/components/partials/I18n.vue @@ -4,7 +4,7 @@ diff --git a/app/data.yml b/app/data.yml index 080b0b4..e9f7617 100644 --- a/app/data.yml +++ b/app/data.yml @@ -1,4 +1,46 @@ meta: - name: Framacalc - baseURL: https://framacalc.org - framaname: Framacalc + title: Framacalc + author: Framasoft + canonical: https://framacalc.org + i18n: http://trad.framasoft.org/iteration/view/framacalc/master + +txt: + soft: Framasoft + calc: Framacalc + pad: Framapad + +color: + soft: Framasoft + calc: Framacalc + pad: Framapad + +link: + soft: https://framasoft.org + dio: https://degooglisons-internet.org + cuo: https://contributopia.org + soutenir: https://soutenir.framasoft.org + contact: https://contact.framasoft.org + participer: https://participer.framasoft.org + calc: https://framacalc.org + pad: https://framapad.org + +html: + soft: Framasoft + calc: Framacalc + pad: Framapad + +license: + lal: 'Art Libre' + cc0: 'Creative Commons 0' + ccby3: 'Creative Commons By 3.0' + ccby4: 'Creative Commons By 4.0' + ccbysa3: 'Creative Commons By-SA 3.0' + ccbysa4: 'Creative Commons By-SA 4.0' + ccbysa2fr: 'Creative Commons By-SA 2.0' + ccbysa3fr: 'Creative Commons By-SA 3.0' + ccbysa4fr: 'Creative Commons By-SA 4.0' + gpl2: 'GNU GPL v2' + gpl3: 'GNU GPL v3' + gnufdl: 'GNU FDL' + agpl3: 'GNU AGPL v3' + apache2: 'Apache 2.0' diff --git a/app/index.js b/app/index.js index f10f92f..1142621 100644 --- a/app/index.js +++ b/app/index.js @@ -3,12 +3,11 @@ import VueRouter from 'vue-router'; import VueI18n from 'vue-i18n'; import vueHeadful from 'vue-headful'; -import '../node_modules/bootstrap/dist/css/bootstrap.css'; -import '../node_modules/fork-awesome/css/fork-awesome.css'; - import App from './App.vue'; import Home from './components/pages/Home.vue'; +import './assets/scss/bootstrap.scss'; +import '../node_modules/fork-awesome/css/fork-awesome.css'; import './assets/scss/main.scss'; Vue.use(VueRouter); @@ -41,7 +40,7 @@ let defaultRouteLang = ''; const messages = {}; messages.locales = require('./lang.yml'); // eslint-disable-line -messages.locales.avalaible = locales; +messages.locales.avalaible = Object.keys(messages.locales).filter(n => locales.indexOf(n) > -1); // Data import messages.data = {}; @@ -50,7 +49,7 @@ messages.data['/'] = `/${process.env.BASE_URL.replace(/(.+)/, '$1/')}`; messages.data['/img/'] = `${messages.data['/']}img/`; const routes = [ - { path: '/', component: Home }, + { path: '/', component: Home, meta: { id: 'home' } }, ]; for (let i = 0; i < locales.length; i += 1) { @@ -72,6 +71,7 @@ for (let i = 0; i < locales.length; i += 1) { routes.push({ path: `/${locales[i]}${pages[j].toLowerCase().replace(/^/, '/').replace('/home', '')}`, component: component.default, + meta: { id: pages[j].toLowerCase() }, }); } } diff --git a/app/locales/en.yml b/app/locales/en.yml index 1fcb303..7601bcf 100644 --- a/app/locales/en.yml +++ b/app/locales/en.yml @@ -1,25 +1,17 @@ meta: - title: '@:data.meta.name - Online collaborative spreadsheet' + title: '@:data.txt.calc - Online collaborative spreadsheet' lead: Online collaborative spreadsheet nav: langChange: Change language lang: Language what: - title: What is @:data.meta.name? - desc: 'A "calc" is an online collaborative spreadsheet. - + title: What is @:data.txt.calc? + desc: 'A “calc“ is an online collaborative spreadsheet. Your data is automatically saved on the internet, and - your friends can collaborate on the document at the same time. - - View all changes in real time! - - ' + View all changes in real time!' desc2: 'Work together on your inventories, your surveys, - - your content, your meetings and much more! - - ' + your content, your meetings and much more!' how: title: Features collab: Collaborative editing (several users connected to the same spreadsheet can @@ -30,13 +22,9 @@ how: graph: Basic graphs (histogram, lines, points) export: HTML export, CSV size: 'Document size: up to 100,000 lines' - share: '@:data.meta.framaname documents are easy to share (just provide the address), - + share: '@:data.color.calc documents are easy to share (just provide the address), to export (to HTML, CSV), are saved permanently and automatically, - - and remain always accessible by Internet - - ' + and remain always accessible by Internet' demo: Want a demonstration? public: title: Options @@ -44,61 +32,39 @@ public: warning: Do not choose a name too simple. samename: Anyone using the same calc name will access your content. help: 'Your calc will be deleted after one year of inactivity - (no access, no modification), in order to avoid enlargement of - - our database indefinitely. - - ' + our database indefinitely.' create: Create a calc warning: title: Important close: Close - text1: Ethercalc, the software that powers @:data.meta.framaname, currently suffers + text1: Ethercalc, the software that powers @:data.color.calc, currently suffers from various bugs that make the service unstable. text2: 'We decided to host any new calc on a - new installation of Ethercalc, which is proposed with less than - functionalities (no more import, no more multi-sheet calc), - - to improve its stability (fewer crashes). - - ' + to improve its stability (fewer crashes).' text3: Your old layers remain available at the web address you carefully bookmarked. text4: Developers, think of contribute to Ethercalc ! help: title: Getting Started desc: 'The interface has some differences compared to other spreadsheets. - - They can be confusing. - - ' + They can be confusing.' desc2: 'If you need a hand, the answer to your questions may be there:' desc3: Otherwise, do not hesitate to contact us. faq: F.A.Q. software: title: Software - basedon: '@:data.meta.framaname is based on free software' + basedon: '@:data.color.calc is based on free software' license: 'Ethercalc is under - CPAL license - - and uses many free libraries. - - ' + and uses many free libraries.' garden: title: Cultivate your garden contrib: 'To participate in the development of the software, suggest improvements - - or simply download it, go to - - ' + or simply download it, go to' devsite: the development site install: 'If you wish to install this software for your own use - - and thus gain in autonomy, we help you on : - - ' + and thus gain in autonomy, we help you on :' framacloud: https://framacloud.org/fr/cultiver-son-jardin/ethercalc.html diff --git a/app/locales/fr.yml b/app/locales/fr.yml index e814f52..dee5549 100644 --- a/app/locales/fr.yml +++ b/app/locales/fr.yml @@ -1,25 +1,18 @@ meta: - title: '@:data.meta.name - Tableur collaboratif en ligne' + title: '@:data.txt.calc - Tableur collaboratif en ligne' lead: Tableur collaboratif en ligne nav: langChange: Changer la langue lang: Langage + translate: Traduire what: - title: Qu’est ce que @:data.meta.name ? + title: Qu’est ce que @:data.txt.calc ? desc: 'Un « calc » est un tableur collaboratif en ligne. - Vos données sont automatiquement sauvegardées sur internet, et - vos amis peuvent collaborer sur le document en même temps. - - Visualisez tous les changements en temps réel ! - - ' + Visualisez tous les changements en temps réel !' desc2: 'Travaillez ensemble sur vos inventaires, vos sondages, - - vos contenus, vos réunions et bien plus ! - - ' + vos contenus, vos réunions et bien plus !' how: title: Fonctionnalités collab: Édition collaborative (plusieurs utilisateurs connectés à la même feuille @@ -30,15 +23,11 @@ how: autosave: Sauvegarde permanente et automatique graph: Graphiques de base (histogramme, lignes, points) export: Export HTML, CSV - size: 'Taille du document : jusqu’à 100 000 lignes' - share: 'Les documents @:data.meta.framaname sont faciles à partager (il suffit d’en + size: 'Taille du document : jusqu’à 100 000 lignes' + share: 'Les documents @:data.color.calc sont faciles à partager (il suffit d’en communiquer l’adresse), - à exporter (en HTML, CSV), sont sauvegardés en permanence et automatiquement, - - et restent toujours accessibles par internet - - ' + et restent toujours accessibles par internet' demo: Envie d’une démonstration ? public: title: Options @@ -46,27 +35,18 @@ public: warning: Ne choisissez pas un nom trop simple. samename: Toute personne utilisant le même nom de calc accédera à votre contenu. help: 'Votre calc sera supprimé au bout d’un an d’inactivité - (aucun accès, aucune modification), afin d’éviter de faire grossir - - indéfiniment notre base de données. - - ' + indéfiniment notre base de données.' create: Créer un calc warning: title: Important close: Fermer - text1: Ethercalc, le logiciel qui propulse @:data.meta.framaname, souffre actuellement + text1: Ethercalc, le logiciel qui propulse @:data.color.calc, souffre actuellement de divers bugs qui rendent le service instable. text2: 'Nous avons décidé d’héberger tout nouveau calc sur une - nouvelle installation d’Ethercalc, qui est proposée avec moins de - fonctionnalités (plus d’import, plus de calc à feuilles multiples), - - afin d’améliorer sa stabilité (moins de plantages). - - ' + afin d’améliorer sa stabilité (moins de plantages).' text3: Vos anciens calcs restent disponibles à l’adresse web que vous avez soigneusement enregistrée. text4: Développeur·euse·s, pensez à contribuer @@ -74,35 +54,22 @@ warning: help: title: Prise en main desc: 'L’interface présente quelques différences par rapport à d’autres tableurs. - - Elles peuvent être déroutantes. - - ' + Elles peuvent être déroutantes.' desc2: 'Si vous avez besoin d’un coup de main, la réponse à vos questions se trouve - peut-être là :' + peut-être là :' desc3: Sinon, n’hésitez pas à nous contacter. faq: F.A.Q. software: title: Le logiciel - basedon: '@:data.meta.framaname repose sur le logiciel libre' + basedon: '@:data.color.calc repose sur le logiciel libre' license: 'Ethercalc est sous licence - CPAL - - et fait appel à de nombreuses librairies libres. - - ' + et fait appel à de nombreuses librairies libres.' garden: title: Cultivez votre jardin contrib: 'Pour participer au développement du logiciel, proposer des améliorations - - ou simplement le télécharger, rendez-vous sur - - ' + ou simplement le télécharger, rendez-vous sur' devsite: le site de développement install: 'Si vous souhaitez installer ce logiciel pour votre propre usage - - et ainsi gagner en autonomie, nous vous aidons sur : - - ' + et ainsi gagner en autonomie, nous vous aidons sur :' framacloud: https://framacloud.org/fr/cultiver-son-jardin/ethercalc.html diff --git a/app/locales/it.yml b/app/locales/it.yml index a0c82a1..c3c10ad 100644 --- a/app/locales/it.yml +++ b/app/locales/it.yml @@ -1,25 +1,18 @@ meta: - title: '@:data.meta.name - Foglio di calcolo collaborativo online' + title: '@:data.txt.calc - Foglio di calcolo collaborativo online' lead: Foglio di calcolo collaborativo online nav: langChange: Cambia lingua lang: Lingua + translate: Tradurre what: - title: Cosa è @:data.meta.name? - desc: 'Un "calc" è un foglio di calcolo collaborativo online. - + title: Cosa è @:data.txt.calc? + desc: 'Un “calc” è un foglio di calcolo collaborativo online. I tuoi dati sono automaticamente salvati in internet, e - i tuoi amici possono collaborare al documento allo stesso tempo. - - Vedi tutti i cambiamenti in tempo reale! - - ' + Vedi tutti i cambiamenti in tempo reale!' desc2: 'Lavorate insieme ai vostri cataloghi, i vostri sondaggi, - - il vostro contenuto, i vostri incontri e molto di più! - - ' + il vostro contenuto, i vostri incontri e molto di più!' how: title: Caratteristiche collab: Modifiche collaborative (più utenti collegati allo stesso foglio di calcolo @@ -31,13 +24,9 @@ how: graph: Grafici di base (istogrammi, linee, punti) export: Esportazione in HTML, CSV size: 'Dimensioni del document: fino a 100,000 righe' - share: 'I documenti @:data.meta.framaname sono facili da condividere (basta fornire l'indirizzo), - + share: 'I documenti @:data.color.calc sono facili da condividere (basta fornire l'indirizzo), da esportare (come HTML, CSV), sono salvati automaticamente e permanentemente, - - e rimangono sempre accessibili in Internet - - ' + e rimangono sempre accessibili in Internet' demo: Vuoi una dimostrazione? public: title: Opzioni @@ -45,61 +34,40 @@ public: warning: Non scegliere un nome troppo semplice. samename: Chiunque usi lo stesso nome di calc accederà al tuo contenuto. help: 'Il tuo calc verrà eliminato dopo un anno di inattività - (nessun accesso, nessuna modifica), per evitare una crescita esagerata - - del nostro database. - - ' + del nostro database.' create: Crea un calc warning: title: Importante close: Chiudi - text1: Ethercalc, il software alla base di @:data.meta.framaname, soffre + text1: Ethercalc, il software alla base di @:data.color.calc, soffre al momento di diversi bug che rendono il servizio instabile. text2: 'Abbiamo deciso di ospitare qualsiasi nuovo calc su una - nuova installazione di Ethercalc, che provvede meno - funzionalità (niente importazione, niente calc multifoglio), - - per migliorare la sua stabilità (meno crash). - - ' + per migliorare la sua stabilità (meno crash).' text3: I tuoi vecchi layer restano disponibili al vecchio indirizzo, se lo hai messo tra i preferiti text4: Sviluppatori, pensate di contribuire a Ethercalc ! help: title: Per iniziare - desc: 'L''interfaccia ha qualche differenza rispetto ad altri fogli di calcolo. - - Questo può confondere. - - ' + desc: 'L’interfaccia ha qualche differenza rispetto ad altri fogli di calcolo. + Questo può confondere.' desc2: 'Se hai bisogno di aiuto, la risposta alle tue domande può trovarsi qui:' desc3: Altrimenti, non esitare a contattarci. faq: F.A.Q. software: title: Software - basedon: '@:data.meta.framaname si basa su software libero' + basedon: '@:data.color.calc si basa su software libero' license: 'Ethercalc è sotto licenza - CPAL - - e utilizza molte librerie libere. - - ' + e utilizza molte librerie libere.' garden: title: Coltiva il tuo orto contrib: 'Per partecipare allo sviluppo del software, suggerire migliorie - o semplicemente scaricarlo, vai a' devsite: il sito di sviluppo install: 'Se vuoi installare questo software per il tuo uso personale - - e ottenere così maggiore autonomia, ti aiutiamo su: - - - ' + e ottenere così maggiore autonomia, ti aiutiamo su:' framacloud: https://framacloud.org/fr/cultiver-son-jardin/ethercalc.html diff --git a/package-lock.json b/package-lock.json index 28e5154..9a63dbf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1882,10 +1882,10 @@ "hoek": "2.16.3" } }, - "bootstrap": { + "bootstrap-sass": { "version": "3.3.7", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", - "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E=" + "resolved": "https://registry.npmjs.org/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz", + "integrity": "sha1-ZZbHq0D2Y3OTMjqwvIDQZPxjBJg=" }, "brace-expansion": { "version": "1.1.11", diff --git a/package.json b/package.json index 02eae13..e11980d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "prod": "cross-env NODE_ENV=production webpack --progress --hide-modules --mode production" }, "dependencies": { - "bootstrap": "^3.3.7", + "bootstrap-sass": "^3.3.7", "fork-awesome": "^1.1.0", "jquery": "^3.3.1", "uiv": "^0.23.1", -- GitLab