From f20031d354df68e62a460f3fbd55dd660a78c7b4 Mon Sep 17 00:00:00 2001
From: peter_rabbit <pierrejarriges@gmail.com>
Date: Wed, 20 Jan 2021 18:41:47 +0100
Subject: [PATCH] fix hp layout && wip:nginx.conf cors
---
nginx.conf | 10 +++-------
public/main.js | 6 +++---
public/style/homepage.css | 6 +++---
public/style/style.css | 7 +++----
src/home-page-components/articles.js | 6 +++---
src/homepage.scss | 6 +++---
src/style.scss | 2 +-
7 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/nginx.conf b/nginx.conf
index d86ffc8..266e0bf 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -28,12 +28,8 @@ http {
include /etc/nginx/conf.d/*.conf;
- server {
- listen 80;
- server_name kuadrado-software.fr www.kuadrado-software.fr;
- location / {
- add_header 'Access-Control-Allow-Origin' '*';
- }
- }
+ # server {
+ # add_header 'Access-Control-Allow-Origin' '*';
+ # }
}
diff --git a/public/main.js b/public/main.js
index 52dabf1..accb62f 100644
--- a/public/main.js
+++ b/public/main.js
@@ -146,13 +146,13 @@ class Articles {
renderArticlePlaceholder() {
return {
tag: "article",
- class: "article-placeholder page-contents-center",
+ class: "article-placeholder",
contents: [
{ tag: "div", class: "date" },
{ tag: "div", class: "title" },
{ tag: "div", class: "subtitle" },
{ tag: "div", class: "body" },
- { tag: "div", class: "image" },
+ { tag: "div", class: "image-carousel" },
],
};
}
@@ -194,7 +194,7 @@ class Articles {
onclick: this.handleChangeArticle.bind(this, "next"),
},
]
- : [this.renderArticlePlaceholder()],
+ : [{tag:"div"},this.renderArticlePlaceholder(), {tag:"div"}],
};
}
}
diff --git a/public/style/homepage.css b/public/style/homepage.css
index b041bdd..cfc4dbd 100644
--- a/public/style/homepage.css
+++ b/public/style/homepage.css
@@ -1,9 +1,9 @@
/* Error: Undefined variable.
* ,
- * 25 | color: $medium_grey;
+ * 24 | color: $medium_grey;
* | ^^^^^^^^^^^^
* '
- * src/homepage.scss 25:24 root stylesheet */
+ * src/homepage.scss 24:24 root stylesheet */
body::before {
font-family: "Source Code Pro", "SF Mono", Monaco, Inconsolata, "Fira Mono",
@@ -13,5 +13,5 @@ body::before {
padding: 1em;
margin-bottom: 1em;
border-bottom: 2px solid black;
- content: "Error: Undefined variable.\a \2577 \a 25 \2502 color: $medium_grey;\a \2502 ^^^^^^^^^^^^\a \2575 \a src/homepage.scss 25:24 root stylesheet";
+ content: "Error: Undefined variable.\a \2577 \a 24 \2502 color: $medium_grey;\a \2502 ^^^^^^^^^^^^\a \2575 \a src/homepage.scss 24:24 root stylesheet";
}
diff --git a/public/style/style.css b/public/style/style.css
index 2d316c4..f7686bf 100644
--- a/public/style/style.css
+++ b/public/style/style.css
@@ -27,7 +27,7 @@ body .grid-3 {
}
body .bg-blue {
background-color: #4baabb;
- color: #d4d9dd;
+ color: white;
}
main {
@@ -218,13 +218,12 @@ main #page-container #home-page .section-title {
main #page-container #home-page .articles-displayer {
margin: 0 auto 40px;
display: grid;
- grid-template-columns: 1fr auto 1fr;
+ grid-template-columns: 50px auto 50px;
}
main #page-container #home-page .articles-displayer .prev-btn,
main #page-container #home-page .articles-displayer .next-btn {
border: none;
background-image: url("/assets/images/wallpaper_binary.png");
- width: 50px;
}
main #page-container #home-page .articles-displayer .prev-btn.disabled,
main #page-container #home-page .articles-displayer .next-btn.disabled {
@@ -338,7 +337,7 @@ main #page-container #home-page .articles-displayer article .image-carousel .car
background-color: #d4d9dd;
}
main #page-container #home-page .articles-displayer article.article-placeholder {
- padding: 0 50px;
+ padding: 0;
}
main #page-container #home-page .articles-displayer article.article-placeholder * {
background-color: #d4d9dd;
diff --git a/src/home-page-components/articles.js b/src/home-page-components/articles.js
index 5aeae5a..ee3dd7e 100644
--- a/src/home-page-components/articles.js
+++ b/src/home-page-components/articles.js
@@ -122,13 +122,13 @@ class Articles {
renderArticlePlaceholder() {
return {
tag: "article",
- class: "article-placeholder page-contents-center",
+ class: "article-placeholder",
contents: [
{ tag: "div", class: "date" },
{ tag: "div", class: "title" },
{ tag: "div", class: "subtitle" },
{ tag: "div", class: "body" },
- { tag: "div", class: "image" },
+ { tag: "div", class: "image-carousel" },
],
};
}
@@ -170,7 +170,7 @@ class Articles {
onclick: this.handleChangeArticle.bind(this, "next"),
},
]
- : [this.renderArticlePlaceholder()],
+ : [{tag:"div"},this.renderArticlePlaceholder(), {tag:"div"}],
};
}
}
diff --git a/src/homepage.scss b/src/homepage.scss
index 2d5561d..f73960c 100644
--- a/src/homepage.scss
+++ b/src/homepage.scss
@@ -11,12 +11,11 @@
.articles-displayer {
margin: 0 auto 40px;
display: grid;
- grid-template-columns: 1fr auto 1fr;
+ grid-template-columns: 50px auto 50px;
.prev-btn,
.next-btn {
border: none;
background-image: url("/assets/images/wallpaper_binary.png");
- width: 50px;
&.disabled {
pointer-events: none;
}
@@ -125,7 +124,7 @@
}
}
&.article-placeholder {
- padding: 0 50px;
+ padding: 0;
* {
background-color: $light_0;
}
@@ -194,5 +193,6 @@
.section-title {
margin: 0 20px;
}
+
}
}
diff --git a/src/style.scss b/src/style.scss
index b9cb669..40794a1 100644
--- a/src/style.scss
+++ b/src/style.scss
@@ -31,7 +31,7 @@ body {
.bg-blue {
background-color: $blue_2;
- color: $light_0;
+ color: white;
}
}
--
GitLab