From 3997ab11b88d41d8f4aa28a968873207b1ea6d89 Mon Sep 17 00:00:00 2001 From: jwoods07 <74575414+jwoods07@users.noreply.github.com> Date: Sat, 5 Dec 2020 14:48:15 -0500 Subject: [PATCH 1/4] origin code --- README.md | 2 +- index.html | 46 ++++++++++++++++++++++++++++++++++++++++++++++ style.css | 29 +++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 index.html create mode 100644 style.css diff --git a/README.md b/README.md index ebcb40f..1f629d5 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ You will pair program with a partner to complete this assignemnt. One partner, t 3. Display the Sidebar conent on the webpage 4. The page should have the correct coloring 5. Convert main content to a 2 column layout -6. The page should have the correct spacing +6. The page should have the correct spacing ## Mock Up diff --git a/index.html b/index.html new file mode 100644 index 0000000..ce1df70 --- /dev/null +++ b/index.html @@ -0,0 +1,46 @@ + + + + + + + Document + + +

MyWebsite

+
+
+ Golden Gate Bridge at Sunset +
+
+

This is a Lorem Ipsum Heading

+

Lorem ipsum, dolor sit amet consectetur adipisicing elit. Reiciendis, asperiores. Tempore ipsam, libero eveniet amet odit ex a dicta pariatur exercitationem alias, similique molestiae non sed repellendus sit aliquid nemo!

+ + Read More +
+ +
+

SideBar Links

+
+ + +
+ +
+

Other Widgets

+
+

Lorem ipsum dolor sit amet consectetur, adipisicing elit. Maxime aliquid excepturi sequi facilis nobis, saepe quis voluptas quisquam. Cum molestiae itaque amet dolorem. Temporibus voluptate est placeat laudantium nisi quas?

+
+ +

Lorem ipsum dolor sit amet consectetur adipisicing elit.

+
+ + + + + \ No newline at end of file diff --git a/style.css b/style.css new file mode 100644 index 0000000..a1c1676 --- /dev/null +++ b/style.css @@ -0,0 +1,29 @@ +@import url("https://fonts.googleapis.com/css2?family=Roboto&display=swap"); +h1{ + color: orange; + background-color: black; + font-family: "Roboto"; + padding: .75em .75em .75em .75em; +} + +body{ + font-family: "Roboto"; +} + +img{ + height: 100%; + width: 100%; + object-fit: cover; +} +.thumbnail{ + height: 200px; + width: 200px; + float: left; + margin-right: 15px; +} +.sidebar{ + display: inline-block; +} +content{ + +} \ No newline at end of file From 0a557a1eb3c7f5a12ecdb7541ab1f5b12b8ec64a Mon Sep 17 00:00:00 2001 From: StephanieCzetli Date: Sat, 5 Dec 2020 17:25:01 -0500 Subject: [PATCH 2/4] Added space - practice --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index ce1df70..b71cee5 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,7 @@ Document +

MyWebsite

@@ -43,4 +44,4 @@

Other Widgets

- \ No newline at end of file + From 07fcb7cbcd933d9768853b25d58fea5327f7f74a Mon Sep 17 00:00:00 2001 From: Filmon-coder Date: Mon, 7 Dec 2020 20:44:52 -0500 Subject: [PATCH 3/4] first commit on Filmon branch --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index ce1df70..c2765e8 100644 --- a/index.html +++ b/index.html @@ -40,7 +40,7 @@

Other Widgets

Lorem ipsum dolor sit amet consectetur adipisicing elit.

- +

Filmon

\ No newline at end of file From f14e23e76fd6b278e8e662e703e428106e29c281 Mon Sep 17 00:00:00 2001 From: StephanieCzetli Date: Wed, 9 Dec 2020 20:55:34 -0500 Subject: [PATCH 4/4] sample --- HTML-CSS-Pair-Programming-Lab-1 | 1 + index.html | 38 ++++++++++++++++++++++----------- style.css | 22 ++++++++++++++++--- 3 files changed, 46 insertions(+), 15 deletions(-) create mode 160000 HTML-CSS-Pair-Programming-Lab-1 diff --git a/HTML-CSS-Pair-Programming-Lab-1 b/HTML-CSS-Pair-Programming-Lab-1 new file mode 160000 index 0000000..3997ab1 --- /dev/null +++ b/HTML-CSS-Pair-Programming-Lab-1 @@ -0,0 +1 @@ +Subproject commit 3997ab11b88d41d8f4aa28a968873207b1ea6d89 diff --git a/index.html b/index.html index c2765e8..5fd5443 100644 --- a/index.html +++ b/index.html @@ -6,18 +6,25 @@ Document - -

MyWebsite

-
-
- Golden Gate Bridge at Sunset + +
+
+

MyWebsite

+
-
-

This is a Lorem Ipsum Heading

-

Lorem ipsum, dolor sit amet consectetur adipisicing elit. Reiciendis, asperiores. Tempore ipsam, libero eveniet amet odit ex a dicta pariatur exercitationem alias, similique molestiae non sed repellendus sit aliquid nemo!

- Read More + +
+
+
+ Golden Gate Bridge at Sunset +
+ +

This is a Lorem Ipsum Heading

+

Lorem ipsum, dolor sit amet consectetur adipisicing elit. Reiciendis, asperiores. Tempore ipsam, libero eveniet amet odit ex a dicta pariatur exercitationem alias, similique molestiae non sed repellendus sit aliquid nemo!

+ Read More
+

SideBar Links

@@ -28,7 +35,6 @@

SideBar Links

  • Link 3
  • Link 4
    • -
    @@ -40,7 +46,15 @@

    Other Widgets

    Lorem ipsum dolor sit amet consectetur adipisicing elit.

    -

    Filmon

    +
    + + +
    + +
    - \ No newline at end of file + + diff --git a/style.css b/style.css index a1c1676..be5c4c0 100644 --- a/style.css +++ b/style.css @@ -6,6 +6,10 @@ h1{ padding: .75em .75em .75em .75em; } +a { + color: orange; +} + body{ font-family: "Roboto"; } @@ -24,6 +28,18 @@ img{ .sidebar{ display: inline-block; } -content{ - -} \ No newline at end of file + +.footer-text { + color: white; + text-align: center; +} + +.yoursite-orange { + color: orange; +} + +.footer-bar { + background-color: black; + font-family: "Roboto"; + padding: .75em .75em .75em .75em; +}