From c8949c8f21a8180fda8fe65d9dd67cd91db692c9 Mon Sep 17 00:00:00 2001
From: HAUTBOIS Aurelie <aurelie.hautbois@ext.soprasteria.com>
Date: Fri, 22 Jan 2021 11:33:53 +0100
Subject: [PATCH] feat: remove duplicate typography import
---
src/components/Challenge/challengeCard.scss | 2 --
.../Challenge/challengeCardDone.scss | 2 +-
.../Challenge/challengeCardLocked.scss | 1 -
.../Challenge/challengeCardOnGoing.scss | 4 +--
.../Challenge/challengeCardUnlocked.scss | 2 --
.../Challenge/challengeNoFluidModal.scss | 2 +-
src/components/Challenge/challengeView.scss | 4 ++-
src/components/Duel/duelError.scss | 10 ++++----
src/components/Duel/duelOngoing.scss | 25 +++++++++----------
src/components/Duel/duelUnlocked.scss | 16 ++++++------
src/components/Duel/duelView.scss | 1 -
.../Exploration/explorationError.scss | 10 ++++----
.../Exploration/explorationView.scss | 1 -
src/styles/base/_typo-variables.scss | 1 +
src/styles/base/_typography.scss | 3 +--
15 files changed, 39 insertions(+), 45 deletions(-)
create mode 100644 src/styles/base/_typo-variables.scss
diff --git a/src/components/Challenge/challengeCard.scss b/src/components/Challenge/challengeCard.scss
index 1b48f50c5..9cac755c1 100644
--- a/src/components/Challenge/challengeCard.scss
+++ b/src/components/Challenge/challengeCard.scss
@@ -1,5 +1,3 @@
-@import '../../styles/base/typography';
-
.slide {
margin: auto;
// height: 465px;
diff --git a/src/components/Challenge/challengeCardDone.scss b/src/components/Challenge/challengeCardDone.scss
index a2c9e39b4..f0044b838 100644
--- a/src/components/Challenge/challengeCardDone.scss
+++ b/src/components/Challenge/challengeCardDone.scss
@@ -1,4 +1,4 @@
-@import '../../styles/base/typography';
+@import '../../styles/base/typo-variables';
@import '../../styles/base/color';
.cardDone {
diff --git a/src/components/Challenge/challengeCardLocked.scss b/src/components/Challenge/challengeCardLocked.scss
index 1207be3ae..a39157c6c 100644
--- a/src/components/Challenge/challengeCardLocked.scss
+++ b/src/components/Challenge/challengeCardLocked.scss
@@ -1,4 +1,3 @@
-@import '../../styles/base/typography';
@import '../../styles/base/color';
.cardLocked {
diff --git a/src/components/Challenge/challengeCardOnGoing.scss b/src/components/Challenge/challengeCardOnGoing.scss
index 95f6f7790..f888d6eb9 100644
--- a/src/components/Challenge/challengeCardOnGoing.scss
+++ b/src/components/Challenge/challengeCardOnGoing.scss
@@ -1,4 +1,4 @@
-@import '../../styles/base/typography';
+@import '../../styles/base/typo-variables';
@import '../../styles/base/color';
.cardContent {
@@ -115,7 +115,7 @@
background: $grey-linear-gradient-background;
}
}
-.explorationCard{
+.explorationCard {
position: relative;
}
.goDuel {
diff --git a/src/components/Challenge/challengeCardUnlocked.scss b/src/components/Challenge/challengeCardUnlocked.scss
index 3f1bdc542..5cbab13fc 100644
--- a/src/components/Challenge/challengeCardUnlocked.scss
+++ b/src/components/Challenge/challengeCardUnlocked.scss
@@ -1,5 +1,3 @@
-@import '../../styles/base/typography';
-
.modal-overlay {
width: 100%;
height: 100%;
diff --git a/src/components/Challenge/challengeNoFluidModal.scss b/src/components/Challenge/challengeNoFluidModal.scss
index af743b408..3a92b7a75 100644
--- a/src/components/Challenge/challengeNoFluidModal.scss
+++ b/src/components/Challenge/challengeNoFluidModal.scss
@@ -1,4 +1,4 @@
-@import '../../styles/base/typography';
+@import '../../styles/base/typo-variables';
.noFluidModal {
padding: 1rem;
diff --git a/src/components/Challenge/challengeView.scss b/src/components/Challenge/challengeView.scss
index 56e68b048..bd9128e4b 100644
--- a/src/components/Challenge/challengeView.scss
+++ b/src/components/Challenge/challengeView.scss
@@ -1,4 +1,6 @@
-@import '../../styles/base/typography';
+@import '../../styles/base/breakpoint';
+@import '../../styles/base/typo-variables';
+@import '../../styles/base/color';
.challengeSlider {
min-height: inherit;
diff --git a/src/components/Duel/duelError.scss b/src/components/Duel/duelError.scss
index 7085a1b77..870895cd6 100644
--- a/src/components/Duel/duelError.scss
+++ b/src/components/Duel/duelError.scss
@@ -1,6 +1,6 @@
-@import '../../styles/base/typography';
+@import '../../styles/base/color';
-.duel-error-container{
+.duel-error-container {
display: flex;
min-height: 60vh;
flex-direction: column;
@@ -9,11 +9,11 @@
padding: 1rem 1.5rem;
color: $grey-bright;
}
-.duel-error-message{
+.duel-error-message {
margin-top: 3rem;
text-align: center;
}
-.duel-error-button{
+.duel-error-button {
margin-top: 3rem;
width: 7.5rem;
-}
\ No newline at end of file
+}
diff --git a/src/components/Duel/duelOngoing.scss b/src/components/Duel/duelOngoing.scss
index 0f414f8cf..68bfc1ea9 100644
--- a/src/components/Duel/duelOngoing.scss
+++ b/src/components/Duel/duelOngoing.scss
@@ -1,47 +1,46 @@
-@import '../../styles/base/typography';
+@import '../../styles/base/color';
-.duel-ongoing-container{
+.duel-ongoing-container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
-.duel-title{
+.duel-title {
color: $soft-grey;
margin-top: 1rem;
}
-.duel-goal{
+.duel-goal {
color: $grey-bright;
margin: 1rem 3rem;
text-align: center;
}
-.duel-consumption{
+.duel-consumption {
color: $grey-bright;
margin: 1rem auto;
- .consumption{
+ .consumption {
color: $gold-light;
-
}
}
-.duel-chart{
+.duel-chart {
height: 15.625rem;
display: flex;
align-items: center;
justify-content: center;
width: 80%;
}
-.duel-chart-caption{
+.duel-chart-caption {
display: flex;
flex-direction: column;
align-self: flex-start;
- .duel-caption{
+ .duel-caption {
display: flex;
margin-top: 0.75rem;
- .caption-icon{
+ .caption-icon {
margin: auto 1.5rem;
}
- .caption-label{
+ .caption-label {
color: $grey-bright;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/components/Duel/duelUnlocked.scss b/src/components/Duel/duelUnlocked.scss
index d1339ffa5..b787378c7 100644
--- a/src/components/Duel/duelUnlocked.scss
+++ b/src/components/Duel/duelUnlocked.scss
@@ -1,29 +1,29 @@
-@import '../../styles/base/typography';
+@import '../../styles/base/color';
-.duel-unlocked-container{
+.duel-unlocked-container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 0 1.25rem;
}
-.duel-icon{
+.duel-icon {
margin-top: 2.5rem;
}
-.duel-title{
+.duel-title {
color: $soft-grey;
}
-.duel-description{
+.duel-description {
color: $blue-light;
margin-top: 0.75rem;
text-align: center;
}
-.duel-average-info{
+.duel-average-info {
color: $grey-bright;
margin-top: 0.75rem;
text-align: center;
}
-.button-start{
+.button-start {
width: 11rem;
margin-top: 2.5rem;
-}
\ No newline at end of file
+}
diff --git a/src/components/Duel/duelView.scss b/src/components/Duel/duelView.scss
index 6708d11d3..e69de29bb 100644
--- a/src/components/Duel/duelView.scss
+++ b/src/components/Duel/duelView.scss
@@ -1 +0,0 @@
-@import '../../styles/base/typography';
\ No newline at end of file
diff --git a/src/components/Exploration/explorationError.scss b/src/components/Exploration/explorationError.scss
index de5b9d02f..9c747d83a 100644
--- a/src/components/Exploration/explorationError.scss
+++ b/src/components/Exploration/explorationError.scss
@@ -1,6 +1,6 @@
-@import '../../styles/base/typography';
+@import '../../styles/base/color';
-.exploration-error-container{
+.exploration-error-container {
display: flex;
min-height: 60vh;
flex-direction: column;
@@ -9,11 +9,11 @@
padding: 1rem 1.5rem;
color: $grey-bright;
}
-.exploration-error-message{
+.exploration-error-message {
margin-top: 3rem;
text-align: center;
}
-.exploration-error-button{
+.exploration-error-button {
margin-top: 3rem;
width: 7.5rem;
-}
\ No newline at end of file
+}
diff --git a/src/components/Exploration/explorationView.scss b/src/components/Exploration/explorationView.scss
index 6708d11d3..e69de29bb 100644
--- a/src/components/Exploration/explorationView.scss
+++ b/src/components/Exploration/explorationView.scss
@@ -1 +0,0 @@
-@import '../../styles/base/typography';
\ No newline at end of file
diff --git a/src/styles/base/_typo-variables.scss b/src/styles/base/_typo-variables.scss
new file mode 100644
index 000000000..f13e5d0a8
--- /dev/null
+++ b/src/styles/base/_typo-variables.scss
@@ -0,0 +1 @@
+$text-font: Lato, sans-serif;
diff --git a/src/styles/base/_typography.scss b/src/styles/base/_typography.scss
index 6841e3c51..55a7ea33e 100644
--- a/src/styles/base/_typography.scss
+++ b/src/styles/base/_typography.scss
@@ -1,7 +1,6 @@
@import 'breakpoint';
@import 'color';
-
-$text-font: Lato, sans-serif;
+@import 'typo-variables';
* {
font-family: $text-font;
--
GitLab