diff --git a/01/style.css b/01/style.css index faa3160d..7a11647a 100644 --- a/01/style.css +++ b/01/style.css @@ -1,23 +1,25 @@ * { - 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(100% 0, 0 100%, 0 0); +} diff --git a/02/styles/global.css b/02/styles/global.css index a1c785e8..50c5160d 100644 --- a/02/styles/global.css +++ b/02/styles/global.css @@ -1,26 +1,54 @@ * { - margin: 0; - padding: 0; - box-sizing: border-box; + margin: 0; + padding: 0; + box-sizing: border-box; } -.a, .b, .c { - border: 3px solid transparent; - min-height: 50px; +.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"; +} + +body > * { + height: 50vh; +} + +@media (min-width: 601px) { + body { + grid-template-areas: + "A A" + "C B"; + + max-width: 1200px; + margin-inline: auto; + } +} diff --git a/03/images/jpg/picture-large.jpg b/03/images/jpg/picture-large.jpg new file mode 100644 index 00000000..116e60d6 Binary files /dev/null and b/03/images/jpg/picture-large.jpg differ diff --git a/03/images/jpg/picture-large@x2.jpg b/03/images/jpg/picture-large@x2.jpg new file mode 100644 index 00000000..6965ec1b Binary files /dev/null and b/03/images/jpg/picture-large@x2.jpg differ diff --git a/03/images/jpg/picture-largex@3.jpg b/03/images/jpg/picture-largex@3.jpg new file mode 100644 index 00000000..d6096e17 Binary files /dev/null and b/03/images/jpg/picture-largex@3.jpg differ diff --git a/03/images/jpg/picture-medium.jpg b/03/images/jpg/picture-medium.jpg new file mode 100644 index 00000000..34ae921d Binary files /dev/null and b/03/images/jpg/picture-medium.jpg differ diff --git a/03/images/jpg/picture-medium@x2.jpg b/03/images/jpg/picture-medium@x2.jpg new file mode 100644 index 00000000..6f8c0f62 Binary files /dev/null and b/03/images/jpg/picture-medium@x2.jpg differ diff --git a/03/images/jpg/picture-medium@x3.jpg b/03/images/jpg/picture-medium@x3.jpg new file mode 100644 index 00000000..7811e15e Binary files /dev/null and b/03/images/jpg/picture-medium@x3.jpg differ diff --git a/03/images/jpg/picture-small.jpg b/03/images/jpg/picture-small.jpg new file mode 100644 index 00000000..f0814244 Binary files /dev/null and b/03/images/jpg/picture-small.jpg differ diff --git a/03/images/jpg/picture-small@x2.jpg b/03/images/jpg/picture-small@x2.jpg new file mode 100644 index 00000000..d33fbf89 Binary files /dev/null and b/03/images/jpg/picture-small@x2.jpg differ diff --git a/03/images/jpg/picture-small@x3.jpg b/03/images/jpg/picture-small@x3.jpg new file mode 100644 index 00000000..ed66d980 Binary files /dev/null and b/03/images/jpg/picture-small@x3.jpg differ diff --git a/03/images/webp/picture-large.webp b/03/images/webp/picture-large.webp new file mode 100644 index 00000000..eba0ae27 Binary files /dev/null and b/03/images/webp/picture-large.webp differ diff --git a/03/images/webp/picture-large@x2.webp b/03/images/webp/picture-large@x2.webp new file mode 100644 index 00000000..1558604a Binary files /dev/null and b/03/images/webp/picture-large@x2.webp differ diff --git a/03/images/webp/picture-large@x3.webp b/03/images/webp/picture-large@x3.webp new file mode 100644 index 00000000..567e6a65 Binary files /dev/null and b/03/images/webp/picture-large@x3.webp differ diff --git a/03/images/webp/picture-medium.webp b/03/images/webp/picture-medium.webp new file mode 100644 index 00000000..e55b37d1 Binary files /dev/null and b/03/images/webp/picture-medium.webp differ diff --git a/03/images/webp/picture-medium@x2.webp b/03/images/webp/picture-medium@x2.webp new file mode 100644 index 00000000..f32bdc3a Binary files /dev/null and b/03/images/webp/picture-medium@x2.webp differ diff --git a/03/images/webp/picture-medium@x3.webp b/03/images/webp/picture-medium@x3.webp new file mode 100644 index 00000000..98bd849f Binary files /dev/null and b/03/images/webp/picture-medium@x3.webp differ diff --git a/03/images/webp/picture-small.webp b/03/images/webp/picture-small.webp new file mode 100644 index 00000000..3cb4373e Binary files /dev/null and b/03/images/webp/picture-small.webp differ diff --git a/03/images/webp/picture-small@x2.webp b/03/images/webp/picture-small@x2.webp new file mode 100644 index 00000000..14a5cf5d Binary files /dev/null and b/03/images/webp/picture-small@x2.webp differ diff --git a/03/images/webp/picture-small@x3.webp b/03/images/webp/picture-small@x3.webp new file mode 100644 index 00000000..596a6d4e Binary files /dev/null and b/03/images/webp/picture-small@x3.webp differ diff --git a/03/index.html b/03/index.html index 4a2e35c2..0457da6b 100644 --- a/03/index.html +++ b/03/index.html @@ -1,16 +1,86 @@ -
- - - + + + +
+