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.

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

Test 3 #2

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

Test 3 #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d0e3668
Testcommit
Sep 13, 2019
ccb6dc3
Test2
Sep 13, 2019
ad47f6c
Update style.css
linkanpro1 Sep 13, 2019
892313c
Test 4
Andreas-Hagstrom Sep 13, 2019
15ee52f
Merge branch 'master' of https://github.com/jenseneducation-linus-vik…
Andreas-Hagstrom Sep 13, 2019
c93d0dd
TEST5
linkanpro1 Sep 13, 2019
3f9e9aa
Merge branch 'master' of https://github.com/jenseneducation-linus-vik…
linkanpro1 Sep 13, 2019
614e410
Mappar
Andreas-Hagstrom Sep 13, 2019
f57b4d7
Mapp 2
Andreas-Hagstrom Sep 13, 2019
d951676
Färdig produkt
linkanpro1 Sep 18, 2019
a61dc31
Små ändringar
linkanpro1 Sep 18, 2019
a32e3bf
Sista smånändringar
linkanpro1 Sep 18, 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
Prev Previous commit
Next Next commit
Små ändringar 
Kommentarer bortplockade, lite ändringar i layout.
  • Loading branch information
@linkanpro1
linkanpro1 committed Sep 18, 2019
commit a61dc311651f121e7b9ef7327b7752262e5c755b
11 changes: 2 additions & 9 deletions Projektarbete/Kod/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,19 @@ body {
font-size: 100%;
}

/*@media (max-width: 600px)*/
.gridcontainer {
max-width: 1000px;
min-width: 100px;
margin: 0 230px;
display: grid;
grid-template-columns: /*repeat(
auto-fit,
minmax(1000px, 1fr)
);*/ 1fr 1fr 1fr 1fr 1fr 1fr;
grid-template-rows: 300px 300px 70px 300px 150px /*150px 200px*/ 600px 300px 300px 70px 300px;
grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
grid-template-rows: 300px 300px 70px 300px 150px 600px 300px 300px 70px 300px;
grid-template-areas:
"top top top aside aside aside"
"top top top main main main"
"nav nav nav nav nav nav"
"boxa boxa boxa boxb boxb boxb"
"boxa boxa boxa boxb boxb boxb"
/*"boxa1 boxa1 boxb1 boxb1 boxc1 boxc1"
"boxc2 boxc2 boxc3 boxc3 boxc4 boxc4"*/
"boxc5 boxc5 boxc5 boxc5 boxc5 boxc5"
"boxd boxd boxe boxe boxf boxf"
"boxg boxg boxh boxh boxi boxi"
Expand Down Expand Up @@ -146,7 +140,6 @@ a {
color: #818181fd;
}

/* gör markerad länk svart när pekare står över */
a:hover {
color: #111;
border-bottom: solid;
Expand Down
5 changes: 3 additions & 2 deletions Projektarbete/Kod/css/stylecontact.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ nav a:hover{
font-size: 75px;
color: white;
margin-top: 25%;
margin-left: 200px;
margin-left: 160px;
font-weight: bold;
}

Expand Down Expand Up @@ -109,9 +109,10 @@ textarea{
padding: 12px 20px;
box-sizing: border-box;
background-color: #ffff;
font-size: 30px;
font-size: 25px;
resize: none;
border-radius: 10px;
font-family: "Playfair Display", serif;
}

#textemail{
Expand Down