From a8b096039ecbb9c93532b68769d45ba9f1ea3347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o?= Date: Mon, 18 Feb 2019 16:37:50 +0100 Subject: [PATCH 1/3] fdsfds --- project/assets/css/style.css | 8 +++++++- project/assets/php/functions.php | 10 +++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/project/assets/css/style.css b/project/assets/css/style.css index 0b02eac..00d5911 100755 --- a/project/assets/css/style.css +++ b/project/assets/css/style.css @@ -179,7 +179,12 @@ h2{ font-size: 20px; color: white; } - +.test2{ + padding-left: 27px; + padding-right: 27px; + margin-top: 100px; + text-align: center; +} .content-homediv{ padding: 0; } @@ -469,6 +474,7 @@ input {outline: none} .test1{ margin-top: 30px; } + .articleHome2{ margin-top:30px; } diff --git a/project/assets/php/functions.php b/project/assets/php/functions.php index 64b494f..010e838 100755 --- a/project/assets/php/functions.php +++ b/project/assets/php/functions.php @@ -11,10 +11,10 @@ function endsWith($haystack, $needle) { } function connect() { - $host = "127.0.0.1"; + $host = "localhost"; $db = "blog"; - $user = "blog"; - $pass = "blog"; + $user = "root"; + $pass = "root"; $charset="utf8mb4"; $dsn = "mysql:host=$host;dbname=$db;charset=$charset"; @@ -25,3 +25,7 @@ function connect() { } return $pdo; } + +function getBDD() { + +} From a001a7c14c1c449ba50e2b6cdaf441107a4cde11 Mon Sep 17 00:00:00 2001 From: Adrien Date: Mon, 25 Feb 2019 09:14:37 +0100 Subject: [PATCH 2/3] css post --- project/assets/css/style.css | 26 ++++++++++++++++++---- project/assets/html/post.html | 37 +++++++++++++++++++++++++++++++- project/assets/php/functions.php | 2 +- project/index.php | 6 +++--- 4 files changed, 62 insertions(+), 9 deletions(-) diff --git a/project/assets/css/style.css b/project/assets/css/style.css index 0b02eac..5e8867d 100755 --- a/project/assets/css/style.css +++ b/project/assets/css/style.css @@ -295,7 +295,7 @@ input {outline: none} * ----------------------------------------------------- */ .bloc-post{ width: 69%; - margin-top: 30px; + margin-top: 70px; box-shadow: 1px 1px 30px 1px lightgrey; background-position: center; background-size: cover; @@ -326,7 +326,7 @@ input {outline: none} .bloc-filter{ width: 25%; height: 500px; - margin-top: 30px; + margin-top: 70px; background-color: white; background-size: cover; box-shadow: 1px 1px 30px 1px lightgrey; @@ -387,10 +387,28 @@ input {outline: none} display: inline-block; float:right; } - +.filtre{ + width: 100%; + padding: 6px 10px 6px 10px; + color:white; + text-transform: uppercase; + font-size: 14px; + margin-top: 15px; +} + .dev-color{ + background-color: #fccb3a; + } + .digi-color{ + background-color: #6bb194; + } + .ops-color{ + background-color: #2ea3f2; + } + .devops-color{ + background-color: #ff1c4a; + } .bloc-recent{ width: 69%; - margin-top: 50px; float: left; } .titre-recent{ diff --git a/project/assets/html/post.html b/project/assets/html/post.html index 2a863dd..248173f 100755 --- a/project/assets/html/post.html +++ b/project/assets/html/post.html @@ -38,8 +38,43 @@

Plus d'articles

-
+
dev
+
digi
+
ops
+
devops
+ + +
Précédent
+
Suivant
+ +

Dans le même thème

+
+ +
+
+

+ +

+
+ + + + + + +
+
+ +

+
+
+ +
+ +
+ + \ No newline at end of file diff --git a/project/assets/php/functions.php b/project/assets/php/functions.php index 64b494f..33307e4 100755 --- a/project/assets/php/functions.php +++ b/project/assets/php/functions.php @@ -11,7 +11,7 @@ function endsWith($haystack, $needle) { } function connect() { - $host = "127.0.0.1"; + $host = "localhost"; $db = "blog"; $user = "blog"; $pass = "blog"; diff --git a/project/index.php b/project/index.php index 37dd6d4..0fe42d0 100644 --- a/project/index.php +++ b/project/index.php @@ -4,10 +4,10 @@ ini_set('display_errors', 1); require_once "assets/php/functions.php"; -$host = "127.0.0.1"; +$host = "localhost"; $db = "blog"; -$user = "root"; -$pass = "root"; +$user = "blog"; +$pass = "blog"; $charset="utf8mb4"; $dsn = "mysql:host=$host;dbname=$db;charset=$charset"; From 15ec447587b789b232b19f67a4201d48d5a452b1 Mon Sep 17 00:00:00 2001 From: Adrien Date: Mon, 25 Feb 2019 10:14:45 +0100 Subject: [PATCH 3/3] link --- project/assets/css/style.css | 32 ++++++++++++++---------- project/assets/html/includes/header.html | 10 ++++---- project/assets/html/post.html | 4 +-- project/assets/html/search.html | 2 +- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/project/assets/css/style.css b/project/assets/css/style.css index 969615c..ae7ea97 100755 --- a/project/assets/css/style.css +++ b/project/assets/css/style.css @@ -67,7 +67,6 @@ h2{ font-weight: 400; font-size: 17px; } - .contenue{ height: 285vh; } @@ -89,11 +88,20 @@ h2{ height: 40px; background-color: #1c1c1c; } - .nav_blog{ height: 80px; background-color: #110230; } +.item_nav_imie{ + font-size: 0; +} +.item_nav_imie a{ + text-decoration: none; + color: white; +} + .item_nav_imie a:hover{ + color: #6e6e6e; + } .item_nav_imie{ display: inline-block; @@ -305,11 +313,13 @@ input {outline: none} background-position: center; background-size: cover; display: inline-block; - border-bottom: 5px solid #2ea3f2; border-radius: 5px; } + .search{ + border-bottom: 5px solid #2ea3f2; + } + .container-post{ - /* height: 500px; */ background-color: white; padding: 45px; } @@ -382,16 +392,15 @@ input {outline: none} .pad{ padding:0; } - .contenue-recent{ - height: 29px; - width: 110px; - padding-top: 7px; - padding-left: 15px; + padding: 14px; background-color: white; display: inline-block; - float:right; + margin-top: 20px; } + .next{ + float : right; + } .filtre{ width: 100%; padding: 6px 10px 6px 10px; @@ -475,9 +484,6 @@ input {outline: none} .nav_imie { height: 0; } - .item_nav_imie{ - font-size: 0; - } #twi{ height: 0; width: 0; diff --git a/project/assets/html/includes/header.html b/project/assets/html/includes/header.html index 27c516d..a854485 100755 --- a/project/assets/html/includes/header.html +++ b/project/assets/html/includes/header.html @@ -6,10 +6,10 @@
@@ -22,7 +22,7 @@
    - +
  • DEVOPS
  • OPS
    • diff --git a/project/assets/html/post.html b/project/assets/html/post.html index 248173f..0ef029c 100755 --- a/project/assets/html/post.html +++ b/project/assets/html/post.html @@ -44,8 +44,8 @@
    devops
-
Précédent
-
Suivant
+ +

Dans le même thème

diff --git a/project/assets/html/search.html b/project/assets/html/search.html index af0fe42..25e604b 100755 --- a/project/assets/html/search.html +++ b/project/assets/html/search.html @@ -18,7 +18,7 @@
-
+

Mettre en place un serveur web sous linux