From e8994933f909ec76b9f47d19e2a6a582d3f17042 Mon Sep 17 00:00:00 2001 From: Gennady Tabala Date: Tue, 2 Jun 2020 10:09:13 +0100 Subject: [PATCH 1/8] Update index.html --- week3/2-website/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/week3/2-website/index.html b/week3/2-website/index.html index 22e4f2c2..f525eaee 100644 --- a/week3/2-website/index.html +++ b/week3/2-website/index.html @@ -43,7 +43,7 @@

Feeding the cake deprived since 2020

Cupcakes with sprinkles @@ -54,28 +54,28 @@

Just a small sample of our bakes:

  • Sponge cake with blackberries and flowers
  • Wedding cake
  • Cake decorated with macarons
  • Frangipane with raspberries
    • From 05023e709a866c5062ac8d802ae96e2374fe42fb Mon Sep 17 00:00:00 2001 From: Gennady Tabala Date: Tue, 2 Jun 2020 10:16:26 +0100 Subject: [PATCH 2/8] Update index.html --- week3/2-website/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/week3/2-website/index.html b/week3/2-website/index.html index f525eaee..aa794236 100644 --- a/week3/2-website/index.html +++ b/week3/2-website/index.html @@ -43,7 +43,7 @@

    Feeding the cake deprived since 2020

    Cupcakes with sprinkles @@ -54,28 +54,28 @@

    Just a small sample of our bakes:

  • Sponge cake with blackberries and flowers
  • Wedding cake
  • Cake decorated with macarons
  • Frangipane with raspberries
    • From 6d182e46133fdfa010f26127ae495e2bfd04330b Mon Sep 17 00:00:00 2001 From: Gennady Tabala Date: Tue, 9 Jun 2020 16:46:34 +0100 Subject: [PATCH 3/8] First --- week3/2-website/index.html | 90 +++++++----- week3/2-website/style.css | 287 +++++++++++++++---------------------- 2 files changed, 173 insertions(+), 204 deletions(-) diff --git a/week3/2-website/index.html b/week3/2-website/index.html index aa794236..b306874f 100644 --- a/week3/2-website/index.html +++ b/week3/2-website/index.html @@ -1,45 +1,35 @@ - - - - - - Responsive Cake webpage - + + + - + + Document + + + - -
    -
    +

    Let Them Eat Cake

    -

    Feeding the cake deprived since 2020

    +<<<<<<< Updated upstream Just a small sample of our bakes:
  • Contact
  • Delivery
    • +======= +
    +
    + delicious cup cake +
    +

    Just a small sample of our bakes:

    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    + + + +
    + - - + + \ No newline at end of file diff --git a/week3/2-website/style.css b/week3/2-website/style.css index 42ed132b..3726a64a 100644 --- a/week3/2-website/style.css +++ b/week3/2-website/style.css @@ -1,196 +1,145 @@ -/* Universal styles */ - -* { - font-family: "Pacifico", cursive; - background-color: rgb(188, 243, 226); -} - -li { - list-style: none; -} - -a { - text-decoration: none; - color: rgb(200, 144, 233); +html, body, div, header, nav, main, footer, ul, li { + padding: 0; + margin: 0; + width: 100%; } -/* Header styles */ -.top-header { - display: flex; - flex-direction: column; - align-items: center; +body { + font-family: "Pacifico", cursive; + background-color: #bcf3e2; } -.top-header .header-image { - height: 200px; - width: 200px; - padding: 20px; -} - -.contact-button { - color: rgb(200, 144, 233); - font-size: 25px; - border-color: rgb(252, 251, 253); - border-radius: 20px; - border-width: medium; - width: 125px; - height: 50px; -} - -.navigation ul { - display: flex; - flex-direction: column; - padding-left: 5px; +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; } -.navigation li { - padding-top: 25px; - padding-right: 50px; - font-size: 25px; +#logo, #contact-btn { + margin: 10px; } -/* About section styles */ - -.about { - padding-top: 50px; +#contact-btn { + font-family: "Pacifico", cursive; + font-size: 2rem; + border-radius: 1rem; + background-color: #bcf3e2; + padding-left: 20px; + padding-right: 20px; } -.about h1 { - font-size: 40px; - color: rgb(255, 128, 153); - text-align: center; -} +/*#cakes-menu { -.about h3 { - font-size: 25px; - color: rgb(255, 128, 153); - text-align: center; - padding-bottom: 50px; -} +}*/ -.about .cupcakes { - display: flex; - justify-content: center; - width: 100%; - border: 2px solid rgb(252, 251, 253); - margin: 0; +ul { + list-style: none; + text-align: center; } -/* Example cake styles */ - -.example-cakes h3 { - font-size: 25px; - color: rgb(255, 128, 153); - text-align: center; - padding-top: 50px; - padding-bottom: 20px; +a { + font-size: 25px; + text-decoration: none; } -.example-cakes ul { - padding-left: 0; +#tagline{ + text-align: center; + color: rgb(240, 118, 158); } - -.example-cakes li { - display: flex; - justify-content: center; - flex-wrap: wrap; - padding-bottom: 20px; +#tagline h1 { + font-size: 2rem; } - -.images { - border: 2px solid rgb(252, 251, 253); +#tagline h3 { + } - -/* Footer styles */ - -.footer { - display: flex; - padding: 50px; - justify-content: center; +#mainImg { + width: 100%; + border:solid 3px white; } - -.footer li { - padding-right: 50px; - font-size: 25px; +p { + text-align: center; + font-size: large; } - -/* Media queries */ - -@media only screen and (min-width: 650px) { - .navigation ul { - display: flex; - flex-direction: row; - justify-content: center; - padding-left: 20px; - } - - .example-cakes ul { +#cake-images-container { display: flex; - flex-direction: row; flex-wrap: wrap; - justify-content: space-evenly; - } - - .example-cakes li { - width: 45%; - height: 45%; - } - - .footer ul { - display: flex; - flex-direction: row; - } + justify-content: center; } -@media only screen and (min-width: 1000px) { - .top-header .header-image { - display: flex; - flex-direction: column; - align-self: start; - height: 250px; - width: 250px; - } - - .contact-button { - display: flex; - flex-direction: column; - align-self: flex-end; - width: 175px; - height: 75px; - font-size: 30px; - padding-left: 30px; - padding-top: 8px; - margin-right: 5px; - } - - .navigation li { - font-size: 30px; - } - - .about h1 { - font-size: 60px; - } - - .about h3 { - font-size: 30px; - } - - .example-cakes h3 { - font-size: 30px; - } - - .example-cakes ul { +.examples { display: flex; - justify-content: space-evenly; - } - - .example-cakes li { - width: 20%; - height: 20%; - } - - .footer li { - font-size: 30px; - } -} + justify-content: center; + margin-top: 20px; +} + +footer ul { + margin-top: 70px; + margin-bottom: 70px; +} + +@media screen and (min-width: 650px){ + #cakes-menu { + width: 650px; + margin-left: auto; + margin-right: auto; + font-size: 1.5rem; + } + ul { + display: flex; + justify-content: center; + + } + + + li { + text-align: center; + } + #cake-images-container { + display: flex; + flex-wrap: wrap; + justify-content: space-around; + } + .examples { + width: 45%; + margin-top: 20px; + display: flex; + justify-content: center; +} +} + +@media screen and (min-width: 1000px){ + #logo { + align-self: flex-start; + margin-left: 20px; + } + #contact-btn { + align-self: flex-end; + margin-right: 20px; + } + #cakes-menu { + width: 800px; + margin-left: auto; + margin-right: auto; + + } + a { + font-size: 2rem; + } + ul { + + } + #tagline h1 { + font-size: 4rem; + } + #tagline h3 { + font-size: 1.5rem; + } + p { + font-size: x-large; + } + .examples { + width: 20%; + } +} \ No newline at end of file From afef3dbeb482f7ed19a5f90b7e0c85884a23d128 Mon Sep 17 00:00:00 2001 From: Gennady Tabala Date: Tue, 9 Jun 2020 16:51:44 +0100 Subject: [PATCH 4/8] Changes from files --- week3/2-website/index.html | 54 +------------------------------------- week3/2-website/style.css | 3 --- 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/week3/2-website/index.html b/week3/2-website/index.html index b306874f..7867b4ff 100644 --- a/week3/2-website/index.html +++ b/week3/2-website/index.html @@ -6,7 +6,7 @@ href="https://fonts.googleapis.com/css?family=Pacifico&display=swap" rel="stylesheet" /> - + Document @@ -29,57 +29,6 @@

    Let Them Eat Cake

    Feeding the cake deprived since 2020

    -<<<<<<< Updated upstream - - Cupcakes with sprinkles -
    - -
    -

    Just a small sample of our bakes:

    -
      -
    • - Sponge cake with blackberries and flowers -
      • -
    • - Wedding cake -
      • -
    • - Cake decorated with macarons -
      • -
    • - Frangipane with raspberries -
      • -
    -
    -
    - - \ No newline at end of file diff --git a/week3/2-website/style.css b/week3/2-website/style.css index 3726a64a..06381ded 100644 --- a/week3/2-website/style.css +++ b/week3/2-website/style.css @@ -30,9 +30,6 @@ body { padding-right: 20px; } -/*#cakes-menu { - -}*/ ul { list-style: none; From 8a033df07a6b9de492381a139074a24671d8df27 Mon Sep 17 00:00:00 2001 From: Gennady Tabala Date: Tue, 9 Jun 2020 16:53:13 +0100 Subject: [PATCH 5/8] Fixed path. --- week3/2-website/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/week3/2-website/index.html b/week3/2-website/index.html index 7867b4ff..3f9fc0db 100644 --- a/week3/2-website/index.html +++ b/week3/2-website/index.html @@ -6,7 +6,7 @@ href="https://fonts.googleapis.com/css?family=Pacifico&display=swap" rel="stylesheet" /> - + Document From 7494697e5bac6a94c5af38f03c9a9e07a960f1cd Mon Sep 17 00:00:00 2001 From: Gennady Tabala Date: Tue, 9 Jun 2020 21:38:09 +0100 Subject: [PATCH 6/8] Finish --- week3/2-website/style.css | 42 ++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/week3/2-website/style.css b/week3/2-website/style.css index 06381ded..69fc501e 100644 --- a/week3/2-website/style.css +++ b/week3/2-website/style.css @@ -23,22 +23,34 @@ body { #contact-btn { font-family: "Pacifico", cursive; - font-size: 2rem; + font-size: 1.5rem; + color: #8a71bc; border-radius: 1rem; background-color: #bcf3e2; padding-left: 20px; padding-right: 20px; + border: outset; +} + +#contact-btn:active{ + border: inset; +} + +#contact-btn:focus{ + outline: none; } ul { list-style: none; - text-align: center; + text-align: left; + margin-left: 20px; } a { font-size: 25px; text-decoration: none; + color: #8a71bc; } #tagline{ @@ -48,16 +60,16 @@ a { #tagline h1 { font-size: 2rem; } -#tagline h3 { - -} -#mainImg { + +#mainimg { width: 100%; border:solid 3px white; } p { + color: rgb(240, 118, 158); text-align: center; font-size: large; + font-weight: bold; } #cake-images-container { display: flex; @@ -70,14 +82,19 @@ p { justify-content: center; margin-top: 20px; } - +.examples img { + border:solid 3px white; +} footer ul { margin-top: 70px; margin-bottom: 70px; + margin-left: 0; + text-align: center; } @media screen and (min-width: 650px){ - #cakes-menu { + + #cakes-menu, footer ul { width: 650px; margin-left: auto; margin-right: auto; @@ -104,14 +121,17 @@ footer ul { display: flex; justify-content: center; } -} + @media screen and (min-width: 1000px){ #logo { align-self: flex-start; margin-left: 20px; + height: 250px; + width: 250px; } #contact-btn { + font-size: 2rem; align-self: flex-end; margin-right: 20px; } @@ -124,9 +144,7 @@ footer ul { a { font-size: 2rem; } - ul { - - } + #tagline h1 { font-size: 4rem; } From a1431d3974f6d47da3d447d62ab1b1a9bcbb2521 Mon Sep 17 00:00:00 2001 From: Gennady Tabala Date: Thu, 11 Jun 2020 18:31:02 +0100 Subject: [PATCH 7/8] Title --- week3/2-website/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/week3/2-website/index.html b/week3/2-website/index.html index 3f9fc0db..5bcbc5fd 100644 --- a/week3/2-website/index.html +++ b/week3/2-website/index.html @@ -7,7 +7,7 @@ rel="stylesheet" /> - Document + Charlie and the Cake Factory.