Commit 0a76b670 authored by JosephK's avatar JosephK
Browse files

[deframa] update closed & restricted services

parent d3a29ea1
Pipeline #405145 passed with stages
in 2 minutes and 19 seconds
......@@ -70,12 +70,12 @@ export default {
/* Fill with empty string */
while (preloadList.length < nodes) {
preloadList.push('');
preloadList.push('/favicon.ico');
}
for (let i = 0; i < preloadList.length; i += 1) {
let type = '';
if (/\.(png|jpg|gif|webp)$/.test(preloadList[i])) { type = 'image'; }
if (/\.(png|jpg|gif|webp|ico)$/.test(preloadList[i])) { type = 'image'; }
if (/\.(ttf|eot|woff|woff2)$/.test(preloadList[i])) { type = 'font'; }
if (/\.(webm|mp4)$/.test(preloadList[i])) { type = 'video'; }
......
body {
background: c(g, 3);
background: var(--f-g3);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
......@@ -27,7 +27,7 @@ header {
}
header .lead {
color: c(g, 7);
color: var(--f-g7);
font: italic 1.5em/1.5 Roboto,sans-serif;
margin: 0;
}
......@@ -144,7 +144,7 @@ iframe {
li,
p {
color: c(g, 9);
color: var(--f-g9);
font-size: 19px;
line-height: 30px;
}
......@@ -171,12 +171,12 @@ iframe {
}
}
#list .modal-header { background: c(f, 2); }
#alternatives .modal-header { background:c(o, 2); }
#list .modal-header { background: var(--f-f2); }
#alternatives .modal-header { background:var(--f-o2); }
.precisions {
font-size: small;
color: c(g, 6);
color: var(--f-g6);
line-height: 20px;
margin-left: 15px;
}
......@@ -254,7 +254,7 @@ a.anchor{
.table-hover > tbody > tr {
td {
padding-top: 42px;
background: c(d, 1);
background: var(--f-d1);
&:first-child {
padding-top: 6px;
......@@ -263,10 +263,10 @@ a.anchor{
&:hover {
td {
background-color: c(v, 2);
background-color: var(--f-v2);
&:first-child {
background-color: c(r, 3);
background-color: var(--f-r3);
}
}
}
......@@ -340,16 +340,42 @@ a.anchor{
/* Closed services */
.list-group-item a[href$="framabee.org"],
.list-group-item a[href$="my.framasoft.org"],
.list-group-item a[href$="framanews.org"],
.list-group-item a[href$="framapic.org"],
.list-group-item a[href$="framavectoriel.org"],
a[href$="framabee.org"].btn,
.list-group-item a[href$="my.framasoft.org"],
a[href$="my.framasoft.org"].btn,
.list-group-item a[href$="framanews.org"],
a[href$="framanews.org"].btn,
.list-group-item a[href$="framapic.org"],
a[href$="framapic.org"].btn,
a[href$="framavectoriel.org"].btn {
color: c(g, 7);
fill: c(g, 6);
background: repeating-linear-gradient( -45deg, #fff, #fff 10px, c(j, 2) 10px, c(j, 2) 20px );
}
.list-group-item a[href$="framavectoriel.org"],
a[href$="framavectoriel.org"].btn,
.list-group-item a[href$="framabin.org"],
a[href$="framabin.org"].btn,
.list-group-item a[href$="framadrop.org"],
a[href$="framadrop.org"].btn,
.list-group-item a[href$="frama.link"],
a[href$="frama.link"].btn {
color: var(--f-g7);
fill: var(--f-g6);
background: repeating-linear-gradient( -45deg, #fff, #fff 10px, var(--f-r2) 10px, var(--f-r2) 20px );
}
/* Restricted services */
.list-group-item a[href$="framabag.org"],
a[href$="framabag.org"].btn,
.list-group-item a[href$="framanotes.org"],
a[href$="framanotes.org"].btn,
.list-group-item a[href$="framasphere.org"],
a[href$="framasphere.org"].btn,
.list-group-item a[href$="framaboard.org"],
a[href$="framaboard.org"].btn,
.list-group-item a[href$="framaslides.org"],
a[href$="framaslides.org"].btn {
color: var(--f-g7);
fill: var(--f-g6);
background: repeating-linear-gradient( -45deg, #fff, #fff 10px, var(--f-j2) 10px, var(--f-j2) 20px );
}
\ No newline at end of file
......@@ -34,7 +34,7 @@ body.index #mainHeader {
#bubbles {
min-height: 457px;
p {
background: c(v, 6);
background: var(--f-v6);
font-size: 18px;
line-height: 22px;
border: none;
......@@ -59,7 +59,7 @@ body.index #mainHeader {
}
.bbl:first-of-type p {
background: c(r, 8);
background: var(--f-r8);
animation: 1s fadeIn;
animation-fill-mode: forwards;
}
......@@ -70,7 +70,7 @@ body.index #mainHeader {
}
.bbl:last-of-type p {
background: c(f, 7);
background: var(--f-f7);
animation: 3s fadeIn;
animation-fill-mode: forwards;
}
......@@ -96,7 +96,7 @@ body.index #mainHeader {
}
.more h2 {
border-bottom: 8px solid c(g, 2);
border-bottom: 8px solid var(--f-g2);
}
.accroche {
......@@ -105,7 +105,7 @@ body.index #mainHeader {
/* ~~~~ Revue de presse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
#speakabout,#speakabout .container {
background:c(g, 8);
background:var(--f-g8);
box-shadow: none;
}
#speakabout a:not(.btn) {
......@@ -129,11 +129,11 @@ body.index #mainHeader {
/* ~~~~ Enjeux Dangers Solutions Concrètement ~~~~~~~~~~~~~~~~~~~~~~~ */
#enjeux {
background: c(r, 8);
background: var(--f-r8);
}
#solutions {
background:c(v, 6);
background:var(--f-v6);
}
#enjeux .container,
......
/* ~~~~ Liste des services ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#list main {
section {
border-bottom: 5px solid c(g, 2);
border-bottom: 5px solid var(--f-g2);
}
@media (min-width: 992px) {
......
......@@ -5,7 +5,7 @@
/* Brown variant
$bsColor: (('f', 7), ('m', 7), ('m', 8), ('m', 2), ('b', 7), ('v', 6), ('o', 7), ('r', 8), ('d', 7));
$bgcolor: c(m, 3);
$bgcolor: var(--f-m3);
$secondary: bs(c, 2);
$dark: bs(c, 3);
......
......@@ -12,7 +12,7 @@
height: 50px;
margin: 0 15px;
border: none;
background: c(g, 2);
background: var(--f-g2);
}
.nav {
......@@ -34,8 +34,8 @@
a {
padding: .5rem 1rem;
color: c(g, 7);
fill: c(g, 6);
color: var(--f-g7);
fill: var(--f-g6);
span span {
display:none;
......@@ -43,8 +43,8 @@
}
&.active a {
color: c(g, 8);
fill: c(g, 7);
color: var(--f-g8);
fill: var(--f-g7);
span span {
display: inline;
......@@ -66,8 +66,8 @@
white-space: no-wrap;
vertical-align: middle;
background-color: #fff;
color: c(g, 8);
fill: c(g, 8);
color: var(--f-g8);
fill: var(--f-g8);
}
.scroller-right{
......
......@@ -20,12 +20,12 @@
}
/* Classes pour utiliser la couleur de titre en arrière plan */
.fond-frama { background-color: c(f, 7) !important; }
.fond-soft { background-color: c(o, 7) !important; }
.fond-logiciel { background-color: c(b, 7) !important; }
.fond-culture { background-color: c(r, 8) !important; }
.fond-services { background-color: c(v, 6) !important; }
.fond-vrac { background-color: c(j, 7) !important; }
.fond-frama { background-color: var(--f-f7) !important; }
.fond-soft { background-color: var(--f-o7) !important; }
.fond-logiciel { background-color: var(--f-b7) !important; }
.fond-culture { background-color: var(--f-r8) !important; }
.fond-services { background-color: var(--f-v6) !important; }
.fond-vrac { background-color: var(--f-j7) !important; }
/* INTRO SECTION
–––––––––––––––––––––––––––––––––––––––––––––––––– */
......@@ -77,7 +77,7 @@
bottom: 0;
width: 400px;
padding: 15px;
background:c(g, 7);
background:var(--f-g7);
}
.timeline ul li div::before {
......@@ -96,15 +96,15 @@
.timeline ul li:nth-child(odd) div::before {
left: -15px;
border-width: 8px 16px 8px 0;
border-color: transparentc(g, 7) transparent transparent;
border-color: transparentvar(--f-g7) transparent transparent;
}
.timeline ul li:nth-child(odd) div.fond-frama::before { border-color: transparent c(f, 7) transparent transparent; }
.timeline ul li:nth-child(odd) div.fond-soft::before { border-color: transparent c(o, 7) transparent transparent; }
.timeline ul li:nth-child(odd) div.fond-logiciel::before { border-color: transparent c(b, 7) transparent transparent; }
.timeline ul li:nth-child(odd) div.fond-culture::before { border-color: transparent c(r, 8) transparent transparent; }
.timeline ul li:nth-child(odd) div.fond-services::before { border-color: transparent c(v, 6) transparent transparent; }
.timeline ul li:nth-child(odd) div.fond-vrac::before { border-color: transparent c(j, 7) transparent transparent; }
.timeline ul li:nth-child(odd) div.fond-frama::before { border-color: transparent var(--f-f7) transparent transparent; }
.timeline ul li:nth-child(odd) div.fond-soft::before { border-color: transparent var(--f-o7) transparent transparent; }
.timeline ul li:nth-child(odd) div.fond-logiciel::before { border-color: transparent var(--f-b7) transparent transparent; }
.timeline ul li:nth-child(odd) div.fond-culture::before { border-color: transparent var(--f-r8) transparent transparent; }
.timeline ul li:nth-child(odd) div.fond-services::before { border-color: transparent var(--f-v6) transparent transparent; }
.timeline ul li:nth-child(odd) div.fond-vrac::before { border-color: transparent var(--f-j7) transparent transparent; }
.timeline ul li:nth-child(even) div {
left: -439px;
}
......@@ -112,14 +112,14 @@
.timeline ul li:nth-child(even) div::before {
right: -15px;
border-width: 8px 0 8px 16px;
border-color: transparent transparent transparent c(g, 7);
border-color: transparent transparent transparent var(--f-g7);
}
.timeline ul li:nth-child(even) div.fond-frama::before { border-color: transparent transparent transparent c(f, 7); }
.timeline ul li:nth-child(even) div.fond-soft::before { border-color: transparent transparent transparent c(o, 7); }
.timeline ul li:nth-child(even) div.fond-logiciel::before { border-color: transparent transparent transparent c(b, 7); }
.timeline ul li:nth-child(even) div.fond-culture::before { border-color: transparent transparent transparent c(r, 8); }
.timeline ul li:nth-child(even) div.fond-services::before { border-color: transparent transparent transparent c(v, 6); }
.timeline ul li:nth-child(even) div.fond-vrac::before { border-color: transparent transparent transparent c(j, 7); }
.timeline ul li:nth-child(even) div.fond-frama::before { border-color: transparent transparent transparent var(--f-f7); }
.timeline ul li:nth-child(even) div.fond-soft::before { border-color: transparent transparent transparent var(--f-o7); }
.timeline ul li:nth-child(even) div.fond-logiciel::before { border-color: transparent transparent transparent var(--f-b7); }
.timeline ul li:nth-child(even) div.fond-culture::before { border-color: transparent transparent transparent var(--f-r8); }
.timeline ul li:nth-child(even) div.fond-services::before { border-color: transparent transparent transparent var(--f-v6); }
.timeline ul li:nth-child(even) div.fond-vrac::before { border-color: transparent transparent transparent var(--f-j7); }
time {
display: block;
......@@ -137,14 +137,14 @@
}
.timeline ul li.in-view::after {
background: c(g, 7);
background: var(--f-g7);
}
.timeline ul li.in-view.li-frama::after { background: c(f, 7); }
.timeline ul li.in-view.li-soft::after { background:c(o, 7); }
.timeline ul li.in-view.li-logiciel::after { background: c(b, 7); }
.timeline ul li.in-view.li-culture::after { background: c(r, 8); }
.timeline ul li.in-view.li-services::after { background: c(v, 6); }
.timeline ul li.in-view.li-vrac::after { background: c(j, 7); }
.timeline ul li.in-view.li-frama::after { background: var(--f-f7); }
.timeline ul li.in-view.li-soft::after { background:var(--f-o7); }
.timeline ul li.in-view.li-logiciel::after { background: var(--f-b7); }
.timeline ul li.in-view.li-culture::after { background: var(--f-r8); }
.timeline ul li.in-view.li-services::after { background: var(--f-v6); }
.timeline ul li.in-view.li-vrac::after { background: var(--f-j7); }
.timeline ul li div {
visibility: hidden;
......@@ -196,7 +196,7 @@
.timeline ul li:nth-child(even) div::before {
left: -15px;
border-width: 8px 16px 8px 0;
border-color: transparent c(g, 7) transparent transparent;
border-color: transparent var(--f-g7) transparent transparent;
}
}
}
<template>
<b-dd
id="f-i18n"
ref="f-i18n"
right
variant="outline-secondary"
:title="$t('nav.langChange', '-t')"
>
<template v-slot:button-content>
<svg-icon
name="language"
size="lg"
:label="$t('nav.lang', '-t')"
sr-only
/>
</template>
<li
v-for="lang in locales.visible"
:key="lang"
>
<b-link
:to="`/${lang}/${($route.path.split('/')[2] || '')}`"
class="dropdown-item"
@click.native="changeLanguage(lang)"
v-text="locales[lang]"
/>
</li>
<b-dd-divider v-if="$te('meta.i18n')" />
<li v-if="$te('meta.i18n')">
<a
:href="$t('meta.i18n')"
class="dropdown-item"
>
<svg-icon
name="plus"
:label="$t('nav.translate')"
/>
</a>
</li>
</b-dd>
</template>
<script>
export default {
data() {
return {
currentComponent: '',
locales: this.$i18n.messages.locales,
};
},
methods: {
changeLanguage(lang) {
this.$i18n.locale = lang;
[this.currentComponent] = [this.$route.path.split('/')[2]];
this.$refs['f-i18n'].hide(true);
},
},
};
</script>
......@@ -13,6 +13,7 @@ commons: # import everything if empty
# - country
- doc
# - emoji
- flag
- git
- icon
- license
......@@ -21,6 +22,7 @@ commons: # import everything if empty
- soft
- src
- status
- svg
- taxonomy
meta:
......
......@@ -23,16 +23,16 @@
<meta name="twitter:title" content="">
<meta name="twitter:image" content="">
<link id="preload-0" rel="preload" href="" as="">
<link id="preload-1" rel="preload" href="" as="">
<link id="preload-2" rel="preload" href="" as="">
<link id="preload-3" rel="preload" href="" as="">
<link id="preload-4" rel="preload" href="" as="">
<link id="preload-5" rel="preload" href="" as="">
<link id="preload-6" rel="preload" href="" as="">
<link id="preload-7" rel="preload" href="" as="">
<link id="preload-8" rel="preload" href="" as="">
<link id="preload-9" rel="preload" href="" as="">
<link id="preload-0" rel="preload" href="/favicon.ico" as="image">
<link id="preload-1" rel="preload" href="/favicon.ico" as="image">
<link id="preload-2" rel="preload" href="/favicon.ico" as="image">
<link id="preload-3" rel="preload" href="/favicon.ico" as="image">
<link id="preload-4" rel="preload" href="/favicon.ico" as="image">
<link id="preload-5" rel="preload" href="/favicon.ico" as="image">
<link id="preload-6" rel="preload" href="/favicon.ico" as="image">
<link id="preload-7" rel="preload" href="/favicon.ico" as="image">
<link id="preload-8" rel="preload" href="/favicon.ico" as="image">
<link id="preload-9" rel="preload" href="/favicon.ico" as="image">
</head>
<body>
<div id="app"></div>
......
......@@ -28,7 +28,7 @@ for (let i = 0; i < process.argv.length; i += 1) {
}
}
const assets = [];
const assets = [{ from: path.resolve(__dirname, './app/assets/img/icons/favicon.ico'), to: 'favicon.ico' }];
fs.readdirSync('./app/assets').forEach((file) => {
if (!/scss/.test(file)) {
assets.push({ from: path.resolve(__dirname, `./app/assets/${file}`), to: file });
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment