diff --git a/squelettes/content/article.html b/squelettes/content/article.html index a3246ae..9b39681 100644 --- a/squelettes/content/article.html +++ b/squelettes/content/article.html @@ -16,16 +16,15 @@
#MODELE{article_traductions} + - - | - - +

+
diff --git a/squelettes/modeles/mots.html b/squelettes/modeles/mots.html new file mode 100644 index 0000000..ce8fcc4 --- /dev/null +++ b/squelettes/modeles/mots.html @@ -0,0 +1,6 @@ + +
diff --git a/squelettes/scss/base/_main.scss b/squelettes/scss/base/_main.scss index 364d179..bd860e7 100755 --- a/squelettes/scss/base/_main.scss +++ b/squelettes/scss/base/_main.scss @@ -41,9 +41,6 @@ a { &:link { transition: .3s; } - &:visited { - color: inherit; - } &:focus { outline: thin dotted; text-shadow: none; diff --git a/squelettes/scss/base/_typo.scss b/squelettes/scss/base/_typo.scss index 4ddee59..5681e20 100644 --- a/squelettes/scss/base/_typo.scss +++ b/squelettes/scss/base/_typo.scss @@ -21,6 +21,10 @@ +.fas { + font-family:Fontawesome; + color:$couleurPrincipale; +} @@ -58,9 +62,6 @@ html.rtl * { a { text-decoration: none; color: $couleur-lien; - &:visited { - color: $couleur-lien; - } &:hover { text-decoration: underline; color: $couleur-lien-hover; diff --git a/squelettes/scss/blocs/_breadcrump.scss b/squelettes/scss/blocs/_breadcrump.scss index 46b5ec8..79a8ae8 100644 --- a/squelettes/scss/blocs/_breadcrump.scss +++ b/squelettes/scss/blocs/_breadcrump.scss @@ -17,8 +17,7 @@ .arbo * { font-weight: normal; } -.arbo, .arbo a, -.arbo a:visited { +.arbo, .arbo a { color: lighten($couleurTexte, 30%); } .arbo a:hover { diff --git a/squelettes/scss/blocs/_content.scss b/squelettes/scss/blocs/_content.scss index 5385210..cf990f4 100644 --- a/squelettes/scss/blocs/_content.scss +++ b/squelettes/scss/blocs/_content.scss @@ -27,6 +27,10 @@ .article__logo { margin-bottom: 2em; } +.mots { + margin:0; +} + //--------------------------------------- // Résumés d'articles @@ -93,3 +97,10 @@ float:left; } } + +.mots { + + ul { + @include list-separator; + } +} diff --git a/squelettes/scss/blocs/_footer.scss b/squelettes/scss/blocs/_footer.scss index 1bac249..e4c8c5d 100644 --- a/squelettes/scss/blocs/_footer.scss +++ b/squelettes/scss/blocs/_footer.scss @@ -9,7 +9,14 @@ display:inline-block; margin:0 0.4em; border:0; - &, &:visited { color:white; } + color:white; + } + .page_connexplus { + @include clearfix; + padding-bottom:($spacer*1.5); + a { + color:$grayDark; + } } .menus_footer { diff --git a/squelettes/scss/styles/_nav.scss b/squelettes/scss/styles/_nav.scss index 78605e4..e7411da 100644 --- a/squelettes/scss/styles/_nav.scss +++ b/squelettes/scss/styles/_nav.scss @@ -27,7 +27,7 @@ display:inline; line-height:1.2; } - a, a:visited { + a { display: inline-block; padding:0.3em 0 0.2em; margin:0 0.5em 0.4em; diff --git a/squelettes/scss/utils/_mixins.scss b/squelettes/scss/utils/_mixins.scss index 2d93a85..706793c 100644 --- a/squelettes/scss/utils/_mixins.scss +++ b/squelettes/scss/utils/_mixins.scss @@ -93,31 +93,65 @@ } } -@mixin bouton($couleur, $texte:#FFF) { - display: inline-block; - height: em(30px); - line-height: em(30px); - padding: 0 1.5em; - background-color: $couleur; - border: none; - border-radius: em(15px); - box-shadow: none; - text-align: center; - white-space: nowrap; - color: $texte; - transition: background 0.3s; - cursor: pointer; - &:hover, - &:focus { - background-color: $couleur-boutons-hover; - text-decoration: none; - } - &[disabled=disabled] { - background: desaturate($couleur, 45%); - color: darken($texte, 10%) !important; - } +@mixin clearfix() { + &:after, &:before { + display:block; + content:''; + clear:both; + } } + +@mixin bouton($couleur:$grayLightL5, $texte:#FFF) { + +$couleurSaturate : saturate($couleur, 45%); +$couleurSaturateLight : lighten($couleurSaturate, 10%); + + display: inline-block; +/* height: $spacer*2; */ + line-height: 1.2; + padding: ($spacer/3) $spacer ($spacer/2); + background-color: $couleur; + border: none; + border-radius: $spacer; + box-shadow: none; + text-align: center; +/* white-space: nowrap; */ + color: $texte; + transition: background 0.3s; + cursor: pointer; + &:hover { + background-color: darken($couleur,15%); + text-decoration: none; + color: $texte; + } + &:focus { + background-color: $couleurSaturateLight !important; + text-decoration: none; + color: $texte; + } + &[disabled=disabled] { + background: desaturate($couleur, 45%); + color: darken($texte, 10%) !important; + } + .fas { + padding-left:em(6px); + &:before { + font-size:em(20px); + line-height:$spacer; + font-weight:700; + color: $texte; + } + } + &:hover .fas:before { + color: $texte; + } + &:focus .fas:before { + color: $texte; + } +} + + @mixin list-reset() { list-style: none; margin: 0; diff --git a/squelettes/scss/utils/_variables.scss b/squelettes/scss/utils/_variables.scss index ffe4768..2fb0265 100644 --- a/squelettes/scss/utils/_variables.scss +++ b/squelettes/scss/utils/_variables.scss @@ -23,6 +23,7 @@ $grayDarker: #222; $grayDark: #333; $gray: #555; $grayLight: #999; +$grayLightL5: lighten($grayLight,5%); $grayLighter: #eee; $white: #fff;