Skip to content
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.

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

Feedback #4

Open
wants to merge 126 commits into
base: feedback
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
0a2113f
Dont need scene4
maheggh Apr 26, 2023
82cbf7c
updated with text
maheggh Apr 26, 2023
4a45cb0
some margin changes
maheggh Apr 26, 2023
78501c8
hei
noralund Apr 26, 2023
043ea4a
hei
noralund Apr 26, 2023
ae4f081
bla bla
noralund Apr 27, 2023
7159f25
Hei
noralund Apr 27, 2023
4a91a6d
Images
maheggh Apr 30, 2023
e146ebf
moved svg
maheggh Apr 30, 2023
f354bec
Update style.css
maheggh Apr 30, 2023
0ea54e4
fjernet public folder
noralund May 1, 2023
5baf435
pushed from Martin branch
maheggh May 1, 2023
159b648
pushed from Martin branch
maheggh May 1, 2023
9bc0061
Merge branch 'Martin'
maheggh May 1, 2023
01be73f
fixed stuff
maheggh May 1, 2023
4d372fd
hei
noralund May 1, 2023
7ccf23f
Merge branch 'Norris'
noralund May 1, 2023
a06a6a1
.
maheggh May 1, 2023
d4ba8dd
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
maheggh May 1, 2023
e7fccb7
.
maheggh May 1, 2023
923d3ac
hei
noralund May 1, 2023
265b354
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
noralund May 1, 2023
a53bd3b
.
noralund May 1, 2023
3506cf4
Add assignment deadline url
github-classroom[bot] May 1, 2023
f9bba80
Changes Test
Geka19 May 1, 2023
6ba2bfe
Merge branch 'Guro'
Geka19 May 1, 2023
abf8609
Merge branch 'main' into Guro
Geka19 May 1, 2023
aa32655
Merge pull request #3 from AdvancedCSS2023/Guro
Geka19 May 1, 2023
52d0a54
Merge branch 'Norris'
noralund May 1, 2023
7264616
.
noralund May 1, 2023
87e73a9
CSS fixes
Geka19 May 1, 2023
010997e
Merge branch 'Guro'
Geka19 May 1, 2023
e83ae89
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
Geka19 May 1, 2023
41dcbf7
fish changes
maheggh May 1, 2023
0432144
.
noralund May 1, 2023
dea1e54
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
maheggh May 1, 2023
1681e82
.
noralund May 1, 2023
f8be3eb
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
maheggh May 1, 2023
c28d58a
.
noralund May 1, 2023
c99b427
.
noralund May 1, 2023
397cea6
.
noralund May 1, 2023
41a25c6
fixed the background changes
maheggh May 1, 2023
2c1084d
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
maheggh May 1, 2023
bf77c47
.
maheggh May 1, 2023
1fa0e3a
.
noralund May 1, 2023
100d244
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
noralund May 1, 2023
2710c22
scene settup
Geka19 May 1, 2023
21644a5
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
Geka19 May 1, 2023
b39c7de
icebear + background fix
maheggh May 2, 2023
c0b2123
Merge branch 'main' into Norris
noralund May 2, 2023
92ac09f
Merge branch 'main' into Norris
noralund May 3, 2023
a33a870
Color changes
Geka19 May 3, 2023
58fd1ba
Merge branch 'Guro' into Norris
noralund May 3, 2023
8f7e19c
Bug fixes
Geka19 May 5, 2023
7be1e2b
fish upgrade
noralund May 5, 2023
2946d4e
Merge branch 'Guro' into Norris
noralund May 5, 2023
0146cef
Merge remote-tracking branch 'origin/Norris' into Guro
Geka19 May 5, 2023
b9a8c76
Merge branch 'Norris' into Guro
Geka19 May 5, 2023
e3f79c3
BugFixes2
Geka19 May 5, 2023
df72655
.
noralund May 5, 2023
635ef8f
fixes
Geka19 May 5, 2023
a23db09
fixed fished and trash
noralund May 5, 2023
fa70f71
Fixes
Geka19 May 5, 2023
4aaa5a1
Merge branch 'Norris'
noralund May 5, 2023
44b79ce
px to vw and vh
maheggh May 7, 2023
0f77aa6
added lorem text and js update
maheggh May 7, 2023
b7fe25d
reduce motion
maheggh May 7, 2023
d1514fa
prefered color functionality
maheggh May 7, 2023
cab668c
.
noralund May 9, 2023
979d20a
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
noralund May 9, 2023
f663d2a
moved fish and trash
noralund May 9, 2023
4a645c5
Water fixes
Geka19 May 9, 2023
f40a2c2
Merge branch 'Guro'
Geka19 May 9, 2023
f0d40e8
small fix
Geka19 May 9, 2023
44b02ff
small fix
noralund May 9, 2023
7f35be0
fix
noralund May 9, 2023
94f484c
changes
Geka19 May 9, 2023
2b3b0f2
added scene 4
maheggh May 10, 2023
b63b07d
fix som stylez
maheggh May 10, 2023
405449f
put on clouds, and fixed text
noralund May 10, 2023
63b8f6a
Merge branch 'Norris'
noralund May 10, 2023
aa682d6
toxic barrel
maheggh May 10, 2023
fd8f9ec
Merge branch 'Martin'
maheggh May 10, 2023
45938ba
media queries, and some fixes
noralund May 10, 2023
d900318
iceberg-fade
Geka19 May 10, 2023
1f82a0b
fixed some things
noralund May 11, 2023
90a1ced
.
noralund May 11, 2023
4d9a59a
tried to fix MQ
noralund May 11, 2023
f0e565b
Merge branch 'Guro' into Norris
noralund May 11, 2023
a0d6029
.
noralund May 11, 2023
e2998b7
.
noralund May 11, 2023
cdebd56
.
noralund May 11, 2023
7a58883
Merge branch 'Martin' into Norris
noralund May 11, 2023
1d0856b
.
noralund May 11, 2023
25d22a7
MQ fixes
Geka19 May 11, 2023
0a47a44
Merge branch 'Guro' into Norris
noralund May 11, 2023
0c1acd1
MQ fixes2
Geka19 May 11, 2023
af4e47f
.
noralund May 11, 2023
e639d38
Merge branch 'Norris' into MQ-alterations
noralund May 11, 2023
e96fbd4
fixed positioning
maheggh May 11, 2023
7396754
fixed posititoning of scene 3 and 4
maheggh May 11, 2023
b390f0d
Position Fixed
Geka19 May 11, 2023
6581d61
minor fixes
Geka19 May 11, 2023
2f5e84f
.
noralund May 12, 2023
eac2a48
Text and MQ
Geka19 May 13, 2023
4dd2969
Merge branch 'MQ-alterations' of https://github.com/AdvancedCSS2023/a…
Geka19 May 13, 2023
ad7d0e0
margin fix
Geka19 May 13, 2023
86d05c5
tiny changes
Geka19 May 13, 2023
ebc1d67
fish changes
maheggh May 13, 2023
8e4bb1a
some css fixes, and removed oceanfloor border
maheggh May 13, 2023
a7d4f58
edited end text again
maheggh May 13, 2023
bc44dfa
read me file
noralund May 13, 2023
e1ed720
Merge branch 'MQ-alterations' of https://github.com/AdvancedCSS2023/a…
noralund May 13, 2023
6817a02
small changes
maheggh May 14, 2023
0c3dbec
Merge branch 'MQ-alterations' of https://github.com/AdvancedCSS2023/a…
maheggh May 14, 2023
8c8c3ca
Deleted unnecessary code
maheggh May 14, 2023
592f3df
small fix
Geka19 May 14, 2023
e4699b3
landscape/portrait
maheggh May 14, 2023
57c0bcd
Merge branch 'MQ-alterations' of https://github.com/AdvancedCSS2023/a…
maheggh May 14, 2023
3a371dc
.
maheggh May 14, 2023
8488f88
BEM fix
Geka19 May 14, 2023
b7e1769
.
maheggh May 14, 2023
46bd909
comment-fix
Geka19 May 14, 2023
0254959
Merge branch 'MQ-alterations'
maheggh May 14, 2023
e33990f
Merge branch 'Guro'
Geka19 May 14, 2023
cd01055
Merge branch 'main' of https://github.com/AdvancedCSS2023/assignment-…
Geka19 May 14, 2023
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
Prev Previous commit
Next Next commit
some margin changes
maheggh committed Apr 26, 2023
commit 4a45cb0062edadc23c3c7d9510e4f1496b18f81f
4 changes: 2 additions & 2 deletions src/sass/_scene1.scss
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ THE BEGINNING:
}

&__quote {
margin-left: auto;
margin-right: auto;
margin: 20px;
width: 400px;
}
}
4 changes: 2 additions & 2 deletions src/sass/style.css
Original file line number Diff line number Diff line change
@@ -56,8 +56,8 @@ THE BEGINNING:
display: grid;
}
.scroll-section__quote {
margin-left: auto;
margin-right: auto;
margin: 20px;
width: 400px;
}

/* scene 2
2 changes: 1 addition & 1 deletion src/sass/style.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.