Skip to content
Open

Dani #23

Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 40 additions & 0 deletions m1/examen-m1/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="style.css">
<title>Document</title>
</head>

<body>
<header>
<h1>Curs Mean-stack 2019</h1>
<nav id="navigator">
<ul id="navlist">
<li class="nav-item nav-item1"><a href="">Inici</a></li>
<li class="nav-item nav-item2"><a href="">Calendari</a></li>
<li class="nav-item nav-item3"><a href="">Activitats</a></li>
<li class="nav-item nav-item4"><a href="">Persones</a></li>
<li class="nav-item nav-item5"><a href="">Projectes</a></li>
</ul>
</nav>
</header>
<main>
<section>
<div id="alumnes">
<a href=""><h2>alumnes</h2></a>
</div>
<div id="recursos">
<a href=""><h2>recursos</h2></a>
</div>
</section>
</main>
<footer>
<h6>Copyright © 2019 mean-stack - html | css | javascript</h6>
</footer>
</body>

</html>
56 changes: 56 additions & 0 deletions m1/examen-m1/layout.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
*{
font-family: Helvetica, Arial, sans-serif;
color:whitesmoke;
}
header{
text-align: center;
line-height: 2em;
display: flex;
flex-direction: column;
justify-content: space-evenly;
<<<<<<< HEAD
height: 30%;
=======
height: 15em;
>>>>>>> master
filter: grayscale(100%);
}
nav{
ul{
li{
display: inline;
a{
text-decoration: none;
color: whitesmoke;
}
}
}
}
main{
<<<<<<< HEAD
height: 50%;
=======
height: 30rem;
>>>>>>> master

section{
display: flex;
flex-direction: row;
justify-content: space-between;
}
}
footer{
text-align: center;
<<<<<<< HEAD
height: 20%;
=======
height: 14em;
>>>>>>> master
background-color: #333;
display: flex;

justify-content: flex-end;
h6 {
margin: auto auto 1em auto;
}
}
Binary file added m1/examen-m1/paisaje-natural-item-5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions m1/examen-m1/reset.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
html,body{margin: 0;padding: 0;height: 100%;}
h1{margin:0;}
141 changes: 141 additions & 0 deletions m1/examen-m1/style.css

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

5 changes: 5 additions & 0 deletions m1/examen-m1/style.css.map

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

73 changes: 73 additions & 0 deletions m1/examen-m1/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
@import "reset.scss";
@import "layout.scss";

header{
background-image: url(./paisaje-natural-item-5.jpg);
background-repeat: no-repeat;
background-size: cover;
}
#navlist{
li{
padding: 5px;
a{
font-size: 0.8em;;
}
&:hover{
a{color:#cecece}
}
}
}
section{
padding: 0.5em;
div{
padding:1em;
}

}
#recursos,#alumnes {
text-decoration: none;
border: 1px solid whitesmoke;
border-radius: 5%;
text-align: center;
a{padding:10em;text-decoration: none;
h2{
font-size: 2.2em;
padding: 1.5em 1em;
}
}
&:hover {
background-color: #0000001a;
a{
text-shadow: 5px 4px 8px black;
filter: drop-shadow(16px 16px 20px #333);
}
}
}
<<<<<<< HEAD
=======

#recursos {
text-decoration: none;
border: 1px solid whitesmoke;
border-radius: 5%;
text-align: center;
a{
padding:10em;text-decoration: none;
h2{
font-size: 2.2em;
padding: 1.5em 1em;
}
}
&:hover {
background-color: #0000001a;
a{
text-shadow: 5px 4px 8px black;
filter: drop-shadow(16px 16px 20px #333);

}
}

}


>>>>>>> master