armentieres: adjust typo and colors (#70745)

This commit is contained in:
Corentin Sechet 2022-11-21 22:00:41 +01:00
parent 2c4d560d51
commit 1c642f16dc
6 changed files with 36 additions and 34 deletions

View File

@ -5,10 +5,6 @@
background-position: center;
color: white;
h1 {
font-size: 48em / $base-font;
}
&--default {
display: none;
}
@ -32,6 +28,8 @@ div#sidebar {
div.cell h2:first-child {
display: flex;
align-items: center;
color: $red;
font-size: $fz-3;
&::after {
content: '';
background: $gray-light;
@ -63,7 +61,6 @@ div#sidebar {
border: $yellow solid $gray;
color: black;
display: flex;
font-size: $fz-3;
align-items: center;
height: 4rem;
margin: 0;
@ -211,15 +208,14 @@ div.wcscurrentformscell {
h2:first-child {
color: black;
background: transparent;
font-size: $fz-3;
margin-bottom: 0.5rem;
}
}
// Custom elements
.arm-salmon {
color: $salmon;
.arm-red {
color: $red;
}
@mixin custom-background-cell($background, $button-color) {
@ -236,7 +232,6 @@ div.wcscurrentformscell {
.gru-content .cell {
&.arm-report {
@include custom-background-cell('/assets/report:background', $secondary-color);
font-size: 120%;
padding: 2rem;
}

View File

@ -1,14 +1,22 @@
// Typos
h1 {
font-size: $fz-1;
font-family: 'Archivo Black', 'Rubik', sans-serif;
}
h2 {
font-size: $fz-2;
font-family: 'Viga', 'Rubik', sans-serif;
}
h3 {
font-size: $fz-3;
font-family: 'Viga', 'Rubik', sans-serif;
}
h4 {
font-size: $fz-4;
font-family: 'Viga', 'Rubik', sans-serif;
}
// Layout

View File

@ -68,7 +68,7 @@ div#toplinks {
a {
color: black;
font-weight: bold;
font-weight: 500;
display: flex;
align-items: center;
}

View File

@ -1,35 +1,33 @@
$gray-xlight: #f2f2f2;
$gray-light: #cccccc;
$gray: #919191;
$gray-dark: #333333;
$salmon: #ec8771;
$yellow: #ecbe54;
$yellow-light: #fdf4da;
$red: #e95f5c;
$red-light: #fae1db;
$gray-light: #b3b3b3;
$gray-xlight: #e6e6e6;
$gray: #919191;
$green-dark: #557c40;
$green: #9ecf87;
$green-light: #e6efdf;
$green: #9ecf87;
$red-light: #fae1db;
$red: #eb8772;
$yellow-light: #fdf4da;
$yellow: #ebbe55;
$primary-color: $salmon;
$primary-color: $red;
$secondary-color: $yellow;
/// Typo
$font-family: Lato, sans-serif;
$font-family: Rubik, sans-serif;
$link-color: $primary-color;
$link-decoration: none;
$link-hover-decoration: underline;
$base-font: 16;
$fz-1: 30em / $base-font;
$fz-2: 20em / $base-font;
$fz-3: 18em / $base-font;
$fz-4: 14em / $base-font;
$fz-1: 1rem * 60 / 16;
$fz-2: 1rem * 37 / 16;
$fz-3: 1rem * 26 / 16;
$fz-4: 1rem * 22 / 16;
$fz-small: 14em / $base-font;
$fz-xsmall: 11em / $base-font;
$font-size: 100% / ( 15 / $base-font );
$font-size: 1rem;
// General
$border-radius: 5px;
@ -64,8 +62,9 @@ $nav-mobile-bottom-bar-item-selected-color: black;
// Title
$title-padding: 0;
$title-color: $primary-color;
$title-font-size: $fz-2;
$title-color: black;
$title-font-size: $fz-4;
$title-font-family: 'Viga', sans-serif;
$title-transform: uppercase;
$title-weight: 700;
$title-background: transparent;

View File

@ -10,10 +10,9 @@
&--title {
margin: 0;
font-weight: 900;
max-width: 35rem;
text-transform: uppercase;
font-size: 48em / $base-font;
font-size: $fz-1;
}
&--description {
@ -29,7 +28,6 @@
}
&--title {
font-size: $fz-1;
text-align: center;
}
}
@ -121,7 +119,6 @@ input::placeholder {
&::before {
content: $symbol;
font-family: FontAwesome;
font-size: 0.7rem;
margin-right: 1rem;
}
}
@ -130,7 +127,6 @@ input::placeholder {
&::after {
content: $symbol;
font-family: FontAwesome;
font-size: 0.7rem;
margin-left: 1rem;
}
}

View File

@ -1,5 +1,9 @@
@charset "UTF-8";
@import '../includes/fonts/archivo-black';
@import '../includes/fonts/rubik';
@import '../includes/fonts/viga';
@import 'vars';
@import '../includes/publik';
@import 'combo';