diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c6f9a448 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vscode/settings.json diff --git a/01/style.css b/01/style.css index faa3160d..a5044c7b 100644 --- a/01/style.css +++ b/01/style.css @@ -1,23 +1,24 @@ * { - margin: 0; - padding: 0; - box-sizing: border-box; + margin: 0; + padding: 0; + box-sizing: border-box; } .content { - background-color: #fff; - min-height: 320px; - min-width: 320px; - max-width: 600px; - text-align: justify; + background-color: #fff; + min-height: 320px; + min-width: 320px; + max-width: 600px; + text-align: justify; } .content::before { - float: left; - display: block; - content: ''; - height: 0; - border: 150px solid #dcdcdc; - border-right-color: transparent; - border-bottom-color: transparent; -} \ No newline at end of file + float: left; + display: block; + content: ""; + height: 0; + border: 150px solid #dcdcdc; + border-right-color: transparent; + border-bottom-color: transparent; + shape-outside: polygon(0 0, 0% 100%, 100% 0); +} diff --git a/02/styles/global.css b/02/styles/global.css index a1c785e8..ac68502e 100644 --- a/02/styles/global.css +++ b/02/styles/global.css @@ -1,26 +1,55 @@ * { - margin: 0; - padding: 0; - box-sizing: border-box; + margin: 0; + padding: 0; + box-sizing: border-box; } +body { + grid-template-areas: + "a" + "b" + "c"; +} +.a, +.b, +.c { + border: 3px solid transparent; + min-height: 50px; + height: 50vh; -.a, .b, .c { - border: 3px solid transparent; - min-height: 50px; - - display: flex; - justify-content: center; - align-items: center; + display: flex; + justify-content: center; + align-items: center; } .a { - border-color: #ffffba + border-color: #ffffba; + grid-area: a; } .b { - border-color: #ffdfba; + border-color: #ffdfba; + grid-area: b; } .c { - border-color: #baffc9; -} \ No newline at end of file + border-color: #baffc9; + grid-area: c; +} +body { + display: grid; + grid-template-areas: + "a" + "b" + "c"; +} + +@media screen and (min-width: 600px) { + body { + display: grid; + grid-template-areas: + "a a" + "c b"; + max-width: 1200px; + margin: 0 auto; + } +} diff --git a/03/assets/img.jpg b/03/assets/img.jpg new file mode 100644 index 00000000..78be5f30 Binary files /dev/null and b/03/assets/img.jpg differ diff --git a/03/assets/img1200.jpg b/03/assets/img1200.jpg new file mode 100644 index 00000000..9d07e918 Binary files /dev/null and b/03/assets/img1200.jpg differ diff --git a/03/assets/img300.jpg b/03/assets/img300.jpg new file mode 100644 index 00000000..1fd8bd80 Binary files /dev/null and b/03/assets/img300.jpg differ diff --git a/03/assets/img600.jpg b/03/assets/img600.jpg new file mode 100644 index 00000000..ebb1e91d Binary files /dev/null and b/03/assets/img600.jpg differ diff --git a/03/index.html b/03/index.html index 4a2e35c2..f81148d3 100644 --- a/03/index.html +++ b/03/index.html @@ -1,16 +1,73 @@ -
- - - + + + + + + + ++ Lorem ipsum dolor sit amet consectetur, adipisicing elit. Fuga porro + voluptas suscipit voluptatibus. Corrupti dolore asperiores ex distinctio + iusto iste! Lorem ipsum dolor sit amet consectetur, adipisicing elit. + Fuga porro voluptas suscipit voluptatibus. Corrupti dolore asperiores ex + distinctio iusto iste! Lorem ipsum dolor sit amet consectetur, + adipisicing elit. Fuga porro voluptas suscipit voluptatibus. Corrupti + dolore asperiores ex distinctio iusto iste! +
+ + Lorem ipsum dolor sit amet consectetur, adipisicing elit. Fuga porro + voluptas suscipit voluptatibus. Corrupti dolore asperiores ex distinctio + iusto iste! Lorem ipsum dolor sit amet consectetur, adipisicing elit. Fuga + porro voluptas suscipit voluptatibus. Corrupti dolore asperiores ex + distinctio iusto iste! Lorem ipsum dolor sit amet consectetur, adipisicing + elit. Fuga porro voluptas suscipit voluptatibus. Corrupti dolore + asperiores ex distinctio iusto iste! Lorem ipsum dolor sit amet + consectetur, adipisicing elit. Fuga porro voluptas suscipit voluptatibus. + Corrupti dolore asperiores ex distinctio iusto iste! ++ Lorem ipsum dolor sit amet consectetur, adipisicing elit. Fuga porro + voluptas suscipit voluptatibus. Corrupti dolore asperiores ex distinctio + iusto iste! Lorem ipsum dolor sit amet consectetur, adipisicing elit. + Fuga porro voluptas suscipit voluptatibus. Corrupti dolore asperiores ex + distinctio iusto iste! Lorem ipsum dolor sit amet consectetur, + adipisicing elit. Fuga porro voluptas suscipit voluptatibus. Corrupti + dolore asperiores ex distinctio iusto iste! +
+
+