Commit Graph

19 Commits

Author SHA1 Message Date
ismailsosic
cd29538665 conflicts resolve 2022-03-15 12:00:33 +01:00
ismailsosic
c04f094b0d add filters data 2022-03-15 11:54:33 +01:00
msosic97
ad441cc08e clear app.js to avoid conflict 2022-03-15 11:52:13 +01:00
msosic97
a3e038fbef edit button css for mobile 2022-03-15 11:44:12 +01:00
msosic97
99caca9e7d edited buttons.css 2022-03-14 17:24:24 +01:00
ahmedsosic
f2990a84c7 add landing page and merged old file 2022-03-14 16:21:17 +01:00
ahmedsosic
08c3e632c8 create landing page 2022-03-14 16:08:14 +01:00
msosic97
32d8e92c61 Add congrats page 2022-03-14 16:00:58 +01:00
msosic97
e15c31d4ec add category page 2022-03-14 14:12:23 +01:00
msosic97
869d4453c8 fixes app.js issue after merging branch addcategorybuttons 2022-03-14 13:11:55 +01:00
msosic97
44163ea615 fixed conflict and merged branch addcategorybuttons 2022-03-14 13:06:46 +01:00
ismailsosic
09a176cd98 resolve conflicts 2022-03-14 12:14:58 +01:00
msosic97
992cb1756a add category btns 2022-03-14 12:14:03 +01:00
ismailsosic
a064e89ceb add filter_navigation 2022-03-14 12:03:26 +01:00
msosic97
d49328fea4 add standard button 2022-03-14 11:53:42 +01:00
msosic97
4e74b56b2f add buttons, buttonstoolbar 2022-03-14 10:21:18 +01:00
ismailsosic
37218739f4 add info.js 2022-03-11 12:05:18 +01:00
ismailsosic
36aee4b8b1 merge branches 2022-03-11 10:05:33 +01:00
ismailsosic
be01f7ac58 add filter js 2022-03-11 09:40:12 +01:00