From 1aed837bf754ca95037b25bb8f4d6e7d2b651a29 Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Thu, 19 Sep 2019 13:27:56 -0400 Subject: [PATCH 01/11] complete display 01 css --- my-styles.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/my-styles.css b/my-styles.css index f7d02e4..fd7af5b 100644 --- a/my-styles.css +++ b/my-styles.css @@ -2,3 +2,10 @@ /* All your edits should go here */ +#display-01 div{ + display: inline; + border:.5px solid blue; + margin: 20px; + + +} From 41f80ecfcbbce38fe92cd1bd55308363dee0dfdc Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Thu, 19 Sep 2019 13:35:39 -0400 Subject: [PATCH 02/11] add css for display 002 --- my-styles.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/my-styles.css b/my-styles.css index fd7af5b..93500b1 100644 --- a/my-styles.css +++ b/my-styles.css @@ -9,3 +9,9 @@ } + +#display-02 span{ +display: block; +border: .5px solid red; +width: 100%; +} From 715e3d312fdecad1427d03c17f25c422ff92a091 Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Thu, 19 Sep 2019 13:54:23 -0400 Subject: [PATCH 03/11] add display 03 css --- my-styles.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/my-styles.css b/my-styles.css index 93500b1..7283243 100644 --- a/my-styles.css +++ b/my-styles.css @@ -14,4 +14,17 @@ display: block; border: .5px solid red; width: 100%; +} + +#display-03 div{ + display: inline; + box-sizing: content-box; + height: 250px; + width: 250px; + padding: 30px; + border:.5px solid green; + + + + } From 6579025f7bd5750b33061415ef6981cfa0a9ebbf Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Thu, 19 Sep 2019 14:00:34 -0400 Subject: [PATCH 04/11] add css for display 4 --- my-styles.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/my-styles.css b/my-styles.css index 7283243..56b103b 100644 --- a/my-styles.css +++ b/my-styles.css @@ -23,8 +23,9 @@ width: 100%; width: 250px; padding: 30px; border:.5px solid green; +} - - +#display-04 div:nth-of-type(1){ + display: none; } From 6d1b5fec38ea1bb04fb7f11e70c3ee690c716095 Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Thu, 19 Sep 2019 14:19:51 -0400 Subject: [PATCH 05/11] add css for display 05 -complete all display exercises --- my-styles.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/my-styles.css b/my-styles.css index 56b103b..1926739 100644 --- a/my-styles.css +++ b/my-styles.css @@ -29,3 +29,14 @@ width: 100%; display: none; } +#display-05 a{ + display:block; + background-color: grey; + color: white; + padding: 10px; + width: 50%; + margin-right: 25%; + margin-left: 25%; + + +} From 35c9b478c5c2186a7a2c041f29c0c83870028b2c Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Thu, 19 Sep 2019 15:00:34 -0400 Subject: [PATCH 06/11] add boxmodel 01 css --- my-styles.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/my-styles.css b/my-styles.css index 1926739..06224be 100644 --- a/my-styles.css +++ b/my-styles.css @@ -37,6 +37,16 @@ width: 100%; width: 50%; margin-right: 25%; margin-left: 25%; +} + +#boxmodel-01 div{ + box-sizing: border-box; + display: block; + width: 50%; + margin-left: 25%; + margin-right: 25%; + border: 2rem solid blue; + padding: 20px; } From dbf655cf77d533678d608962d1be203afb26790f Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Thu, 19 Sep 2019 15:05:28 -0400 Subject: [PATCH 07/11] fix boxmodel 1 and add css for boxmodel 02 --- my-styles.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/my-styles.css b/my-styles.css index 06224be..978fa0c 100644 --- a/my-styles.css +++ b/my-styles.css @@ -40,7 +40,18 @@ width: 100%; } #boxmodel-01 div{ - box-sizing: border-box; + display: block; + width: 50%; + margin-left: 25%; + margin-right: 25%; + border: 2rem solid blue; + + padding: 20px; + +} + +#boxmodel-02 div{ + box-sizing: border-box; display: block; width: 50%; margin-left: 25%; From 1651d94ff2be6963985c26cba5e0f6fe8a2b14ae Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Thu, 19 Sep 2019 15:20:21 -0400 Subject: [PATCH 08/11] add css for float 1 --- my-styles.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/my-styles.css b/my-styles.css index 978fa0c..5d21cda 100644 --- a/my-styles.css +++ b/my-styles.css @@ -59,5 +59,11 @@ width: 100%; border: 2rem solid blue; padding: 20px; +} + +#float-01 img{ + float:left; + margin: 5%; + margin-left: 0 } From 41165082bcf311dfee0acce9e5576cfcfe57362e Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Thu, 19 Sep 2019 15:22:21 -0400 Subject: [PATCH 09/11] add css for float 2 --- my-styles.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/my-styles.css b/my-styles.css index 5d21cda..b3a0461 100644 --- a/my-styles.css +++ b/my-styles.css @@ -67,3 +67,9 @@ width: 100%; margin-left: 0 } +#float-02 img{ + float:right; + margin: 5%; + margin-right: 0 + +} From 15405f41c1d22369b84a02601f418b1141a83707 Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Thu, 19 Sep 2019 15:49:57 -0400 Subject: [PATCH 10/11] add css for float 3 -fix margin 25% to margin auto everywhere on page --- my-styles.css | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/my-styles.css b/my-styles.css index b3a0461..93368ed 100644 --- a/my-styles.css +++ b/my-styles.css @@ -35,15 +35,13 @@ width: 100%; color: white; padding: 10px; width: 50%; - margin-right: 25%; - margin-left: 25%; + margin: auto; } #boxmodel-01 div{ display: block; width: 50%; - margin-left: 25%; - margin-right: 25%; + margin-left: auto; border: 2rem solid blue; padding: 20px; @@ -54,8 +52,7 @@ width: 100%; box-sizing: border-box; display: block; width: 50%; - margin-left: 25%; - margin-right: 25%; + margin: auto; border: 2rem solid blue; padding: 20px; @@ -71,5 +68,11 @@ width: 100%; float:right; margin: 5%; margin-right: 0 - +} +#float-03 img{ + float:left; + margin: 3%; +} +#float-03 p.clear{ + clear: left; } From 3eb57a9e2a09d37f3aeed6935d795df45d16e9fb Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Thu, 19 Sep 2019 16:10:22 -0400 Subject: [PATCH 11/11] add css to float 4 --- my-styles.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/my-styles.css b/my-styles.css index 93368ed..0fbe01a 100644 --- a/my-styles.css +++ b/my-styles.css @@ -76,3 +76,14 @@ width: 100%; #float-03 p.clear{ clear: left; } + +#float-04 img{ + clear: left; + margin: auto; + +} +#float-04 div{ + background-color: cyan; + display:flow-root; + +}