Paddy/Betterzon
1
0
Fork 0
mirror of https://github.com/Mueller-Patrick/Betterzon.git synced 2026-09-16 18:03:45 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Paddy/Betterzon:develop
Branches Tags
Paddy/Betterzon:develop Paddy/Betterzon:master
...
compare: Paddy/Betterzon:8987d3deff68bd7c7ba71a442b8dc01420594f9a
Branches Tags
Paddy/Betterzon:master Paddy/Betterzon:develop

22 Commits
develop ... 8987d3deff

Author SHA1 Message Date
Paddy 8987d3deff Merge remote-tracking branch 'origin/develop' into BETTERZON-106 
# Conflicts:
#	Frontend/src/app/app.component.html
#	Frontend/src/app/app.module.ts
#	Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.css
#	Frontend/src/app/pages/landingpage/landingpage.component.html
#	Frontend/src/styles.css
 2021-05-20 10:46:06 +02:00
illumizoldyck 94c3f537bc wip: new component created and added to the app.module.ts. Added a minimal grid layout. 2021-05-16 22:42:59 +02:00
illumizoldyck e8bb639ebd wip: component rewritten, simple grid applied. 2021-05-15 21:42:52 +02:00
illumizoldyck ceef01899d Merge remote-tracking branch 'origin/BETTERZON-78' into BETTERZON-78 2021-05-13 19:25:16 +02:00
illumizoldyck 464414cbe2 BETTERZON 78: logo and follow us edited, links added. 2021-05-13 19:24:53 +02:00
Patrick 0f19bd77cd Merge branch 'develop' into BETTERZON-78 2021-05-11 21:59:02 +02:00
illumizoldyck a3d9b826f0 BETTERZON-78 - grid added, structured as in Adobe XD mockup 2021-05-11 11:54:02 +02:00
Patrick 536acc06ee Merge branch 'develop' into BETTERZON-78 2021-05-08 20:01:12 +02:00
Patrick ac237a6ba1 Apply suggestions from code review 
Switching from single to double quotes
 2021-05-08 20:00:30 +02:00
Patrick 058230e9a9 Merge branch 'develop' into BETTERZON-78 2021-05-06 22:47:22 +02:00
Paddy f71f53c869 Adding cookieconsent as dependency again since it was removed by a merge 2021-05-05 19:59:02 +02:00
Paddy 6982a139af Adding cookieconsent as dependency again since it was removed by a merge 2021-05-05 18:48:53 +02:00
illumizoldyck b0158198d4 Merge branch 'BETTERZON-78' of https://github.com/Mueller-Patrick/Betterzon into BETTERZON-78 2021-05-05 18:42:52 +02:00
illumizoldyck 7e5ef71924 BETTERZON-78 adding bottom bar and top bar 2021-05-05 18:40:22 +02:00
Paddy b17b92fcc3 Merge remote-tracking branch 'origin/develop' into BETTERZON-78 
# Conflicts:
#	Frontend/angular.json
#	Frontend/package-lock.json
#	Frontend/src/app/app.module.ts
#	Frontend/src/styles.css
 2021-05-05 18:39:04 +02:00
illumizoldyck 0c50162fdf WIP: creating footer using grid. 2021-05-04 22:17:15 +02:00
illumizoldyck 825f744af9 BETTERZON-74 
simple top-bar has been created.
 2021-04-28 17:53:56 +02:00
Paddy e0f1724d95 Merge remote-tracking branch 'origin/develop' into BETTERZON-52 
# Conflicts:
#	Frontend/angular.json
#	Frontend/package-lock.json
#	Frontend/package.json
#	Frontend/src/app/app.module.ts
#	Frontend/src/index.html
 2021-04-08 10:52:52 +02:00
illumizoldyck 93b17bc65f BETTERZON-31, 
BETTERZON-50

info popover and footer had been changed.
 2021-04-08 10:42:45 +02:00
Paddy 64074b48e8 Merge remote-tracking branch 'origin/develop' into BETTERZON-31 
# Conflicts:
#	Frontend/src/app/app.module.ts
 2021-04-06 20:19:40 +02:00
Paddy ee50296dc9 BETTERZON-31: Fixing dependencies 2021-04-06 20:18:17 +02:00
illumizoldyck 57c3f521d1 BETTERZON-31, dependencies. 2021-04-06 20:14:10 +02:00
1 changed files with 2 additions and 0 deletions
Expand all files Collapse all files
Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.css
+2
View File
@@ -4,6 +4,8 @@
background-color: #f8f9fa;
display: grid;
grid-template-columns: repeat(2, 1fr);
grid-column-gap: 0px;
grid-row-gap: 0px;
align-items: center;
}