Merge branch 'ng-init' of https://framagit.org/framasoft/framadate/funky-framadate-front into ng-init

src/app/pages/answers/answers.component.html

@@ -1,11 +1,12 @@
 <div class="answers">
-
 	<h1 i18n>
 		Choisir les propositions
 	</h1>
+
 	<p class="subtitle" i18n>
 		vous pouvez utiliser la syntaxe markdown
 	</p>
+
 	<ol>
 		<li #answers *ngFor="let answer of config.answers; index as i;trackBy trackFunction"
 					class="answer-item">
@@ -18,11 +19,12 @@
 			<button (click)="config.answers.splice(i,1)">X</button>
 		</li>
 	</ol>
+
 	<button
 				class="btn-outline btn-block"
 				(click)="addAnswer()">
 		Ajouter
 	</button>
-	<a [routerLink]="'/step/recapitulatif'" class="btn btn-block">Voyons ce que ça donne</a>
 
+	<a [routerLink]="'/step/resume'" class="btn btn-block">Voyons ce que ça donne</a>
 </div>

src/assets/_global_layout.scss

@@ -1,70 +0,0 @@
-// form inputs
-.funky-box {
-  background: $light;
-  padding: 1em;
-  border-radius: 0.25em;
-  border: 1px solid $main_color;
-  border-bottom: 3px solid $main_color_strong;
-
-  &:focus {
-    color: $main_color_strong;
-  }
-}
-
-input, textarea,
-select {
-  @extend .funky-box;
-}
-
-textarea {
-  margin-top: 1em;
-  border-left: 3px solid $main_color_strong;
-}
-
-
-// buttons
-.btn {
-  display: inline-block;
-  padding: 1em;
-  border-radius: 0.25em;
-  background: $main_color_strong;
-  color: $light;
-  border: 0;
-  margin: 1em;
-  min-height: 1.5rem;
-}
-
-.btn-block {
-  display: block;
-  font-weight: 600;
-  font-size: 1.25em;
-  text-align: center;
-}
-
-a {
-  text-decoration: none;
-
-  nav & {
-
-    @extend .btn-outline, .btn;
-    display: inline-block;
-    margin: 0.5em;
-    padding: 0.5em;
-    color: #000;
-    font-size: 1rem;
-  }
-}
-
-.home_link {
-  text-decoration: none;
-}
-
-.btn-outline {
-  background: $light;
-  border: solid 1px $main_color_strong;
-}
-
-.striked {
-  @extend .btn-outline;
-  color: $main_color_strong;
-}

src/assets/scss/_global_layout.scss

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+body {
+  background-color: #fff;
+}

src/assets/scss/atoms/_buttons.scss

@@ -0,0 +1,30 @@
+@charset "UTF-8";
+
+// buttons
+.btn {
+  display: inline-block;
+  padding: 1em;
+  border-radius: 0.25em;
+  background: $primary_color;
+  // color: $light;
+  border: 0;
+  margin: 1em;
+  min-height: 1.5rem;
+}
+
+.btn-block {
+  display: block;
+  font-weight: 600;
+  font-size: 1.25em;
+  text-align: center;
+}
+
+.btn-outline {
+  // background: $light;
+  border: solid 1px $primary_color;
+}
+
+.striked {
+  @extend .btn-outline;
+  color: $primary_color;
+}

src/assets/scss/atoms/_fonts.scss

@@ -1,7 +1,15 @@
+@charset "UTF-8";
+
 body {
   font-family: "DejaVu Sans Light", "Arial", "DejaVu Sans Mono";
+  font-size: 1.4rem;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   font-family: "Brie Light", "Arial", "DejaVu Sans Mono";
 }

src/assets/scss/atoms/_forms.scss

@@ -0,0 +1,24 @@
+@charset "UTF-8";
+
+// form inputs
+.funky-box {
+  // background: $light;
+  padding: 1em;
+  border-radius: 0.25em;
+  border-bottom: 3px solid $primary_color;
+
+  &:focus {
+    color: $primary_color;
+  }
+}
+
+input,
+textarea,
+select {
+  @extend .funky-box;
+}
+
+textarea {
+  margin-top: 1em;
+  border-left: 3px solid $primary_color;
+}

src/assets/scss/atoms/_headings.scss

@@ -0,0 +1 @@
+@charset "UTF-8";

src/assets/scss/atoms/_images.scss

@@ -0,0 +1 @@
+@charset "UTF-8";

src/assets/scss/atoms/_links.scss

@@ -0,0 +1,18 @@
+@charset "UTF-8";
+
+a {
+  text-decoration: none;
+
+  nav & {
+    @extend .btn-outline, .btn;
+    display: inline-block;
+    margin: 0.5em;
+    padding: 0.5em;
+    color: #000;
+    font-size: 1rem;
+  }
+}
+
+.home_link {
+  text-decoration: none;
+}

src/assets/scss/atoms/_lists.scss

@@ -0,0 +1 @@
+@charset "UTF-8";

src/assets/scss/molecules/_logo.scss

@@ -1,5 +1,5 @@
 .logo_first {
-  color: $logo_color;
+  color: $font_color;
 }
 
 .logo_second {

src/assets/scss/variables.scss

@@ -0,0 +1,7 @@
+@charset "UTF-8";
+
+$primary_color: #FFD52C;
+
+$font_color: #000;
+
+$logo_color_2: #8A9B51;

src/assets/variables.scss

@@ -1,7 +0,0 @@
-$main_color: #fdffbf;
-$main_color_strong: #FFD52C;
-$second_color: cyan;
-$light: white;
-
-$logo_color: #000;
-$logo_color_2: #8A9B51;

src/styles.scss

@@ -1,6 +1,14 @@
 /* You can add global styles to this file, and also import other style files */
-@import "assets/variables";
+@import "assets/scss/variables";
-@import "assets/font";
+@import "assets/scss/global_layout";
-@import "assets/global_layout";
+
-@import "assets/logo";
+@import "assets/scss/atoms/fonts";
-@import "assets/debug";
+@import "assets/scss/atoms/headings";
+@import "assets/scss/atoms/buttons";
+@import "assets/scss/atoms/links";
+@import "assets/scss/atoms/forms";
+@import "assets/scss/atoms/lists";
+@import "assets/scss/atoms/images";
+
+@import "assets/scss/molecules/logo";
+@import "assets/scss/molecules/debug";