From fddfcf4a30e121db9cb4006f635cfc6cdd7e8ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Gnamu=C5=A1?= <38346533+dgnamus@users.noreply.github.com> Date: Mon, 18 Apr 2022 16:26:16 +0200 Subject: [PATCH 1/3] Test saving --- .DS_Store | Bin 0 -> 6148 bytes final/.DS_Store | Bin 0 -> 6148 bytes starter/.DS_Store | Bin 0 -> 6148 bytes starter/03-CSS-Fundamentals/index.html | 19 ++++--- starter/03-CSS-Fundamentals/style.css | 67 +++++++++++++++++++++++++ starter/04-CSS-Layouts/index.html | 3 +- starter/04-CSS-Layouts/style.css | 10 ++++ 7 files changed, 91 insertions(+), 8 deletions(-) create mode 100644 .DS_Store create mode 100644 final/.DS_Store create mode 100644 starter/.DS_Store create mode 100644 starter/03-CSS-Fundamentals/style.css diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4840d83ebe882d313ea883c4b32eab6c8c5fe223 GIT binary patch literal 6148 zcmeHK!AiqG5S^{nrijpkg5DOqR;;$QikDFJ2aM=Jr6#m$FlHr5?V%KM*B|mn{2pg^ zw^CcZcupmGYRvu>|_8ywENvHfC>OOsDy!NT8fB5KO+hT=|d2y zV8)jXf0F_FcJpuzA;jRr

<4#3hG(2ir1a<|airoKv{FO~ zQphmX1jimE69@KJ5^io`jvK9dLnpjltI9@w=Nk!6r8SlGm>NcAfEi#03t27)Jsr|wCGyQ4dM=pFrkPhRM-|nm~ga9 z>*rd`4VrKew)qhD&BAslLcblKFSR=e*C3C~05kBBfjP6RQ2jspy8r(e#4Bci8TeNW zh~lAl*v6D>ZJkMuYOO@QLM0);+~9i%PIM_oUn<3`s9Ml2X@cll%nhOig?|Jz4LmRd HKgz%xGU$o# literal 0 HcmV?d00001 diff --git a/final/.DS_Store b/final/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..97430da04c999b67cdf3100d0a49edca3e626cf4 GIT binary patch literal 6148 zcmeHKT}$IY6uqN$O;=nB>w>-w>}$nJD|PWD)Q=~hjI0m4QWH`%7&FqO7Ab|i@BX3v zBmN%GotffCcf}VMmAP=|+|10GWDeY!Tp|*kLA*{>BO(vZSow(NFUI5SQ#NCJDnOyv z2q>Uc+M@wwQ?p%%Q@||AU_nl}e*Y97f-h-mqI++E!T+CRwkq z2}#_;l%GdQ7OP=L4YD}b+`tTYRj=But&B#kjdoqGZZ|5Z2yKYDmSB#w=vyoe zVgx1(6=h-(qRd&`H?hL)bS9TcHU3cC0V;bP~Qn*E$890uL3KHIFsE z|9Agg|34(TC#Qf@;9V&oDm%eW2V1gt>(u7>u9ff;I2+F^4QdJ+dmZb5ui|C6HjGIQ WfWF1jAbMc#M?lNq8mGX2Rp1tes+5TU literal 0 HcmV?d00001 diff --git a/starter/.DS_Store b/starter/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..42b488dd01cfbb904a36817f55f727d7543cb433 GIT binary patch literal 6148 zcmeHKO;6iE5S@h-oT65d3Q~Jpsn<}t0R-jc6^iretP*AYtsI_W#QS1<*D3b5x z5AjF(d;0bx5|Fk+J(LLTM6++ayR-H_&F*A~i1kM47EyzUJgCCjQ#8L3HLi3{mTb=o zkm)s!=mQ;6i{8;_Zno=i3^)cBjRAFb*Qrh0IJNKT=J^$rQcPzwAVDRpoQh;zoF}92LEI_(eS(Ntq`zJ5D}jgK@vHzAr@? zXJRna4p}Z)66%x>xTvUQH%Jr`zPMU4M7l)!4-^qZ}=h_id>4X@KNi%08u`O+NTIVbIm;82C3#mb<*I?(7609Zq}7TBtmP(IvZXt6Sg5ePG`K;z16iNTCJ z`njDKTC5BjcVf2qVD`<-Rwzur9qV&FomgnlwT=PDz- The Basic Language of the Web: HTML + @@ -15,7 +16,7 @@

The Basic Language of the Web: HTML

--> -

📘 The Code Magazine

@@ -37,7 +38,9 @@

The Basic Language of the Web: HTML

width="50" /> -

Posted by Laura Jones on Monday, June 21st 2027

+ Posted by Laura Jones on Monday, June 21st 2027 +

Why should you learn HTML?

- + diff --git a/starter/03-CSS-Fundamentals/style.css b/starter/03-CSS-Fundamentals/style.css new file mode 100644 index 000000000..097f27e6d --- /dev/null +++ b/starter/03-CSS-Fundamentals/style.css @@ -0,0 +1,67 @@ +h1, +h2, +h3, +h4, +p, +li { + font-family: sans-serif; + color: #333; +} + +h1, +h2, +h3 { + color: hsla(188, 77%, 25%, 0.887); +} + +h1 { + font-size: 30px; + text-transform: uppercase; + font-style: italic; +} + +h2 { + font-size: 40px; +} + +h3 { + font-size: 30px; +} + +h4 { + font-size: 20px; + text-transform: uppercase; + text-align: center; +} + +p { + font-size: 22px; + line-height: 1.5; +} + +li { + font-size: 20px; +} + +#author { + font-style: italic; + font-size: 18px; +} + +#copyright { + font-style: italic; + font-size: 16px; +} + +.related-author { + font-size: 18px; + font-weight: bold; +} + +.related { + list-style-type: none; +} + +.main-header { + background-color: #f7f7f7; +} diff --git a/starter/04-CSS-Layouts/index.html b/starter/04-CSS-Layouts/index.html index 15ecbeb77..64d75e106 100644 --- a/starter/04-CSS-Layouts/index.html +++ b/starter/04-CSS-Layouts/index.html @@ -39,9 +39,10 @@

The Basic Language of the Web: HTML

alt="Headshot of Laura Jones" height="50" width="50" + class="author-img" /> -

Posted by Laura Jones on Monday, June 21st 2027

diff --git a/starter/04-CSS-Layouts/style.css b/starter/04-CSS-Layouts/style.css index c879e79d2..5fa94fd5b 100644 --- a/starter/04-CSS-Layouts/style.css +++ b/starter/04-CSS-Layouts/style.css @@ -265,3 +265,13 @@ footer p { nav p { font-size: 18px; } */ + +/* FLOATS */ +.author-img { + float: left; +} + +.author { + float: left; + padding-left: 10px; +} From aeff902aa7e14ec2363972eb30c5d18e93d84ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Gnamu=C5=A1?= <38346533+dgnamus@users.noreply.github.com> Date: Mon, 18 Apr 2022 19:37:50 +0200 Subject: [PATCH 2/3] Update style.css --- starter/03-CSS-Fundamentals/style.css | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/starter/03-CSS-Fundamentals/style.css b/starter/03-CSS-Fundamentals/style.css index 097f27e6d..9df090ee1 100644 --- a/starter/03-CSS-Fundamentals/style.css +++ b/starter/03-CSS-Fundamentals/style.css @@ -65,3 +65,41 @@ li { .main-header { background-color: #f7f7f7; } + +aside { + background-color: #f7f7f7; + border-top: 5px solid hsla(188, 77%, 25%, 0.887); + border-bottom: 5px solid hsla(188, 77%, 25%, 0.887); +} + +li:first-child { + font-weight: bold; +} + +li:last-child { + font-style: italic; +} + +li:nth-child(2) { + /* color: red; */ +} + +/* Styling links */ +a:link { + color: hsla(188, 77%, 25%, 0.887); + text-decoration: none; +} + +a:visited { + color: hsla(188, 77%, 25%, 0.687); +} + +a:hover { + color: orangered; + font-weight: bold; + text-decoration: orangered; +} + +a:active { + background-color: palevioletred; +} From d4a922713c7411001c50a320635bc4cd187cf9a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Gnamu=C5=A1?= <38346533+dgnamus@users.noreply.github.com> Date: Wed, 20 Apr 2022 16:06:52 +0200 Subject: [PATCH 3/3] CSS specificity --- starter/03-CSS-Fundamentals/index.html | 4 +++- starter/03-CSS-Fundamentals/style.css | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/starter/03-CSS-Fundamentals/index.html b/starter/03-CSS-Fundamentals/index.html index b732160ad..5022baf67 100644 --- a/starter/03-CSS-Fundamentals/index.html +++ b/starter/03-CSS-Fundamentals/index.html @@ -145,7 +145,9 @@

diff --git a/starter/03-CSS-Fundamentals/style.css b/starter/03-CSS-Fundamentals/style.css index 9df090ee1..d55e1daa5 100644 --- a/starter/03-CSS-Fundamentals/style.css +++ b/starter/03-CSS-Fundamentals/style.css @@ -103,3 +103,21 @@ a:hover { a:active { background-color: palevioletred; } + +/* RESOLVING CONFLICTS */ + +/* .copyright { + color: red; +} + +#copyright { + color: blue; +} + +.text { + color: yellow; +} + +footer p { + color: green; +} */