From 91f26696414f7847288cfdd771908b315d7d3772 Mon Sep 17 00:00:00 2001 From: Jalaluddin Kasaat Date: Fri, 13 Jul 2018 00:22:42 -0400 Subject: [PATCH 1/3] improved the sales page and added a basic public page. --- .DS_Store | Bin 0 -> 6148 bytes index.html | 54 +++++++++++++++++----------- main.css | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++--- main.js | 2 +- sales.html | 43 +++++++++++++++++++++++ 5 files changed, 174 insertions(+), 26 deletions(-) create mode 100644 .DS_Store create mode 100644 sales.html diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 - - + + +
+

Maryland Cookie Chain

+
-
- -
+
-
+
+
    +
  • Silver Spring Cookie Stand
    • +
  • Silver Spring Cookie Stand
    • +
  • Silver Spring Cookie Stand
    • +
  • Silver Spring Cookie Stand
    • +
  • More Stores to Come
    • +
+ +
+ +
+ +
+ +

About Maryland Cookie Chain

+ +

+ Maryland Cookie Chain is the fastest growing cookie business in DC Metro Area. +

+ +
+ + - + \ No newline at end of file diff --git a/main.css b/main.css index 5a3e9e2..0abc5f5 100755 --- a/main.css +++ b/main.css @@ -7,6 +7,7 @@ table { table, th, td { border: 1px solid black; text-align: left; + color:darkslategrey } table > tr:first-child > th, table > tr:last-child > td { @@ -16,14 +17,106 @@ table > tr:first-child > th, table > tr:last-child > td { fieldset { - width: 1250px; + width: 1800x; border: 1px solid #8d2a2a; - border-radius: 10px solid #1eb400 + border-radius: 10px solid #1eb400; + padding: 3mm; } button { - width: 100px; + width: 150px; margin-left: auto; - margin-right: auto; + margin-right: auto; + background-color: cadetblue; + color: lightyellow; + padding: 10px 12px; + font-size: 20px; +} + + +/* */ + + +#sales { + + background-color: rosybrown; +} + +header { + background-color: darkgray; + margin: 3em; + border-style: solid; + border-color: #8d2a2a; + border-width: 0.5mm; + + +} + +h1 { + text-align: center; + color: antiquewhite; + +} + +ul { + + color: darkblue; + font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; + font-size-adjust: inherit; + list-style: none; + padding:5mm; + +} + +.store-div { + + background-color: gray; + position: fixed; + left: 0px; + width: calc(100/2); + height: 500px; + border: 3px solid green; + margin: 0%; + +} + +.info { + + background-color: crimson; + position: relative; + width: calc(100); + left: 20cm; + padding: 5mm + + +} + + +/* Sales HTML Layout */ + +#main-content { + + background-color: darkseagreen; + + +} + +#cookie-stores { + + background-color: beige; + color: gray; + font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; + padding:5mm; + +} + +.cookie-head { + + color: white; +} + +label { + + padding:1mm; } \ No newline at end of file diff --git a/main.js b/main.js index a296639..0edb428 100755 --- a/main.js +++ b/main.js @@ -10,7 +10,6 @@ let storeThree = new Store('White Oak Cookie Stand', [4, 18, 16, 12, 1, 3, 3, 9, let storeFour = new Store('Takoma Park Cookie Stand', [34, 27, 9, 9, 13, 14, 7, 2, 1]); - let storeArray = [storeOne, storeTwo, storeThree, storeFour]; let elBody = document.getElementById('table-container'); @@ -61,6 +60,7 @@ for (let i = 0; i < storeArray.length; i++) { }; + // Footer let elRow = document.createElement('tr'); diff --git a/sales.html b/sales.html new file mode 100644 index 0000000..44c1c24 --- /dev/null +++ b/sales.html @@ -0,0 +1,43 @@ + + + + + + Page Title + + + + + + +
+ +

Maryland Cookie Chain

+ + +
+ +
+ +
+ +
+ + + + \ No newline at end of file From d8969f8e72bbb6eac10f1273f9312d68fecc3732 Mon Sep 17 00:00:00 2001 From: Jalaluddin Kasaat Date: Mon, 16 Jul 2018 08:50:51 -0400 Subject: [PATCH 2/3] more styling --- index.html | 50 ++++++++++++++++++++++++++++++----- main.css | 76 +++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 109 insertions(+), 17 deletions(-) diff --git a/index.html b/index.html index 0f98cd3..8bca99c 100755 --- a/index.html +++ b/index.html @@ -14,12 +14,19 @@

Maryland Cookie Chain

- +
-
+
+ +

Our Stores

  • Silver Spring Cookie Stand
  • Silver Spring Cookie Stand
    • @@ -31,17 +38,46 @@

    Maryland Cookie Chain

- + +
+
-

About Maryland Cookie Chain

+

About Maryland Cookie Chain

Maryland Cookie Chain is the fastest growing cookie business in DC Metro Area.

- -
- + +

Below are our most popular cookie shapes:

+ +
+ chinook cookie +
Chinook cookie
+
+ +
+ chinook cookie +
Colorful fish cookies
+
+
+ chinook cookie +
frosted cookie
+
+ + + +
+ +

Contact Us

+ +

Send us an + email if you have any questions. + +

+
+ +
diff --git a/main.css b/main.css index 0abc5f5..3fad502 100755 --- a/main.css +++ b/main.css @@ -45,53 +45,107 @@ button { header { background-color: darkgray; + opacity: 0.5; margin: 3em; border-style: solid; border-color: #8d2a2a; border-width: 0.5mm; +} + +.nav-bar { + + overflow: hidden; + width: 150cm; + height: 1cm; + background-color: skyblue; + opacity: 0.8; + margin: 2cm; + font-size: 40px; + padding: 1mm; + + +} + +.nav-bar a { + + float: left; + color: #8d2a2a; + padding: 14px 16px; + text-align: center; + font-size: 18px; + text-decoration: none; + + + +} + +.nav-bar a:hover { + + background-color: #1eb400; + color: white; } h1 { text-align: center; - color: antiquewhite; + color: maroon; } ul { - color: darkblue; - font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; + color: black; font-size-adjust: inherit; list-style: none; padding:5mm; + line-height: 1.5; + } .store-div { - background-color: gray; - position: fixed; + background-color: darkgray; + opacity: 0.5; + position: absolute; left: 0px; - width: calc(100/2); - height: 500px; - border: 3px solid green; + width: 7cm; + height: 15cm; margin: 0%; } +#store-list { + + text-align: center; + color: maroon; +} + .info { background-color: crimson; + opacity: 0.6; position: relative; - width: calc(100); + width: 10cm; + height: 20cm; left: 20cm; padding: 5mm } +.contact-us { + + height: 5cm; + background-color: goldenrod; + padding: 12px 16px; +} + +#h2-contactus { + + text-align: left; +} /* Sales HTML Layout */ @@ -119,4 +173,6 @@ ul { label { padding:1mm; -} \ No newline at end of file +} + + From de5de17d0ebe7b3673697cc06addcf15f4cbe8d5 Mon Sep 17 00:00:00 2001 From: Jalaluddin Kasaat Date: Mon, 16 Jul 2018 17:06:58 -0400 Subject: [PATCH 3/3] First submission of the stretch goal --- index.html | 14 +++++++++++++- main.css | 8 ++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 8bca99c..cbdd433 100755 --- a/index.html +++ b/index.html @@ -16,9 +16,10 @@

Maryland Cookie Chain

@@ -67,6 +68,17 @@

Below are our most popular cookie shapes:

+
+ + + + +
+

Contact Us

diff --git a/main.css b/main.css index 3fad502..d754a92 100755 --- a/main.css +++ b/main.css @@ -135,6 +135,14 @@ ul { } +#order { + + height: 5cm; + background-color: chocolate; + padding: 8px 12px; + +} + .contact-us { height: 5cm;