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

new pull request #2

Open
wants to merge 91 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
086d6b2
Update .gitkeep
marbije Sep 19, 2024
3c9a81c
.
Nayomekaia Sep 19, 2024
c6901cb
.
Nayomekaia Sep 19, 2024
cc99ba1
.
Nayomekaia Sep 19, 2024
b3d2fa5
.
Nayomekaia Sep 19, 2024
55407da
.
Nayomekaia Sep 19, 2024
627e276
.
Nayomekaia Sep 19, 2024
16f4428
.
Nayomekaia Sep 19, 2024
0156af0
.
Nayomekaia Sep 19, 2024
1b8013f
changed pointer
Nayomekaia Sep 19, 2024
40ef959
.
Nayomekaia Sep 19, 2024
4f04938
.
Nayomekaia Sep 19, 2024
9067800
.
Nayomekaia Sep 19, 2024
13b7140
.
Nayomekaia Sep 19, 2024
9d2336a
.
Nayomekaia Sep 19, 2024
de9c485
.
Nayomekaia Sep 19, 2024
d00e301
.
Nayomekaia Sep 19, 2024
3559f73
.
Nayomekaia Sep 19, 2024
95db66a
Update squad page.html
marbije Sep 19, 2024
d41ec2f
Update squad page.css
marbije Sep 19, 2024
b0f6e63
Merge branch 'main' of https://github.com/Nayomekaia/your-tribe-squad…
marbije Sep 19, 2024
4134319
Squad foto Anouar
marbije Sep 19, 2024
f6c10c8
Update squad page.css
Nayomekaia Sep 19, 2024
e03765e
Update index.html
Nayomekaia Sep 19, 2024
7a63791
linked
Nayomekaia Sep 20, 2024
b48c367
.
Nayomekaia Sep 20, 2024
3362071
.
Nayomekaia Sep 20, 2024
af6aa24
.
Nayomekaia Sep 20, 2024
5d8dff4
.
Nayomekaia Sep 20, 2024
67d1189
Update index.html
Nayomekaia Sep 20, 2024
298680d
img veranderd
Nayomekaia Sep 20, 2024
864e6a7
.
Nayomekaia Sep 20, 2024
8df5fa4
.
Nayomekaia Sep 20, 2024
7c13a65
.
Nayomekaia Sep 20, 2024
c8b1a5c
.
Nayomekaia Sep 20, 2024
693a945
.
Nayomekaia Sep 20, 2024
29782a2
.
Nayomekaia Sep 20, 2024
d4e52fc
.
Nayomekaia Sep 20, 2024
50c6ade
.
Nayomekaia Sep 20, 2024
eaa45b1
.
Nayomekaia Sep 20, 2024
1eb0447
.
Nayomekaia Sep 20, 2024
c63c1a8
.
Nayomekaia Sep 20, 2024
4e30446
.
Nayomekaia Sep 20, 2024
a312d64
.
Nayomekaia Sep 20, 2024
8bf348e
.
Nayomekaia Sep 20, 2024
37c6a54
.
Nayomekaia Sep 20, 2024
1cba289
.
Nayomekaia Sep 20, 2024
856c7ca
.
Nayomekaia Sep 20, 2024
cdc82cc
.
Nayomekaia Sep 20, 2024
059382e
.
Nayomekaia Sep 20, 2024
0a43b97
.
Nayomekaia Sep 20, 2024
aa06cda
.
Nayomekaia Sep 20, 2024
06adbbf
.
Nayomekaia Sep 20, 2024
cd8a32e
.
Nayomekaia Sep 20, 2024
82a3eed
.
Nayomekaia Sep 20, 2024
2d32ebd
campustour link toegevoegd
Nayomekaia Sep 20, 2024
628edf5
campus tour link
Nayomekaia Sep 20, 2024
0f16023
link
Nayomekaia Sep 20, 2024
054adb6
.
Nayomekaia Sep 20, 2024
aa8d00f
link css
Nayomekaia Sep 20, 2024
e67c3de
.
Nayomekaia Sep 20, 2024
2fb3f50
campus tour button toegevoegd
Nayomekaia Sep 20, 2024
b24c923
+
Nayomekaia Sep 20, 2024
016cb00
.
Nayomekaia Sep 20, 2024
2bf3113
Update .gitkeep
Nayomekaia Sep 20, 2024
3ebc2aa
Create style.css
Nayomekaia Sep 20, 2024
62ef5b4
Delete style.css
Nayomekaia Sep 20, 2024
29a8986
Merge branch 'main' of https://github.com/Nayomekaia/your-tribe-squad…
Nayomekaia Sep 20, 2024
fc7cdee
.
Nayomekaia Sep 20, 2024
b741a79
.
Nayomekaia Sep 20, 2024
f71c6fd
.
Nayomekaia Sep 20, 2024
4e8b044
.
Nayomekaia Sep 20, 2024
efc28b1
.
Nayomekaia Sep 22, 2024
17a11b9
.
Nayomekaia Sep 22, 2024
befc724
.
Nayomekaia Sep 22, 2024
fe47c68
speech cloud
Nayomekaia Sep 25, 2024
7190ba3
alles naar de center gedaan
Nayomekaia Sep 25, 2024
ab908ef
fixed css
Nayomekaia Sep 25, 2024
04a1aac
.
Nayomekaia Sep 25, 2024
e710291
Merge branch 'main' of https://github.com/Nayomekaia/your-tribe-squad…
Nayomekaia Sep 25, 2024
954db63
color h1 veranderd
Nayomekaia Sep 25, 2024
ae74193
.
Nayomekaia Sep 26, 2024
174e79f
achtergronds kleur veranderd
Nayomekaia Sep 26, 2024
4a859c5
font veranderd
Nayomekaia Oct 13, 2024
cfbd1f5
test
Nayomekaia Oct 13, 2024
57c57f4
.
Nayomekaia Oct 13, 2024
8cff326
.
Nayomekaia Oct 13, 2024
70bb39b
testen
Nayomekaia Oct 19, 2024
e9e84c0
Merge branch 'main' of https://github.com/Nayomekaia/your-tribe-squad…
Nayomekaia Oct 19, 2024
97e1388
css layout
Nayomekaia Oct 19, 2024
6a9ff93
test
Nayomekaia Oct 23, 2024
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
18 changes: 2 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,2 @@





een groepje van 3 in een squadpage alle profile cards te laten zien

- kleurpalet
- iedereen zijn eigen draai eraan heeft gegeven

korte uitleg project ( drie opvallende features)
screenshots
info teamleden

https://edu.nl/fhhhr

de opdracht was om een squadpage te maken met een groepje van 3. hierin vormden marije, tessa en nayome een groepje
hierin hebben wij onze squadpage gecreerd met html, css en javascript.
2 changes: 1 addition & 1 deletion assets/.gitkeep
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<H1>

Binary file added assets/Squad1H-Anouar.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/fonts/Lalezar/Lalezar-Regular.ttf
Binary file not shown.
93 changes: 93 additions & 0 deletions assets/fonts/Lalezar/OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2015 Borna Izadpanah (www.borna.design).

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
https://openfontlicense.org


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file added assets/fonts/Lekton/Lekton-Bold.ttf
Binary file not shown.
Binary file added assets/fonts/Lekton/Lekton-Italic.ttf
Binary file not shown.
Binary file added assets/fonts/Lekton/Lekton-Regular.ttf
Binary file not shown.
93 changes: 93 additions & 0 deletions assets/fonts/Lekton/OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright (c) 2008-2010, Isia Urbino (http://www.isiaurbino.net)

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
https://openfontlicense.org


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file added assets/img/Campus/AmstelPlein.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/Campus/CafeKo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/Campus/FoodBox.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/Campus/RoofLab.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/Campus/StudentInfo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/Campus/StudySpot.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/Campus/Studyspot2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 5 additions & 20 deletions assets/squad page.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<style>


html {
Expand Down Expand Up @@ -38,7 +37,7 @@
}

.title {
color: grey;
color: #fff;
}

.button {
Expand All @@ -47,29 +46,15 @@
display: inline-block;
padding: 8px;
color: white;
background-color: #000;
background-color: #fff;
text-align: center;
cursor: pointer;
width: 100%;
}

.button:hover {
background-color: #555;
background-color: #fff;
}
</style>


}
.container {
display:flex;
justify-content: center;
align-items: center;
height: 100vh;
body {
font-family: 'Lalezar', sans-serif;
}

.circle {
width: 200px;
height: 200px;
background-color: #3498db;
border-radius: 50%;
}
114 changes: 63 additions & 51 deletions assets/squad page.html
Original file line number Diff line number Diff line change
@@ -1,67 +1,79 @@
<!DOCTYPE html>

<html lang="en">
<html lang="nl">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Nieuw Lettertype Toevoegen</title>
<title>Lalezar Google Font Toevoegen</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Lalezar&display=swap" rel="stylesheet">
<style>
body {
font-family: 'Lalezar', sans-serif;
font-family: 'Lalezar', sans-serif;
}
</style>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<style>
body {
display: flex;
justify-content: center;
align-items: center;
height: 100vh;

background-color: #023047;
}
.circle {
width: 400px;
height: 400px;
border-radius: 50%;
background-color: #E7D7C1;
}
</style>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Tekst wit maken met CSS</title>
<style>
.white-text {
color: white;
}
p {
color: #ffffff;
}
</style>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Achtergrondkleur Veranderen</title>
<style>
body {
background-color: #023047;
}
</style>


<meta name="viewport" content="width=device-width, initial-scale=1.0">
<style>
body {
text-align: center;

margin: 0,
}
</style>
<title>Squad 1H</title>

<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Cirkels in het Midden</title>
<style>
body {
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
margin: 0;
background-color: #023047;
}
.circle {
width: 500px;
height: 500px;
border-radius: 50%;
background-color: #E7D7C1;
}
</style>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Centrale Tekst</title>
<style>
body {
display: grid;
place-items: center;
height: 100vh;
margin: 0;
background-color: #023047;
}
h1 {
color: white;
}
</style>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Fotos in een Cirkel</title>
<link rel="stylesheet" href="squad page.css">
</head>

<body>

<h1 class="white-text">Squad 1H</h1>
<body style="background-color: #023047;">
<div class="container">
<div class="circle"></div>
</div>


</body>
<body>
<h1>Squad 1H</h1>

<div class="circle">
<!-- Voeg hier je foto's toe -->
<img src="foto1.jpg" alt="Foto 1" class="photo">
<img src="foto2.jpg" alt="Foto 2" class="photo">
<img src="foto3.jpg" alt="Foto 3" class="photo">
<!-- Herhaal voor meer foto's -->
</div>
</div>
</body>

</html>
Loading