Skip to content

Igor #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hikeislife wants to merge 195 commits into
base: master
Choose a base branch
from
Open

Igor #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
195 commits
Select commit Hold shift + click to select a range
e1b853c
css test
IgorMilatovic Sep 30, 2019
9997b40
css test
IgorMilatovic Sep 30, 2019
b4dd862
style initial
hikeislife Oct 1, 2019
f3e7a8a
ignore
hikeislife Oct 1, 2019
5b80e01
style initial
hikeislife Oct 1, 2019
9533915
fonts
hikeislife Oct 1, 2019
04a9950
title
hikeislife Oct 1, 2019
2857396
title
hikeislife Oct 1, 2019
7beb222
title
hikeislife Oct 1, 2019
28a6b73
footer
hikeislife Oct 1, 2019
1762c41
site branding
hikeislife Oct 2, 2019
4be11bc
'initial'
IgorMilatovic Oct 2, 2019
5880859
conflict solved
IgorMilatovic Oct 2, 2019
f7cf207
conflict solved
IgorMilatovic Oct 2, 2019
ee80ab3
font awesome
hikeislife Oct 3, 2019
d04d590
title, txt, img style
IgorMilatovic Oct 3, 2019
773801a
conflict res2
hikeislife Oct 3, 2019
357a9f2
conflict res2
hikeislife Oct 3, 2019
cc7008a
front page initial style
hikeislife Oct 3, 2019
8d3615a
conflict res
hikeislife Oct 3, 2019
6f80679
title, txt, img style
IgorMilatovic Oct 3, 2019
617e39f
title, txt, img style
IgorMilatovic Oct 3, 2019
9de49fc
yellow stripes
IgorMilatovic Oct 3, 2019
b87f94e
programi styles
hikeislife Oct 3, 2019
d806fdb
conflict res
hikeislife Oct 3, 2019
279736d
blog styles initial
hikeislife Oct 3, 2019
8f52ba1
kontakt box
IgorMilatovic Oct 3, 2019
7b1821e
conflict solved
IgorMilatovic Oct 3, 2019
7214d21
minor style changes
hikeislife Oct 3, 2019
8e37a05
tim css added
hikeislife Oct 4, 2019
77bf317
nav overflow
IgorMilatovic Oct 4, 2019
c6decd5
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Oct 4, 2019
e5aed91
overflow
hikeislife Oct 4, 2019
e0bd85f
nav overflow
IgorMilatovic Oct 4, 2019
36e0573
nav overflow
IgorMilatovic Oct 4, 2019
e1331ba
front page
hikeislife Oct 4, 2019
d74dccc
front
IgorMilatovic Oct 4, 2019
94d80f1
conflict solved
IgorMilatovic Oct 4, 2019
02a883f
front page restructuring
hikeislife Oct 4, 2019
2977882
front
IgorMilatovic Oct 4, 2019
8f71ef2
front
IgorMilatovic Oct 4, 2019
a8fd2c9
front
IgorMilatovic Oct 4, 2019
e25fe3e
calc change
hikeislife Oct 4, 2019
fc85bd5
conflict res
hikeislife Oct 4, 2019
791e642
footer gap solved
IgorMilatovic Oct 4, 2019
47916b4
programi initial
hikeislife Oct 4, 2019
8b0eb9a
programi init
hikeislife Oct 4, 2019
295b63a
tim
IgorMilatovic Oct 4, 2019
ad320cd
conflict solved
IgorMilatovic Oct 4, 2019
95627c3
tim
IgorMilatovic Oct 5, 2019
1edf1df
programi css
hikeislife Oct 5, 2019
a169965
programi
hikeislife Oct 7, 2019
ffb0e5d
detalji
IgorMilatovic Oct 7, 2019
159feec
txt margin
IgorMilatovic Oct 10, 2019
188d6cf
css
hikeislife Oct 10, 2019
ac058b2
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 10, 2019
ddde7c9
title font
IgorMilatovic Oct 11, 2019
65487f6
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Oct 11, 2019
bbdda8f
composer
hikeislife Oct 11, 2019
f9f0a89
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 11, 2019
d85e43d
title font
IgorMilatovic Oct 11, 2019
991ee7e
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 11, 2019
7ffcc56
title font
IgorMilatovic Oct 11, 2019
f2eef85
henry
hikeislife Oct 11, 2019
90dc7b9
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 11, 2019
8259345
title font
IgorMilatovic Oct 11, 2019
7adf90b
title font
IgorMilatovic Oct 11, 2019
b3f58fa
programi css conflict
hikeislife Oct 11, 2019
7e44a21
map
IgorMilatovic Oct 11, 2019
a5101db
front page small screen initial
hikeislife Oct 11, 2019
38cf5cd
conflict resolution
hikeislife Oct 11, 2019
9ee7dd6
fp programi
IgorMilatovic Oct 12, 2019
82b741b
fp programi
IgorMilatovic Oct 12, 2019
6d626e8
fp programi
IgorMilatovic Oct 12, 2019
e43308b
fp programi, kontakt, mapa
IgorMilatovic Oct 12, 2019
42da08f
fp programi, kontakt, mapa
IgorMilatovic Oct 12, 2019
82f1510
blog layout
hikeislife Oct 12, 2019
bf9d9b2
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 12, 2019
6fdaf70
sync with vesti
hikeislife Oct 12, 2019
5a1f6eb
new stripes
IgorMilatovic Oct 13, 2019
da8caf1
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Oct 13, 2019
7b09e95
blog css
hikeislife Oct 14, 2019
2575c5c
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 14, 2019
eac6643
conflict res
hikeislife Oct 14, 2019
c2731eb
yearname justification
hikeislife Oct 14, 2019
9f27890
master merge
hikeislife Oct 14, 2019
459e2d1
master merge
hikeislife Oct 14, 2019
211b112
missed conflict
hikeislife Oct 14, 2019
711f6e0
remining conflicts
hikeislife Oct 14, 2019
0495c7a
style
IgorMilatovic Oct 16, 2019
307d5cc
raspored styles initial
hikeislife Oct 16, 2019
1a09dc4
conflict res
hikeislife Oct 16, 2019
6e717a1
raspored
hikeislife Oct 16, 2019
9b32b58
programi fixes
hikeislife Oct 16, 2019
4fb869f
style
IgorMilatovic Oct 17, 2019
80496cd
style
IgorMilatovic Oct 17, 2019
01a9ed8
raspored
hikeislife Oct 17, 2019
c09734c
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 17, 2019
0aecb31
treninzi respo
hikeislife Oct 17, 2019
12b9b2f
style
IgorMilatovic Oct 17, 2019
bfe944a
style
IgorMilatovic Oct 17, 2019
9c22a28
galerija css
hikeislife Oct 17, 2019
cee47cd
conflict resolution
hikeislife Oct 17, 2019
0c29a95
js
IgorMilatovic Oct 17, 2019
39ebb32
removal of inline styles
hikeislife Oct 18, 2019
5c3bc7f
respo nav & header top
IgorMilatovic Oct 18, 2019
09879a0
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 18, 2019
6b2608b
hamburger
IgorMilatovic Oct 18, 2019
b61ccef
tim style
hikeislife Oct 18, 2019
49c02f3
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 18, 2019
e20182e
raspored
IgorMilatovic Oct 21, 2019
dfb4318
raspored
IgorMilatovic Oct 21, 2019
1d24b82
style
IgorMilatovic Oct 21, 2019
12aae57
removal of all inline styles on images
hikeislife Oct 21, 2019
3f9f9e8
style
IgorMilatovic Oct 21, 2019
5ff4e9e
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Oct 21, 2019
97ed0a3
programi styles
hikeislife Oct 22, 2019
74edfbb
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 22, 2019
7b438c6
style
IgorMilatovic Oct 22, 2019
38c2813
alingnment in chrome fixed for programi
hikeislife Oct 22, 2019
9c7ed60
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 22, 2019
97fff7a
raspored
IgorMilatovic Oct 22, 2019
505e007
programi layout fine tuning
hikeislife Oct 22, 2019
f0cd27b
conflict res
hikeislife Oct 22, 2019
82b263d
style
IgorMilatovic Oct 23, 2019
3fac540
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Oct 23, 2019
f1e24f4
blog
hikeislife Oct 23, 2019
4af0612
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 23, 2019
32937d8
pages css
hikeislife Oct 23, 2019
c7a25ff
gallery
IgorMilatovic Oct 23, 2019
5b52c14
test
hikeislife Oct 23, 2019
028b39f
test
hikeislife Oct 23, 2019
8f03f23
style
IgorMilatovic Oct 23, 2019
a998393
individual pages styles
hikeislife Oct 23, 2019
2295a66
conflict resolved
hikeislife Oct 23, 2019
2e3aeea
conflict res
hikeislife Oct 23, 2019
2aec92c
scroll-top button
IgorMilatovic Oct 23, 2019
e1103fa
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Oct 23, 2019
361a8fc
overlapping css fix
hikeislife Oct 24, 2019
fbe4663
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 24, 2019
5838223
style
IgorMilatovic Oct 24, 2019
fed8dc1
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Oct 24, 2019
fe87dd5
minor changes
hikeislife Oct 24, 2019
42fa132
footer fix
IgorMilatovic Oct 24, 2019
e53ac96
hip hop icon
hikeislife Oct 25, 2019
20b075f
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Oct 25, 2019
e1aa1a7
quoted text
hikeislife Oct 25, 2019
bd2becb
font size for strong on small screens
hikeislife Oct 25, 2019
d18df66
novi raspored
IgorMilatovic Oct 29, 2019
6e35640
Img path fix, Tim image height fix
mvucijak Nov 4, 2019
92ef18b
Dev final v1.0
mvucijak Nov 7, 2019
ddc09a9
old changes
IgorMilatovic Nov 10, 2019
9b89035
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Nov 10, 2019
5739dec
restore changes
hikeislife Nov 10, 2019
4946b82
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Nov 10, 2019
bd6a9ad
slider bcg styles
hikeislife Nov 10, 2019
b0a1a0a
restored imgs
hikeislife Nov 10, 2019
864a303
js images
hikeislife Nov 10, 2019
88f818f
hamburger
hikeislife Nov 10, 2019
a7408eb
programi
hikeislife Nov 10, 2019
4b9d1ec
styles
IgorMilatovic Nov 10, 2019
fcc7b3d
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Nov 10, 2019
0101e9f
fp fixes
hikeislife Nov 11, 2019
0e76450
slider bcg img
IgorMilatovic Nov 11, 2019
73e2b45
slider bcg img
IgorMilatovic Nov 11, 2019
46dbb3c
styles
IgorMilatovic Nov 11, 2019
b435449
tim
hikeislife Nov 11, 2019
39001fb
conflict res
hikeislife Nov 11, 2019
2559290
contact-box
IgorMilatovic Nov 11, 2019
67898fe
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Nov 11, 2019
cec6495
tim
hikeislife Nov 11, 2019
ad05b5b
various style fixes
hikeislife Nov 11, 2019
bd367fb
contact page
IgorMilatovic Nov 11, 2019
5a1aa9c
contact page
IgorMilatovic Nov 11, 2019
a53a540
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Nov 11, 2019
3261f49
contact page
IgorMilatovic Nov 11, 2019
99115ee
styles
hikeislife Nov 12, 2019
4b07cea
blog next previous arrow
IgorMilatovic Nov 12, 2019
43f5034
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Nov 12, 2019
8d937d1
minor fixes
hikeislife Nov 12, 2019
0a7656e
styles
IgorMilatovic Nov 12, 2019
3f05391
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Nov 12, 2019
51256e0
final style changes
hikeislife Nov 12, 2019
fbe3603
styles
IgorMilatovic Nov 12, 2019
e65642b
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Nov 12, 2019
fffdf7c
styles
IgorMilatovic Nov 12, 2019
7318a7a
margin for tablets
hikeislife Nov 13, 2019
d454f8b
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
hikeislife Nov 13, 2019
4298917
slider p alignment
hikeislife Nov 13, 2019
22b8806
styles
IgorMilatovic Nov 13, 2019
da5b226
Merge branch 'igor' of https://gitlab.com/milos-vucijak/barbell into …
IgorMilatovic Nov 13, 2019
cfdf77c
styles
IgorMilatovic Nov 13, 2019
fcf0767
styles
IgorMilatovic Nov 13, 2019
8aef73a
styles
IgorMilatovic Nov 14, 2019
6844e2b
styles
IgorMilatovic Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
/web/modules/contrib/
/web/themes/contrib/
/web/profiles/contrib/
/web/libraries/
/modules/
/1modules/

#/web/libraries/
/modules/
/1modules/
Expand All @@ -31,4 +35,13 @@
/web/sites/default/local.services.yml
/web/sites/default/1local.services.yml
/web/themes/custom/barbell/css/Henrik/
/web/themes/custom/barbell/css/__MACOSX/
/web/themes/custom/barbell/css/__MACOSX/

# Kata
.vscode/
web/themes/custom/barbell/img/aics.png
web/themes/custom/barbell/img/barbell logo.psd
web/themes/custom/barbell/img/se.png
web/themes/custom/barbell/img/fe.png
config/
files.zip
Binary file added backups/backup-2019-11-07T17-59-08.mysql.gz
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@
"drupal/core": "^8.7.0",
"drupal/devel": "2.x-dev",
"drupal/entity_clone": "1.x-dev",
"drupal/entityqueue": "^1.0",
"drupal/fontawesome": "^2.14",
"drupal/pathauto": "^1.6",
"drupal/responsive_menus": "1.x-dev",
"drupal/slick": "^2.0",
"drupal/slick_lightbox": "^1.0",
"drupal/slick_views": "^2.0",
"drupal/webform": "^5.5",
"drush/drush": "^9.0.0",
"vlucas/phpdotenv": "^2.4",
"webflo/drupal-finder": "^1.0.0",
Expand Down
Loading