From e7566908a753388657ab00b6e3dc1782594a5fd1 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 21 Jan 2022 09:13:47 +0100 Subject: [PATCH 1/2] modif card resto --- package-lock.json | 14 ++++++++++++ package.json | 1 + src/app/card-resto/card-resto.component.html | 22 ++++++++++++++----- src/app/card-resto/card-resto.component.scss | 10 +++++++++ src/assets/ImagesRestos/pieton.png | Bin 0 -> 521 bytes src/assets/pieton.svg | 4 ++++ 6 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 src/assets/ImagesRestos/pieton.png create mode 100644 src/assets/pieton.svg diff --git a/package-lock.json b/package-lock.json index 9f0907b..ac97b43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "@angular/platform-browser-dynamic": "~13.0.0", "@angular/router": "~13.0.0", "bootstrap": "^5.1.3", + "bootstrap-icons": "^1.7.2", "rxjs": "~7.4.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -3401,6 +3402,14 @@ "@popperjs/core": "^2.10.2" } }, + "node_modules/bootstrap-icons": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.7.2.tgz", + "integrity": "sha512-NiR2PqC73AQOPdVSu6GJfnk+hN2z6powcistXk1JgPnKuoV2FSdSl26w931Oz9HYbKCcKUSB6ncZTYJAYJl3QQ==", + "engines": { + "node": ">=10" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -15041,6 +15050,11 @@ "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", "requires": {} }, + "bootstrap-icons": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.7.2.tgz", + "integrity": "sha512-NiR2PqC73AQOPdVSu6GJfnk+hN2z6powcistXk1JgPnKuoV2FSdSl26w931Oz9HYbKCcKUSB6ncZTYJAYJl3QQ==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", diff --git a/package.json b/package.json index 0222f00..f47f13c 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "@angular/platform-browser-dynamic": "~13.0.0", "@angular/router": "~13.0.0", "bootstrap": "^5.1.3", + "bootstrap-icons": "^1.7.2", "rxjs": "~7.4.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/card-resto/card-resto.component.html b/src/app/card-resto/card-resto.component.html index d763fd7..e0ce372 100644 --- a/src/app/card-resto/card-resto.component.html +++ b/src/app/card-resto/card-resto.component.html @@ -5,19 +5,29 @@
-

+

-
+
This is the first item's accordion body. -
    -
    • -
    • -
+
+
    +
    • +
    • +
    • +
    • +
    • +
+ 4/5 + +
+ Kebab + 550m +
diff --git a/src/app/card-resto/card-resto.component.scss b/src/app/card-resto/card-resto.component.scss index c11e203..2501681 100644 --- a/src/app/card-resto/card-resto.component.scss +++ b/src/app/card-resto/card-resto.component.scss @@ -18,4 +18,14 @@ +.star{ + list-style-type: none; + font-size: 1.5em; + color:#ffd900; +} + + + + + diff --git a/src/assets/ImagesRestos/pieton.png b/src/assets/ImagesRestos/pieton.png new file mode 100644 index 0000000000000000000000000000000000000000..c2ada6dccea33bac0b897107ab2dd25f03fe2c07 GIT binary patch literal 521 zcmV+k0`~ohP)Z2Z_%PBt#TmKiy)FtXVxN@l(IWIO&JeJuo02MwwS00000 LNkvXXu0mjfI~v@B literal 0 HcmV?d00001 diff --git a/src/assets/pieton.svg b/src/assets/pieton.svg new file mode 100644 index 0000000..be2f280 --- /dev/null +++ b/src/assets/pieton.svg @@ -0,0 +1,4 @@ + + + + From 56d663bb7fd392ed622e7c9eafa2c81a4143dea6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 21 Jan 2022 16:21:44 +0100 Subject: [PATCH 2/2] modif card resto search bar --- src/app/card-resto/card-resto.component.html | 51 ++++++++++++----- src/app/card-resto/card-resto.component.scss | 54 +++++++++++++++++- .../search-bar/search-bar.component.html | 20 ++++--- .../search-bar/search-bar.component.scss | 16 ++---- src/assets/images-header/LOGO2.png | Bin 0 -> 7252 bytes src/index.html | 1 + 6 files changed, 107 insertions(+), 35 deletions(-) create mode 100644 src/assets/images-header/LOGO2.png diff --git a/src/app/card-resto/card-resto.component.html b/src/app/card-resto/card-resto.component.html index e0ce372..93cf94f 100644 --- a/src/app/card-resto/card-resto.component.html +++ b/src/app/card-resto/card-resto.component.html @@ -1,37 +1,58 @@ -
+
Card image cap +
+ +

NOM RESTAURANT

- +

-

-
+
This is the first item's accordion body. -
-
    +
    +
    - 4/5 - -
    - Kebab - 550m - -
+ 5/5 +
+
+ Kebab + 550m + 5-10€ +
+
+

Descriptif : c’est le faux texte standard de l'imprimerie depuis + les années 1500, quand un imprimeur anonyme assembla ensemble des morceaux de texte pour + réaliser un livre spécimen de polices de texte.

+
+
+ Sur place : + A emporter : +
+
+
+ Accès PMR : +
+
+ +
+
-
-
+
+ +
diff --git a/src/app/card-resto/card-resto.component.scss b/src/app/card-resto/card-resto.component.scss index 2501681..9ec6b1d 100644 --- a/src/app/card-resto/card-resto.component.scss +++ b/src/app/card-resto/card-resto.component.scss @@ -1,3 +1,19 @@ +.rond{ + padding: 0.7em; + background-color: rgb(255, 255, 255); + top: 1em; + right: 1em; + border-radius: 50%; +} + +.heart{ + display: flex; + font-size: 1.6em; + padding: 0; + margin:0; + color: #FF2048; +} + .titre-resto{ margin-bottom: 0.9rem; } @@ -10,8 +26,24 @@ border-radius: 0 0 0.25rem 0.25rem; padding: 1.375rem 0.75rem; - } +.accordion-button.collapsed { + background: #CE0000; + } + + .accordion-button.collapsed::after { + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); + } + + + .ps-5 { + padding-left: 5.4rem !important; +} +.pe-5 { + padding-right: 5rem !important; +} + + .accordion .btn:focus{ box-shadow: none; } @@ -22,6 +54,26 @@ list-style-type: none; font-size: 1.5em; color:#ffd900; + +} + +.trait-rouge{ +border-bottom: 1px solid #CE0000; +opacity: 50%; + +} + +.button{ + display: block; + padding: 0.5em 2em 0.5em ; + width: 100%; + border-radius: 5px; + border: none; + background-color: #545454; + color: #ffffff; + text-transform: uppercase; + font-weight: bold; + } diff --git a/src/app/header/components/search-bar/search-bar.component.html b/src/app/header/components/search-bar/search-bar.component.html index 3c06a2b..fd6763f 100644 --- a/src/app/header/components/search-bar/search-bar.component.html +++ b/src/app/header/components/search-bar/search-bar.component.html @@ -1,11 +1,13 @@ -