From d3345788584f078dd45e682d7fe836dd1a7dc138 Mon Sep 17 00:00:00 2001 From: Corinne Date: Wed, 8 Feb 2017 16:24:00 -0800 Subject: [PATCH 1/3] index --- home.html => index.html | 16 +----------- styles.css | 54 ++++++++++++++++------------------------- 2 files changed, 22 insertions(+), 48 deletions(-) rename home.html => index.html (71%) diff --git a/home.html b/index.html similarity index 71% rename from home.html rename to index.html index f8479dd..101034f 100644 --- a/home.html +++ b/index.html @@ -34,9 +34,8 @@ -<<<<<<< HEAD -
+
-======= -

© ->>>>>>> 1b86069953f7338f5c3948947b66151ccc44194c - - -

-
    -
  • JUSTDESSERTS©
    • -
  • SITEMAP
    • -
  • EMAIL
    • -
  • TELEPHONE
    • -
-
diff --git a/styles.css b/styles.css index 425a324..a622f5a 100644 --- a/styles.css +++ b/styles.css @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= /*navigation bar*/ ->>>>>>> 1b86069953f7338f5c3948947b66151ccc44194c .navigation ul{ list-style-type: none; text-align: center; @@ -33,34 +30,12 @@ li:hover { } -<<<<<<< HEAD + .navigation:hover { } -.disclaimer ul{ - - color: #000000; - display:inline-block; - list-style-type: none; - text-align: center; - width:100%; - -} -.disclaimer li{ - - margin: auto; - padding: 10px 20px; - border-right: 2px, solid, black; - border-left: 2px solid black; - - -} - -.copy{ - font-size: 10px; -======= /*main body*/ .about { padding: 75px; @@ -83,12 +58,25 @@ li:hover { /*footer*/ -#disclaimer{ - font-size: small; +.footer ul{ + color: #000000; + display:inline-block; list-style-type: none; - margin: 0; - padding: 0; - display:inline; ->>>>>>> 1b86069953f7338f5c3948947b66151ccc44194c -} \ No newline at end of file + text-align: center; + width:100%; + +} + +.footer li{ + + margin: auto; + padding: 10px 20px; + border-right: 2px, solid, black; + border-left: 2px solid black; + + +} + +.copy{ + font-size: 10px; From 1ebf6910e830b7a9504958abeb48e501b0bca0aa Mon Sep 17 00:00:00 2001 From: Corinne Date: Wed, 8 Feb 2017 23:28:24 -0800 Subject: [PATCH 2/3] created first contact us page --- contact.html | 40 ++++++++++++++ index.html | 4 +- ...l~a3d091325b798da6c00df485c408a5e2dac75f67 | 54 ------------------- styles.css | 43 +++++++++++++-- 4 files changed, 80 insertions(+), 61 deletions(-) create mode 100644 contact.html delete mode 100644 index.html~a3d091325b798da6c00df485c408a5e2dac75f67 diff --git a/contact.html b/contact.html new file mode 100644 index 0000000..2702044 --- /dev/null +++ b/contact.html @@ -0,0 +1,40 @@ + + + + + + Contact Us + + + + + +
+ +
+ +
+

Contact Us

+
+ + + + + +
+ +
+ + + + \ No newline at end of file diff --git a/index.html b/index.html index 101034f..56892ee 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + Just Desserts @@ -33,7 +33,7 @@
- +