From 1926924b5101697ec00b6bb2b5bb7343621bb343 Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 12:53:17 -0400 Subject: [PATCH 01/13] finished edits on 'Star html' --- Star.html | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ index.html | 6 +++--- 2 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 Star.html diff --git a/Star.html b/Star.html new file mode 100644 index 0000000..6a3de14 --- /dev/null +++ b/Star.html @@ -0,0 +1,57 @@ + + + + + + +

+

She loves to write poems, play video games and she loves to eat .

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The quickest of brown foxes. + + + + + + +
+ + +
+ + + + + + + + + \ No newline at end of file diff --git a/index.html b/index.html index 4dc0c72..6a3de14 100644 --- a/index.html +++ b/index.html @@ -1,11 +1,11 @@ - + - - +

+

She loves to write poems, play video games and she loves to eat .

From ab02321e88308f62b6490f927689cddb7fc0640b Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 13:13:52 -0400 Subject: [PATCH 02/13] finished edits on 'Star.html' --- Star.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Star.html b/Star.html index 6a3de14..e857ea5 100644 --- a/Star.html +++ b/Star.html @@ -6,9 +6,9 @@

She loves to write poems, play video games and she loves to eat .

- - - +

What are her dislikes?

+

Well that's a excellent question in Leon's vioce

+

Well she hates her food cold

@@ -35,7 +35,7 @@

- The quickest of brown foxes. + Star also loves photography, particulrly nature. From d703ca2e18b73c8cb50231d568ff61d5df65f7a5 Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 14:11:59 -0400 Subject: [PATCH 03/13] finished edits on 'Star.html' --- Star.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Star.html b/Star.html index e857ea5..159da6e 100644 --- a/Star.html +++ b/Star.html @@ -1,5 +1,5 @@ - + @@ -32,7 +32,7 @@

- + Star also loves photography, particulrly nature. From 7fbafb6d9a588b4aff1d63244b79f1e4b8e2dfde Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 15:41:13 -0400 Subject: [PATCH 04/13] finished edits on 'body_templates.html' --- body template.html | 28 ++++++++++++++++++++++++++++ model demo.txt | 11 +++++++++++ 2 files changed, 39 insertions(+) create mode 100644 body template.html create mode 100644 model demo.txt diff --git a/body template.html b/body template.html new file mode 100644 index 0000000..2fef6d2 --- /dev/null +++ b/body template.html @@ -0,0 +1,28 @@ + + + + + + + + + Star also loves photography, particulrly nature. + + + + + + +
+ + +
+ + + + + + + + + \ No newline at end of file diff --git a/model demo.txt b/model demo.txt new file mode 100644 index 0000000..0e8b17f --- /dev/null +++ b/model demo.txt @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file From e3497cb04f17064e6c1d49d7c6f24b23b79c0a5a Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 17:17:46 -0400 Subject: [PATCH 05/13] finished edits up to part 2 --- lecturedemos | 1 + 1 file changed, 1 insertion(+) create mode 160000 lecturedemos diff --git a/lecturedemos b/lecturedemos new file mode 160000 index 0000000..20fb773 --- /dev/null +++ b/lecturedemos @@ -0,0 +1 @@ +Subproject commit 20fb77348b81f0bd2045d276ec7019f685533d95 From 30ca9ae142b7ad333595140d595533e5b550ad33 Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 17:48:38 -0400 Subject: [PATCH 06/13] finished edits on model_template.html --- reg.html | 0 templates/models_template.html | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 reg.html diff --git a/reg.html b/reg.html new file mode 100644 index 0000000..e69de29 diff --git a/templates/models_template.html b/templates/models_template.html index 2f6ec67..160b684 100644 --- a/templates/models_template.html +++ b/templates/models_template.html @@ -6,10 +6,10 @@ Content models - Content models - In HTML 4 there were only two main content models, block and inline level elements. Block level elements would stack on top of each other in normal document flow while inline level elements typically appear within the flow of text content. - In this example the heading 1 and the paragraphs are block level items, while the bold tags and the link below are examples of inline level elements. - In HTML5 new content models have been created to expand the structure and semantic capabilities of HTML. There are seven main models: Flow, Metadata, Embedded, Interactive, Heading, Phrasing, and Sectioning. To learn more about them, visit the interactive graphic contained in the W3C HTML5 specfication. +

Content models

 + In HTML 4 there were only two main content models, block and inline level elements. Block level elements would stack on top of each other in normal document flow while inline level elements typically appear within the flow of text content. + In this example the heading 1 and the paragraphs are block level items, while the bold tags and the link below are examples of inline level elements. + In HTML5 new content models have been created to expand the structure and semantic capabilities of HTML. There are seven main models: Flow Metadata, Embedded, Interactive, Heading, Phrasing, and Sectioning. To learn more about them, visit the interactive graphic contained in the W3C HTML5 specfication. From 8bb198b3194040bff4515592fe73cb571b90af3f Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 17:57:47 -0400 Subject: [PATCH 07/13] finished edits models_template.html --- models_template.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 models_template.html diff --git a/models_template.html b/models_template.html new file mode 100644 index 0000000..e69de29 From 00ac381efaa08e5477ebab45e411d8f4b812fe82 Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 18:15:33 -0400 Subject: [PATCH 08/13] finished edits on headings_template.html --- headings_template.html | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 headings_template.html diff --git a/headings_template.html b/headings_template.html new file mode 100644 index 0000000..39aa0e9 --- /dev/null +++ b/headings_template.html @@ -0,0 +1,26 @@ + + + + + Formatting page content + + +

HTML Essential Training

 +
+

Formatting page content

 +
+ In this series of exercises, we'll explore how to use HTML elements to format basic page content. +
+ Adding headings + Headings help define the structure of the page and control the hierarchy of the content. You can use heading values ranging from a top-level heading of h1 all the way down to an h6. While there are several competing theories on the exact strategy to use when choosing headings, what really matters is that you are using them in an intelligent manner, to accurately reflect the importance of your content. It's also important to be consistent in how you use headings across your site, so deciding on when and how to use headings is an important part of planning your site. +
+ Using paragraphs +
+

The paragraph tag (⟨p⟩) is one of the most basic formatting tags, and one that you'll use often. It indicates a paragraph of text, and should be used for each individual paragraph.

+ Line breaks +
+ Occasionally you'll need to perform a "soft return," that is, create a new line without using a new paragraph. To do that in HTML, you use the line break tag (⟨br⟩). Line break tags are inline, meaning you can use them within headers and paragraphs, and don't require a closing tag. + Let's say you were formatting an address, for example. You could use line breaks to make sure each line of the address appeared on a separate line, but still remained within the same paragraph. + lynda.com 6410 Via Real Carpinteria, CA 93103. + + From a3ac02b54af103334c089934fe8e073e4d91b641 Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 19:30:12 -0400 Subject: [PATCH 09/13] finished edits on exercise_one.html --- models_template.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/models_template.html b/models_template.html index e69de29..1cb8ff6 100644 --- a/models_template.html +++ b/models_template.html @@ -0,0 +1,13 @@ + + + + + + Content models + + +

Content models

 + In HTML 4 there were only two main content models, block and inline level elements. Block level elements would stack on top of each other in normal document flow while inline level elements typically appear within the flow of text content. + In this example the heading 1 and the paragraphs are block level items, while the bold tags and the link below are examples of inline level elements. + In HTML5 new content models have been created to expand the structure and semantic capabilities of HTML. There are seven main models: Flow Metadata, Embedded, Interactive, Heading, Phrasing, and Sectioning. To learn more about them, visit the interactive graphic contained in the W3C HTML5 specfication. + From 7b1309f8d81344b88a161ad979e27aea5905c34d Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 20:30:52 -0400 Subject: [PATCH 10/13] finished edits on loginpw.html --- loginpw.html | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 loginpw.html diff --git a/loginpw.html b/loginpw.html new file mode 100644 index 0000000..5d93080 --- /dev/null +++ b/loginpw.html @@ -0,0 +1,11 @@ +
+ +
+ +
+ +
+ +
+ +
\ No newline at end of file From 304acb05cea576b0480c5ff7a4acf8d65592816b Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 20:49:45 -0400 Subject: [PATCH 11/13] update --- calculator.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 calculator.html diff --git a/calculator.html b/calculator.html new file mode 100644 index 0000000..07c7a8e --- /dev/null +++ b/calculator.html @@ -0,0 +1,21 @@ + + Calculator + + \ No newline at end of file From 107451334fea0bdcb5d2bd33ac6cdbde2976cde6 Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 20:53:19 -0400 Subject: [PATCH 12/13] update --- README.md | 27 ++++++++++++++++++++++++++- calculator.html | 4 ++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 03d7cb9..42e8d66 100644 --- a/README.md +++ b/README.md @@ -95,4 +95,29 @@ * The edits should render a webpage which resembles the image below - \ No newline at end of file + + + + + + + Calculator + + \ No newline at end of file diff --git a/calculator.html b/calculator.html index 07c7a8e..903b48e 100644 --- a/calculator.html +++ b/calculator.html @@ -5,10 +5,10 @@ width: 200px; height: 300px; text-align: center; - border: 5px cornflowerblue; + border: 5px solid cornflowerblue; } th, td{ - border: 1px palevioletred; + border: 1px solid palevioletred; } th{ text-align: right; From ad59bb23b4267f6953f9e723cb0a0463287236e1 Mon Sep 17 00:00:00 2001 From: "Star-Asia S. Armand" Date: Mon, 22 Jun 2020 20:56:18 -0400 Subject: [PATCH 13/13] update --- README.md | 4 ++-- calculator.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 42e8d66..72ffbf9 100644 --- a/README.md +++ b/README.md @@ -107,10 +107,10 @@ width: 200px; height: 300px; text-align: center; - border: 5px cornflowerblue; + border: 5px solid cornflowerblue; } th, td{ - border: 1px palevioletred; + border: 1px solid palevioletred; } th{ text-align: right; diff --git a/calculator.html b/calculator.html index 903b48e..60f9d39 100644 --- a/calculator.html +++ b/calculator.html @@ -5,10 +5,10 @@ width: 200px; height: 300px; text-align: center; - border: 5px solid cornflowerblue; + border: 5px solid red; } th, td{ - border: 1px solid palevioletred; + border: 1px solid blue; } th{ text-align: right;