From 321e5aca51cd3db59137b93a0c7d9ea9803f01ef Mon Sep 17 00:00:00 2001 From: RobBlocker Date: Tue, 20 Nov 2018 08:41:04 -0600 Subject: [PATCH 01/12] renamed: tutorial/dlr_evenings_txt.html -> tutorial/dlr_evenings.html new file: tutorial/dlr_tables.css deleted: tutorial/dlr_tables_txt.css --- ...lr_evenings_txt.html => dlr_evenings.html} | 77 ++++++++++++++++++- tutorial/dlr_tables.css | 73 ++++++++++++++++++ tutorial/dlr_tables_txt.css | 33 -------- 3 files changed, 148 insertions(+), 35 deletions(-) rename tutorial/{dlr_evenings_txt.html => dlr_evenings.html} (63%) create mode 100644 tutorial/dlr_tables.css delete mode 100644 tutorial/dlr_tables_txt.css diff --git a/tutorial/dlr_evenings_txt.html b/tutorial/dlr_evenings.html similarity index 63% rename from tutorial/dlr_evenings_txt.html rename to tutorial/dlr_evenings.html index 9a7c4ad..f5f5c11 100644 --- a/tutorial/dlr_evenings_txt.html +++ b/tutorial/dlr_evenings.html @@ -7,8 +7,8 @@ Tutorial Case DLR Nightly Schedule - Author: - Date: + Author: Rob and Khan + Date: 11/20/18 Filename: dlr_evenings.html @@ -19,6 +19,7 @@ DLR Nightly Schedule + @@ -49,6 +50,78 @@

DLR Nightly Schedule

You can Listen Live to streaming audio of our broadcast. Please refer below for our current nightly schedule.

+ + + ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
All Times Central
TimeMonTueWedThuFriSatSun
DLR ends its broadcast day at 10:30 p.m.
6:00 PMNational News
6:30 PMWorld News
7:00 PMOpera FestRadio UScience WeekThe Living WorldWord PlayAgri-WeekFolk Fest
7:30 PM Brain Stew Bismarck Forum
8:00 PMThe Classical Music ConnectionOld time RadioSaturday Nite JazzThe Indie Connection
8:30 PMThe Inner Mind
9:00 PMOpen Mike Nite
9:30 PM
10:00 PMWorld News Feed
diff --git a/tutorial/dlr_tables.css b/tutorial/dlr_tables.css new file mode 100644 index 0000000..6c7ea3f --- /dev/null +++ b/tutorial/dlr_tables.css @@ -0,0 +1,73 @@ +@charset "utf-8"; + +/* + New Perspectives on HTML and CSS + Tutorial 6 + Tutorial Case + + Tables Style Sheet + Author: Rob and Khan + Date: 11/20/18 + + Filename: dlr_tables.css + +*/ + +/* Table Styles */ + +table.schedule { + background: white; + border: 10px outset rgb(153, 0, 153); + border-collapse: collapse; + font-size: 0.75em; + width: 100%; +} + + +/* Table Cell Styles */ + +table.schedule th, table.schedule td { + border: 1px solid gray; + padding: 5px; + vertical-align: top; +} + + +/* Table Caption Styles */ + +table.schedule caption { + caption-side: bottom; + text-align: right; +} + +/* Row Group Styles */ + +table.schedule thead { + background: rgb(153, 0, 153); + color: white; +} + +table.schedule tfoot { + background: black; + color: white; +} + +table.schedule thead tr { + height: 30px; +} + +table.schedule tbody tr { + height: 40px; +} + +/* Column Group Styles */ + +col#firstCol { + background: rgb(218, 210, 218); + width: 16%; +} + +col.dayCols { + background: rgb(255, 220, 255); + width: 12%; +} \ No newline at end of file diff --git a/tutorial/dlr_tables_txt.css b/tutorial/dlr_tables_txt.css deleted file mode 100644 index 4c595cd..0000000 --- a/tutorial/dlr_tables_txt.css +++ /dev/null @@ -1,33 +0,0 @@ -@charset "utf-8"; - -/* - New Perspectives on HTML and CSS - Tutorial 6 - Tutorial Case - - Tables Style Sheet - Author: - Date: - - Filename: dlr_tables.css - -*/ - -/* Table Styles */ - - - -/* Table Cell Styles */ - - - -/* Table Caption Styles */ - - - -/* Row Group Styles */ - - - -/* Column Group Styles */ - From 1f8eb0e9af806faeb29ef35d67c057a13b94366f Mon Sep 17 00:00:00 2001 From: RobBlocker Date: Tue, 20 Nov 2018 08:44:08 -0600 Subject: [PATCH 02/12] renamed: tutorial/dlr_lw0414_txt.html -> tutorial/dlr_lw0414.html --- tutorial/{dlr_lw0414_txt.html => dlr_lw0414.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tutorial/{dlr_lw0414_txt.html => dlr_lw0414.html} (100%) diff --git a/tutorial/dlr_lw0414_txt.html b/tutorial/dlr_lw0414.html similarity index 100% rename from tutorial/dlr_lw0414_txt.html rename to tutorial/dlr_lw0414.html From 71c8c74581e9db58a4bd7c2c51b581ab34d20ec4 Mon Sep 17 00:00:00 2001 From: RobBlocker Date: Tue, 20 Nov 2018 10:14:06 -0600 Subject: [PATCH 03/12] renamed: review/dlr_columns2_txt.css -> review/dlr_columns2.css new file: review/dlr_mornings.html deleted: review/dlr_mornings_txt.html new file: review/dlr_tables2.css deleted: review/dlr_tables2_txt.css new file: tutorial/dlr_columns.css deleted: tutorial/dlr_columns_txt.css modified: tutorial/dlr_lw0414.html --- ...{dlr_columns2_txt.css => dlr_columns2.css} | 4 +- review/dlr_mornings.html | 143 ++++++++++++++++++ review/dlr_mornings_txt.html | 61 -------- review/dlr_tables2.css | 91 +++++++++++ review/dlr_tables2_txt.css | 39 ----- tutorial/dlr_columns.css | 47 ++++++ tutorial/dlr_columns_txt.css | 19 --- tutorial/dlr_lw0414.html | 6 +- 8 files changed, 287 insertions(+), 123 deletions(-) rename review/{dlr_columns2_txt.css => dlr_columns2.css} (74%) create mode 100644 review/dlr_mornings.html delete mode 100644 review/dlr_mornings_txt.html create mode 100644 review/dlr_tables2.css delete mode 100644 review/dlr_tables2_txt.css create mode 100644 tutorial/dlr_columns.css delete mode 100644 tutorial/dlr_columns_txt.css diff --git a/review/dlr_columns2_txt.css b/review/dlr_columns2.css similarity index 74% rename from review/dlr_columns2_txt.css rename to review/dlr_columns2.css index 0ef6bdb..19cadd0 100644 --- a/review/dlr_columns2_txt.css +++ b/review/dlr_columns2.css @@ -6,8 +6,8 @@ Review Assignment Columns Style Sheet - Author: - Date: + Author: Rob and Khanh + Date: 11/20/18 Filename: dlr_columns2.css diff --git a/review/dlr_mornings.html b/review/dlr_mornings.html new file mode 100644 index 0000000..95ad7ac --- /dev/null +++ b/review/dlr_mornings.html @@ -0,0 +1,143 @@ + + + + + + + + DLR Morning Schedule + + + + + + + +
+

Listener Supported Since 1975

+ +
+ +
+ +
+ DLR +

DLR Morning Schedule

+

DLR airs listener-supported public radio in Bismarck, North Dakota from + 5:00 a.m. to 10:30 p.m.
You can Listen Live to streaming audio + of our broadcast or download programs from our Podcast. +
Please refer below for our current morning schedule.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
All Times Central
TimeMonTueWedThuFriSatSun
Support your Public Radio Station
5:00 AMDawn Air Dawn Air Weekends Sunday Magazine
6:00 AMWeekend Reflections
7:00 AMLocal News Weekend Wrap Radio U
7:30 AMWorld News Feed
8:00 AMClassical Roots What Can You Say? University On The Air
9:30 AM Animal Talk
10:00 AM Symphony CityWord Play
10:30 AMBrain Stew
11:00 AMOpera Live from the East CoastThe Inner Mind
11:30 AMGrammar Rules!!
12:00 AMBook ClubWeekend Wrap
+ +
+ +
+ +
+ DLR · 4300 Magnolia Lane · Bismarck, ND 58504 · (701) 555 - 5611 +
+ + + \ No newline at end of file diff --git a/review/dlr_mornings_txt.html b/review/dlr_mornings_txt.html deleted file mode 100644 index f90b239..0000000 --- a/review/dlr_mornings_txt.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - DLR Morning Schedule - - - - - -
-

Listener Supported Since 1975

- -
- -
- -
- DLR -

DLR Morning Schedule

-

DLR airs listener-supported public radio in Bismarck, North Dakota from - 5:00 a.m. to 10:30 p.m.
You can Listen Live to streaming audio - of our broadcast or download programs from our Podcast. -
Please refer below for our current morning schedule.

- -
- -
- -
- DLR · 4300 Magnolia Lane · Bismarck, ND 58504 · (701) 555 - 5611 -
- - - \ No newline at end of file diff --git a/review/dlr_tables2.css b/review/dlr_tables2.css new file mode 100644 index 0000000..b66979f --- /dev/null +++ b/review/dlr_tables2.css @@ -0,0 +1,91 @@ +@charset "utf-8"; + +/* + New Perspectives on HTML and CSS + Tutorial 6 + Review Assignment + + Tables Style Sheet + Author: Rob and Khanh + Date: 11/20/18 + + Filename: dlr_tables2.css + +*/ + +/* Table Styles */ + +table.programs { + width: 100%; + border: 15px outset rgb(151, 151, 151); + border-collapse: collapse; + font-family: Arial, Verdana, sans-serif; +} + +table.programs tr { + height: 25px; +} + +table.programs th, table.programs td { + border: 1px solid gray; + vertical-align: top; + padding: 5px; +} + +/* Table Caption Styles */ + +table.programs caption { + caption-side: bottom; + text-align: center; +} + + +/* Table Column Styles */ + +col#timeColumn { + width: 10%; + background: rgb(215, 205, 151); +} + +col#wDayColumn { + width: 11%; + background: rgb(236, 255, 211); +} + +col#wEndColumn { + width: 17%; + background: rgb(255, 231, 255); +} + +/* Table Header Styles */ + +table.programs thead { + background: rgb(105, 177, 60); + color: white; +} + +table.programs thead th:first-of-type { + background: rgb(153, 86, 7); +} + +table.programs thead th:nth-of-type(7) { + background: rgb(153, 0, 153); +} + +table.programs thead th:nth-of-type(8) { + background: rgb(153, 0, 153); +} + + +/* Table Footer Styles */ +table.programs tfoot { + color: white; + background: black; +} + +/*PAGE 490 Step 22*/ + + + + + diff --git a/review/dlr_tables2_txt.css b/review/dlr_tables2_txt.css deleted file mode 100644 index 4c58fb9..0000000 --- a/review/dlr_tables2_txt.css +++ /dev/null @@ -1,39 +0,0 @@ -@charset "utf-8"; - -/* - New Perspectives on HTML and CSS - Tutorial 6 - Review Assignment - - Tables Style Sheet - Author: - Date: - - Filename: dlr_tables2.css - -*/ - -/* Table Styles */ - - - -/* Table Caption Styles */ - - - -/* Table Column Styles */ - - - -/* Table Header Styles */ - - - -/* Table Footer Styles */ - - - - - - - diff --git a/tutorial/dlr_columns.css b/tutorial/dlr_columns.css new file mode 100644 index 0000000..35e5bf3 --- /dev/null +++ b/tutorial/dlr_columns.css @@ -0,0 +1,47 @@ +@charset "utf-8"; + +/* + New Perspectives on HTML and CSS + Tutorial 6 + Tutorial Case + + Columns Style Sheet + Author: Rob and Khan + Date: 11/20/18 + + Filename: dlr_columns.css + +*/ + + + +/* Column Styles */ + +@media only screen and (min-width: 641px) { + article { + -moz-column-count: 2; + -webkit-column-count: 2; + column-count: 2; + + -moz-column-gap: 30px; + -webkit-column-gap: 30px; + column-gap: 30px; + + -moz-column-rule: 2px solid gray; + -webkit-column-rule: 2px solid gray; + column-rule: 2px solid gray; + + widows: 3; + orphans: 3; + } + + article h1 { + -moz-column-span: all; + -webkit-column-span: all; + column-span: all; + } +} + + + + diff --git a/tutorial/dlr_columns_txt.css b/tutorial/dlr_columns_txt.css deleted file mode 100644 index b14a401..0000000 --- a/tutorial/dlr_columns_txt.css +++ /dev/null @@ -1,19 +0,0 @@ -@charset "utf-8"; - -/* - New Perspectives on HTML and CSS - Tutorial 6 - Tutorial Case - - Columns Style Sheet - Author: - Date: - - Filename: dlr_columns.css - -*/ - - - -/* Column Styles */ - diff --git a/tutorial/dlr_lw0414.html b/tutorial/dlr_lw0414.html index 405e4d1..74e589e 100644 --- a/tutorial/dlr_lw0414.html +++ b/tutorial/dlr_lw0414.html @@ -7,8 +7,8 @@ Tutorial Case The Living World: April 14 - Author: - Date: + Author: Rob and Khan + Date: 11/20/18 Filename: dlr_lw0414.html @@ -19,6 +19,8 @@ The Living World: April 14 + + From 3567e2243d1759c149febc505d8e19db9c7dc97f Mon Sep 17 00:00:00 2001 From: RobBlocker Date: Mon, 26 Nov 2018 08:17:53 -0600 Subject: [PATCH 04/12] modified: review/dlr_columns2.css modified: tutorial/dlr_columns.css --- review/dlr_columns2.css | 17 ++++++++++++++++- tutorial/dlr_columns.css | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/review/dlr_columns2.css b/review/dlr_columns2.css index 19cadd0..6c7dd02 100644 --- a/review/dlr_columns2.css +++ b/review/dlr_columns2.css @@ -17,4 +17,19 @@ /* Column Styles */ - +@media only screen and (min-width: 641 px) { + p { + -moz-column-count: 3; + -webkit-column-count: 3; + column-count: 3; + + -moz-column-gap: 20px; + -webkit-column-gap: 2px; + column-gap: 20px; + + -moz-column-rule: 1px solid black; + -webkit-column-rule: 1px solid black; + column-rule: 1px solid black; + } + +} \ No newline at end of file diff --git a/tutorial/dlr_columns.css b/tutorial/dlr_columns.css index 35e5bf3..1cb0042 100644 --- a/tutorial/dlr_columns.css +++ b/tutorial/dlr_columns.css @@ -17,7 +17,7 @@ /* Column Styles */ -@media only screen and (min-width: 641px) { +@media only screen and (min-width: 641px) { article { -moz-column-count: 2; -webkit-column-count: 2; From 30697fa6b2d8bd9c3b3c0bb8822d3d92e4c24ad0 Mon Sep 17 00:00:00 2001 From: RobBlocker Date: Mon, 26 Nov 2018 10:12:03 -0600 Subject: [PATCH 05/12] renamed: case1/mi_pricing_txt.html -> case1/mi_pricing.html renamed: case1/mi_tables_txt.css -> case1/mi_tables.css modified: review/dlr_columns2.css modified: review/dlr_mornings.html modified: review/dlr_tables2.css --- .../{mi_pricing_txt.html => mi_pricing.html} | 87 ++++++++++++++++++- case1/{mi_tables_txt.css => mi_tables.css} | 10 ++- review/dlr_columns2.css | 2 +- review/dlr_mornings.html | 36 +++++--- review/dlr_tables2.css | 7 +- 5 files changed, 120 insertions(+), 22 deletions(-) rename case1/{mi_pricing_txt.html => mi_pricing.html} (56%) rename case1/{mi_tables_txt.css => mi_tables.css} (54%) diff --git a/case1/mi_pricing_txt.html b/case1/mi_pricing.html similarity index 56% rename from case1/mi_pricing_txt.html rename to case1/mi_pricing.html index 127737d..1b63633 100644 --- a/case1/mi_pricing_txt.html +++ b/case1/mi_pricing.html @@ -7,8 +7,8 @@ Case Problem 1 Marlin Internet Pricing - Author: - Date: + Author: Khanh and Rob + Date: 11/26/18 Filename: mi_pricing.html @@ -18,7 +18,8 @@ Marlin Internet - + + @@ -46,6 +47,86 @@

Accelerate with No Speed Traps

We provide more than fast access. Take advantage of our 24/7 customer support (personal help is always on the line), free security tools, email accounts for the whole family, and exclusive online content.

+ + +

Pricing

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/case1/mi_tables_txt.css b/case1/mi_tables.css similarity index 54% rename from case1/mi_tables_txt.css rename to case1/mi_tables.css index db9e6bc..923146c 100644 --- a/case1/mi_tables_txt.css +++ b/case1/mi_tables.css @@ -6,8 +6,8 @@ Case Problem 1 Tables Style Sheet - Author: - Date: + Author: Khanh and Rob + Date: 11/26/18 Filename: mi_tables.css @@ -15,7 +15,13 @@ /* Table Styles */ +table { + background-color: rgb(190, 215, 255); + border: 5px solid gray; +} +th, td { + border: 3px solid gray; /* Column Styles */ diff --git a/review/dlr_columns2.css b/review/dlr_columns2.css index 6c7dd02..6f02840 100644 --- a/review/dlr_columns2.css +++ b/review/dlr_columns2.css @@ -24,7 +24,7 @@ column-count: 3; -moz-column-gap: 20px; - -webkit-column-gap: 2px; + -webkit-column-gap: 20px; column-gap: 20px; -moz-column-rule: 1px solid black; diff --git a/review/dlr_mornings.html b/review/dlr_mornings.html index 95ad7ac..dc61a8f 100644 --- a/review/dlr_mornings.html +++ b/review/dlr_mornings.html @@ -19,7 +19,7 @@ DLR Morning Schedule - + @@ -76,55 +76,67 @@

DLR Morning Schedule

- + - + + + + - + + + + - + - + - + + + + + + + - + - + - + - + - + diff --git a/review/dlr_tables2.css b/review/dlr_tables2.css index b66979f..b2617f3 100644 --- a/review/dlr_tables2.css +++ b/review/dlr_tables2.css @@ -43,17 +43,17 @@ table.programs caption { /* Table Column Styles */ col#timeColumn { - width: 10%; + column-width: 10%; background: rgb(215, 205, 151); } col#wDayColumn { - width: 11%; + column-width: 11%; background: rgb(236, 255, 211); } col#wEndColumn { - width: 17%; + column-width: 17%; background: rgb(255, 231, 255); } @@ -83,7 +83,6 @@ table.programs tfoot { background: black; } -/*PAGE 490 Step 22*/ From 47335451f784a1c76508b7482e4ff297940fddb3 Mon Sep 17 00:00:00 2001 From: RobBlocker Date: Wed, 28 Nov 2018 09:31:56 -0600 Subject: [PATCH 06/12] modified: case1/mi_pricing.html modified: case1/mi_tables.css new file: case2/jpf_sudoku.css new file: case2/jpf_sudoku.html deleted: case2/jpf_sudoku_txt.css deleted: case2/jpf_sudoku_txt.html renamed: case3/lht_columns_txt.css -> case3/lht_columns.css new file: case3/lht_feb.html deleted: case3/lht_feb_txt.html new file: case3/lht_tables.css deleted: case3/lht_tables_txt.css --- case1/mi_pricing.html | 16 +- case1/mi_tables.css | 47 +- case2/jpf_sudoku.css | 62 +++ case2/jpf_sudoku.html | 319 ++++++++++++++ case2/jpf_sudoku_txt.css | 22 - case2/jpf_sudoku_txt.html | 90 ---- .../{lht_columns_txt.css => lht_columns.css} | 4 +- case3/lht_feb.html | 413 ++++++++++++++++++ case3/lht_feb_txt.html | 105 ----- case3/lht_tables.css | 60 +++ case3/lht_tables_txt.css | 27 -- 11 files changed, 908 insertions(+), 257 deletions(-) create mode 100644 case2/jpf_sudoku.css create mode 100644 case2/jpf_sudoku.html delete mode 100644 case2/jpf_sudoku_txt.css delete mode 100644 case2/jpf_sudoku_txt.html rename case3/{lht_columns_txt.css => lht_columns.css} (74%) create mode 100644 case3/lht_feb.html delete mode 100644 case3/lht_feb_txt.html create mode 100644 case3/lht_tables.css delete mode 100644 case3/lht_tables_txt.css diff --git a/case1/mi_pricing.html b/case1/mi_pricing.html index 1b63633..90f76ef 100644 --- a/case1/mi_pricing.html +++ b/case1/mi_pricing.html @@ -94,41 +94,37 @@

Pricing

 + + + + - - - - - - - + +
select a planStarterPrimePrime PlusUltra
$19.95
+ per month		$29.95
+ per month		$49.95
+ per month		$69.95
+ per month
SummaryJust the speed you need to send emails, download map directions, + and search the Internet for restaurant reviews.A great speed at a great price for the family: kids can play games, + adults can pay bills, and everyone can surf at the same time.Super speeds for multiple tasks that require more broadband capacity; + ideal for gamers who need fast response times.Perfect for a small business running multiple media streams, + demanding reduced lag time and fast data delivery.
Download Speed3 Mbps15 Mbps25 Mbps50 Mbps
Upload Speed512 Kbps6 Mbps10 Mbps20 Mbps
Cloud Strorage2 GB5 GB15 GB40 GB
E-mail Accounts 2 Accounts 3 Accounts 5 Accounts 10 Accounts
24/7 SupportYesYesYesYes
5:00 AM5:00 Dawn Air Dawn Air Weekends Sunday Magazine
6:00 AM5:30
6:00 Weekend Reflections
7:00 AM6:30
7:00 Local News Weekend Wrap Radio U
7:30 AM7:30 World News Feed
8:00 AM8:00 Classical Roots What Can You Say? University On The Air
9:30 AM 8:30
9:00
9:30 Animal Talk
10:00 AM 10:00 Symphony City Word Play
10:30 AM10:30 Brain Stew
11:00 AM11:00 Opera Live from the East Coast The Inner Mind
11:30 AM11:30 Grammar Rules!!
12:00 AM12:00 Book Club Weekend Wrap
25 Mbps 50 Mbps
Upload Speed 512 Kbps 6 Mbps 10 Mbps 20 Mbps
Cloud Strorage 2 GB 5 GB 15 GB 40 GB
E-mail Accounts 2 Accounts 3 Accounts 5 Accounts 10 Accounts
24/7 Support Yes Yes Yes Yes
- - -