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

Topic 0-1 #81

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

Topic 0-1 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f9908bf
I upload the html topic. CSS in progress
matoliva Jun 23, 2018
13e4f33
ending CSS
matoliva Jun 25, 2018
c26fbb2
Topic 1 exercise 12 done
matoliva Jun 26, 2018
aed0d25
Exercise 7 done
matoliva Jun 27, 2018
d8fb6d3
upload exercise 8
matoliva Jun 27, 2018
97d470f
excercise 9/10 done
matoliva Jun 27, 2018
196ff1f
update jokeApi.html
matoliva Jun 29, 2018
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
35 changes: 35 additions & 0 deletions 00-HTML-CSS-basics/CSS/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!doctype html>
<html class="no-js" lang="en">

<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title>CSS</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Place favicon.ico in the root directory -->

<link rel="stylesheet" href="normalize.css">
<link rel="stylesheet" href="style.css">
</head>
<body>
<div class="container">
<header class="header"><code> &#60;Header&#62;</code></header>
<nav class="nav"><code> &#60;Nav&#62;</code></nav>
<section class="content"> <code> &#60;Section&#62;</code>
<header class="hsection"><code> &#60;Header&#62;</code></header>
<article class="asection"><code> &#60;Article&#62;</code></article>
<footer class="fsection"><code> &#60;Footer&#62;</code></footer>
</section>
<aside class="sidebar"><code> &#60;aside&#62;</code></aside>
<footer class="footer"><code> &#60;Footer&#62;</code></footer>
</div>
<!-- Google Analytics: change UA-XXXXX-Y to be your site's ID. -->
<script>
window.ga = function () { ga.q.push(arguments) }; ga.q = []; ga.l = +new Date;
ga('create', 'UA-XXXXX-Y', 'auto'); ga('send', 'pageview')
</script>
<script src="https://www.google-analytics.com/analytics.js" async defer></script>
</body>

</html>
66 changes: 66 additions & 0 deletions 00-HTML-CSS-basics/CSS/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Funciones</title>
<style>
body {
font-family: Arial;
}
.container {
display: grid;
/*grid-template-columns: 25% 200px 25%;*/
/*grid-template-rows: 300px 150px;*/
/*grid-template: filas / columnas ;*/
/*fr*/
/*grid-template: 300px 100px 100px / repeat(4, 1fr);*/
/*grid-template: 300px 100px 100px / repeat(4, minmax(200px, 1fr));*/
grid-template: 300px 100px 100px / minmax(200px, 1fr) 1fr 1fr 1fr;
grid-column-gap: 30px;
grid-row-gap: 50px;
/*grid-gap: filas columnas;*/
grid-gap: 10px;
}
.item {
background: lightblue;
padding: 10px;
border: 1px solid red;
/*margin-right: 10px;*/
/*margin-bottom: 10px;*/
}
.item:nth-of-type(4) {
background: blue;
overflow: auto;
/*display: subgrid;*/
/*display: inline-grid;*/
display: grid;
grid-template: 50px 50px / 15fr 85fr;
}
.item .item {
background: yellow;
}
</style>
</head>
<body>
<section class="container">
<div class="item">zaraza #1</div>
<div class="item">contenido #2</div>
<div class="item">contenido #3</div>
<div class="item">
<div class="item">subitem #1</div>
<div class="item">subitem #2</div>
<div class="item">subitem #3</div>
<div class="item">subitem #4</div>
<div class="item">subitem #5</div>
</div>
<div class="item">contenido #5</div>
<div class="item">contenido #6</div>
<div class="item">contenido #7</div>
<div class="item">contenido #8</div>
<div class="item">contenido #9</div>
<div class="item">contenido #10</div>
<div class="item">contenido #11</div>
<div class="item">contenido #12</div>
</section>
</body>
</html>
0 00-HTML-CSS-basics/.empty → 00-HTML-CSS-basics/CSS/layoutStyle.css
View file
Open in desktop
File renamed without changes.
Loading