diff --git a/01/style.css b/01/style.css index faa3160d..b81b1803 100644 --- a/01/style.css +++ b/01/style.css @@ -10,14 +10,35 @@ min-width: 320px; max-width: 600px; text-align: justify; + padding: 0 16px; } + .content::before { float: left; display: block; content: ''; height: 0; + margin-right: 16px; /* Lapiej to wygada z marginesem */ + margin: 0 16px 0 -16px; border: 150px solid #dcdcdc; border-right-color: transparent; - border-bottom-color: transparent; + border-bottom-color: transparent; + clip-path: polygon(0 0, 100% 0, 0 100%); /* "Ścieżka przycięcia " */ + shape-outside: polygon(0 0, 100% 0, 0 100%); /* Dodanie wycięcia "kształt na zewnątrz" */ + transition: + clip-path 0.6s ease-in-out, + shape-outside 0.6s ease-in-out, + margin-left 0.6s ease-in-out; +} + +/* Na mobile */ + +@media (max-width: 600px) { + .content::before { + clip-path: polygon(0 0, 50% 0, 0 50%); + shape-outside: polygon(0 0, 50% 0, 0 50%); + margin: 0 16px 0 -16px; + line-height: 18px; + } } \ No newline at end of file diff --git a/02/index.html b/02/index.html index 1e60de72..854e1220 100644 --- a/02/index.html +++ b/02/index.html @@ -1,5 +1,6 @@ + @@ -7,10 +8,15 @@ devmentor.pl - HTML & CSS: RWD - #02 + + + +
A
C
B
+ \ No newline at end of file diff --git a/02/styles/desktop.css b/02/styles/desktop.css new file mode 100644 index 00000000..07a79f5e --- /dev/null +++ b/02/styles/desktop.css @@ -0,0 +1,4 @@ +body { + display: block; + +} \ No newline at end of file diff --git a/02/styles/global.css b/02/styles/global.css index a1c785e8..8d557e55 100644 --- a/02/styles/global.css +++ b/02/styles/global.css @@ -5,12 +5,11 @@ } .a, .b, .c { - border: 3px solid transparent; - min-height: 50px; - display: flex; justify-content: center; align-items: center; + border: 3px solid transparent; + min-height: 50px; } .a { diff --git a/02/styles/mobile.css b/02/styles/mobile.css new file mode 100644 index 00000000..bcd7d890 --- /dev/null +++ b/02/styles/mobile.css @@ -0,0 +1,40 @@ +body { + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: repeat(2, 1fr); + grid-column-gap: 0px; + grid-row-gap: 0px; +} + +.a { + grid-area: 1 / 1 / 2 / 3; /* Zaczyna się na 1 wierszu i 1 kolumnie, kończy się na 2 wierszu 3 kolumnie */ +} + +.b { + grid-area: 2 / 1 / 3 / 2; /* Zaczyna się na 2 wierszu i 1 kolumnie, kończy się na 3 wierszu 2 kolumnie */ +} + +.c { + grid-area: 2 / 2 / 3 / 3; /* Zaczyna się na 2 wierszu i 2 kolumnie, kończy się na 3 wierszu 3 kolumnie */ +} + +/* + +lub + +.a { + grid-row: span 1; + grid-column: span 2; +} + +.b { + grid-row: span 1; + grid-column: span 1; +} + +.c { + grid-row: span 1; + grid-column: span 2; +} + +*/ diff --git a/02/styles/tablet.css b/02/styles/tablet.css new file mode 100644 index 00000000..07a79f5e --- /dev/null +++ b/02/styles/tablet.css @@ -0,0 +1,4 @@ +body { + display: block; + +} \ No newline at end of file diff --git a/03/assets/1280.jpg b/03/assets/1280.jpg new file mode 100644 index 00000000..bd276b1a Binary files /dev/null and b/03/assets/1280.jpg differ diff --git a/03/assets/1920.jpg b/03/assets/1920.jpg new file mode 100644 index 00000000..bf6bb069 Binary files /dev/null and b/03/assets/1920.jpg differ diff --git a/03/assets/5431.jpg b/03/assets/5431.jpg new file mode 100644 index 00000000..80e0ecd8 Binary files /dev/null and b/03/assets/5431.jpg differ diff --git a/03/assets/640.jpg b/03/assets/640.jpg new file mode 100644 index 00000000..9ff575cb Binary files /dev/null and b/03/assets/640.jpg differ diff --git a/03/index.html b/03/index.html index 4a2e35c2..8e1b66a9 100644 --- a/03/index.html +++ b/03/index.html @@ -1,16 +1,56 @@ + devmentor.pl - HTML & CSS: RWD - #03 + + + + + + - -
T
-
P
- V + +
+

Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the + industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled + it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic + typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset + sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker + including versions of Lorem Ipsum.

+

+ It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). +

+

+ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32. +

+
+
+ + + + + + +
+ + + + \ No newline at end of file diff --git a/03/styles/desktop.css b/03/styles/desktop.css new file mode 100644 index 00000000..fc633e4e --- /dev/null +++ b/03/styles/desktop.css @@ -0,0 +1,31 @@ +body { + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: repeat(2, 1fr); + grid-column-gap: 0px; + grid-row-gap: 0px; +} + +.t { + grid-area: 2 / 1 / 2 / 3; /* Zaczyna się na 1 wierszu i 1 kolumnie, kończy się na 2 wierszu 3 kolumnie */ + padding: 5% 10%; + display: flex; + flex-flow: row wrap; + align-content: flex-start; + gap: 20px; + justify-content: center; +} + +.p { + grid-area: 1 / 1 / 2 / 2; /* Zaczyna się na 2 wierszu i 1 kolumnie, kończy się na 3 wierszu 2 kolumnie */ +} + +.p img{ + max-width: 100%; +} + +.v { + grid-area: 1 / 2 / 2 / 3; /* Zaczyna się na 2 wierszu i 2 kolumnie, kończy się na 3 wierszu 3 kolumnie */ + width: 100%; + height: 100%; +} diff --git a/03/styles/global.css b/03/styles/global.css index 7773d9b7..adda97fd 100644 --- a/03/styles/global.css +++ b/03/styles/global.css @@ -14,7 +14,8 @@ } .p { - border-color: #ffffba + border-color: #ffffba; + overflow: hidden; } .t { diff --git a/03/styles/mobile.css b/03/styles/mobile.css new file mode 100644 index 00000000..f115f2d4 --- /dev/null +++ b/03/styles/mobile.css @@ -0,0 +1,26 @@ +body { + display: flex; + flex-flow: row wrap; +} + +.t { + order: 2; + width: 100%; + padding: 5% 4%; + display: flex; + flex-flow: row wrap; + align-content: flex-start; + gap: 20px; + justify-content: center; +} + +.p { + order: 1; + max-width: 100%; +} + +.v { + order: 3; + width: 100%; + height: 30vh; +} \ No newline at end of file diff --git a/03/styles/tablet.css b/03/styles/tablet.css new file mode 100644 index 00000000..58d75c1f --- /dev/null +++ b/03/styles/tablet.css @@ -0,0 +1,28 @@ +body { + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: repeat(2, 1fr); + grid-column-gap: 0px; + grid-row-gap: 0px; +} + +.t { + grid-area: 1 / 2 / 3 / 3; /* Zaczyna się na 1 wierszu i 1 kolumnie, kończy się na 2 wierszu 3 kolumnie */ + padding: 5% 10%; + display: flex; + align-items: center; +} + +.p { + grid-area: 1 / 1 / 2 / 2; /* Zaczyna się na 2 wierszu i 1 kolumnie, kończy się na 3 wierszu 2 kolumnie */ +} + +.p img{ + max-width: 100%; +} + +.v { + grid-area: 2 / 1 / 3 / 2; /* Zaczyna się na 2 wierszu i 2 kolumnie, kończy się na 3 wierszu 3 kolumnie */ + width: 100%; + height: 100%; +} diff --git a/04/index.html b/04/index.html index e3ca9540..b77cb878 100644 --- a/04/index.html +++ b/04/index.html @@ -5,9 +5,22 @@ devmentor.pl - HTML & CSS: RWD - #04 + + + + - + + + + + + + + + +