From f9afb83795624eaad9f7b7b2aa2b9eef76ead71c Mon Sep 17 00:00:00 2001 From: Lilli Paris Date: Tue, 8 Mar 2022 11:04:12 -0700 Subject: [PATCH 1/8] Completed Flexbox 1-3 --- .../1. Responsive Grids/index.html | 2 +- Week 2.2 - Flexbox/1. Centering/index.html | 7 +++++ .../2. Placing Items/index.html | 4 +++ .../3. Placing Items - Advanced/index.html | 31 +++++++++++++++---- 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/Week 2.1 - CSS Grid/1. Responsive Grids/index.html b/Week 2.1 - CSS Grid/1. Responsive Grids/index.html index 2d612e63..30bbf984 100644 --- a/Week 2.1 - CSS Grid/1. Responsive Grids/index.html +++ b/Week 2.1 - CSS Grid/1. Responsive Grids/index.html @@ -28,7 +28,7 @@ diff --git a/Week 2.2 - Flexbox/1. Centering/index.html b/Week 2.2 - Flexbox/1. Centering/index.html index 5283be49..346771c9 100644 --- a/Week 2.2 - Flexbox/1. Centering/index.html +++ b/Week 2.2 - Flexbox/1. Centering/index.html @@ -7,11 +7,15 @@ @@ -23,6 +27,9 @@ border: 2px solid thistle; border-radius: 4px;; background-color: whitesmoke; + display: flex; + align-items: center; + justify-content: center; /* Add to your code here to center the box within the container */ } diff --git a/Week 2.2 - Flexbox/2. Placing Items/index.html b/Week 2.2 - Flexbox/2. Placing Items/index.html index 986e0ee4..15cae6c7 100644 --- a/Week 2.2 - Flexbox/2. Placing Items/index.html +++ b/Week 2.2 - Flexbox/2. Placing Items/index.html @@ -21,6 +21,10 @@ min-height: 100px; box-shadow: 0px 3px 6px rgba(45, 35, 66, 0.102); background-color: #fff; + display: flex; + justify-content: space-between; + align-items: center; + /* Add to your code here to place the `.logo` and `.links` on either diff --git a/Week 2.2 - Flexbox/3. Placing Items - Advanced/index.html b/Week 2.2 - Flexbox/3. Placing Items - Advanced/index.html index 9ff4f7e7..5faf76d1 100644 --- a/Week 2.2 - Flexbox/3. Placing Items - Advanced/index.html +++ b/Week 2.2 - Flexbox/3. Placing Items - Advanced/index.html @@ -1,5 +1,6 @@ + @@ -21,38 +22,56 @@ } + + + .card { + display: flex; + flex-flow: column nowrap; + } + + .more { + margin-top:auto; + /* Add your code here to position the "read more" links to the bottom of their respective cards */ + } + + +
placeholder

Lorem Ipsum Dolor

-

Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso machine? Wh-what is-h-how did you get my espresso machine? I was part of something special. Eventually, you do plan to have dinosaurs on your dinosaur tour, right?

+

Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso + machine? Wh-what is-h-how did you get my espresso machine? I was part of something special. Eventually, + you do plan to have dinosaurs on your dinosaur tour, right?

Read More
placeholder

Lorem Ipsum Dolor

-

Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso machine? Wh-what is-h-how did you get my espresso machine? I was part of something special.

+

Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso + machine? Wh-what is-h-how did you get my espresso machine? I was part of something special.

Read More
placeholder

Lorem Ipsum Dolor

-

Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso machine? Wh-what is-h-how did you get my espresso machine?

+

Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso + machine? Wh-what is-h-how did you get my espresso machine?

Read More
placeholder

Lorem Ipsum Dolor

-

Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso machine?

+

Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso + machine?

Read More
+ \ No newline at end of file From c1e8bdf4be4888e89387c1e13ca9d7677d209b50 Mon Sep 17 00:00:00 2001 From: Lilli Paris Date: Tue, 8 Mar 2022 17:01:25 -0700 Subject: [PATCH 2/8] Finished Map and Filter --- Week 1.3 - JavaScript/1. Filter/index.html | 16 ++++++++++++---- Week 1.3 - JavaScript/2. Map/index.html | 9 +++++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Week 1.3 - JavaScript/1. Filter/index.html b/Week 1.3 - JavaScript/1. Filter/index.html index e74982a2..d96b2e4d 100644 --- a/Week 1.3 - JavaScript/1. Filter/index.html +++ b/Week 1.3 - JavaScript/1. Filter/index.html @@ -1,19 +1,26 @@ + Filter + - + + \ No newline at end of file diff --git a/Week 1.3 - JavaScript/2. Map/index.html b/Week 1.3 - JavaScript/2. Map/index.html index 72fa39ee..3093b501 100644 --- a/Week 1.3 - JavaScript/2. Map/index.html +++ b/Week 1.3 - JavaScript/2. Map/index.html @@ -1,19 +1,23 @@ + Map + - + + \ No newline at end of file From 8a40ef02b825ecbb29100d4158b8899a0120ec47 Mon Sep 17 00:00:00 2001 From: Lilli Paris Date: Wed, 9 Mar 2022 09:25:05 -0700 Subject: [PATCH 3/8] CSS 1-3 --- Week 1.2 - CSS/1. Selectors - Attributes/index.html | 2 +- Week 1.2 - CSS/2. Selectors - Children/index.html | 2 +- Week 1.2 - CSS/3. Selectors - Siblings/index.html | 2 +- Week 2.1 - CSS Grid/1. Responsive Grids/index.html | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Week 1.2 - CSS/1. Selectors - Attributes/index.html b/Week 1.2 - CSS/1. Selectors - Attributes/index.html index 3d9c05b8..012bf5c2 100644 --- a/Week 1.2 - CSS/1. Selectors - Attributes/index.html +++ b/Week 1.2 - CSS/1. Selectors - Attributes/index.html @@ -9,7 +9,7 @@ diff --git a/Week 1.2 - CSS/2. Selectors - Children/index.html b/Week 1.2 - CSS/2. Selectors - Children/index.html index 7ff366db..3a43d88b 100644 --- a/Week 1.2 - CSS/2. Selectors - Children/index.html +++ b/Week 1.2 - CSS/2. Selectors - Children/index.html @@ -9,7 +9,7 @@
    diff --git a/Week 1.2 - CSS/3. Selectors - Siblings/index.html b/Week 1.2 - CSS/3. Selectors - Siblings/index.html index b6086a75..1b683a91 100644 --- a/Week 1.2 - CSS/3. Selectors - Siblings/index.html +++ b/Week 1.2 - CSS/3. Selectors - Siblings/index.html @@ -16,7 +16,7 @@ From 63215571d46796f5d3f17ae79b6a839d83dd375c Mon Sep 17 00:00:00 2001 From: Lilli Paris Date: Wed, 9 Mar 2022 16:16:30 -0700 Subject: [PATCH 4/8] CSS 4-6 Complete --- .../4. Inheritance and Systems/index.html | 33 ++++++++++++++++--- Week 1.2 - CSS/5. Transitions/index.html | 5 +++ .../6. Tricks - Click Passthrough/index.html | 1 + 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/Week 1.2 - CSS/4. Inheritance and Systems/index.html b/Week 1.2 - CSS/4. Inheritance and Systems/index.html index e1c5e441..dd86e242 100644 --- a/Week 1.2 - CSS/4. Inheritance and Systems/index.html +++ b/Week 1.2 - CSS/4. Inheritance and Systems/index.html @@ -1,21 +1,44 @@ + Inheritance and Systems + - + - - - - + + + + + \ No newline at end of file diff --git a/Week 1.2 - CSS/5. Transitions/index.html b/Week 1.2 - CSS/5. Transitions/index.html index 4fa3bd71..f8a4f365 100644 --- a/Week 1.2 - CSS/5. Transitions/index.html +++ b/Week 1.2 - CSS/5. Transitions/index.html @@ -23,6 +23,11 @@ height: 100px; background-color: rebeccapurple; } + .box:hover { + width: 200px; + height: 200px; + transition-duration: 200ms; + }
    diff --git a/Week 1.2 - CSS/6. Tricks - Click Passthrough/index.html b/Week 1.2 - CSS/6. Tricks - Click Passthrough/index.html index 769c1a18..05f6caf9 100644 --- a/Week 1.2 - CSS/6. Tricks - Click Passthrough/index.html +++ b/Week 1.2 - CSS/6. Tricks - Click Passthrough/index.html @@ -29,6 +29,7 @@ width: 100%; height: 100%; background-image: linear-gradient(to bottom, transparent, black); + pointer-events: none; } From 8854be803c49a9d421104d1f592645622c101391 Mon Sep 17 00:00:00 2001 From: Lilli Paris Date: Wed, 9 Mar 2022 16:31:45 -0700 Subject: [PATCH 5/8] Flex box 4 Complete --- Week 2.2 - Flexbox/4. Flexing/index.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Week 2.2 - Flexbox/4. Flexing/index.html b/Week 2.2 - Flexbox/4. Flexing/index.html index 443de97c..f3b25e83 100644 --- a/Week 2.2 - Flexbox/4. Flexing/index.html +++ b/Week 2.2 - Flexbox/4. Flexing/index.html @@ -40,14 +40,23 @@ From 53e240ce66822ae7d4cf709a58b3ac40b8848ea5 Mon Sep 17 00:00:00 2001 From: Lilli Paris Date: Thu, 10 Mar 2022 14:34:24 -0700 Subject: [PATCH 6/8] Grid Complete --- .../2. Placing Items/index.html | 30 ++++++++++++++- .../3. Placing Items - Advanced/index.html | 38 +++++++++++++++++-- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/Week 2.1 - CSS Grid/2. Placing Items/index.html b/Week 2.1 - CSS Grid/2. Placing Items/index.html index fcd7781b..63d2f0e9 100644 --- a/Week 2.1 - CSS Grid/2. Placing Items/index.html +++ b/Week 2.1 - CSS Grid/2. Placing Items/index.html @@ -1,5 +1,6 @@ + @@ -12,13 +13,37 @@ max-width: 800px; } - .photo > * { mix-blend-mode: multiply; } + .photo>* { + mix-blend-mode: multiply; + } +
    @@ -27,6 +52,7 @@ yellow black
    - + + \ No newline at end of file diff --git a/Week 2.1 - CSS Grid/3. Placing Items - Advanced/index.html b/Week 2.1 - CSS Grid/3. Placing Items - Advanced/index.html index 0161e9be..afbbe456 100644 --- a/Week 2.1 - CSS Grid/3. Placing Items - Advanced/index.html +++ b/Week 2.1 - CSS Grid/3. Placing Items - Advanced/index.html @@ -1,5 +1,6 @@ + @@ -14,7 +15,7 @@ max-width: 776px; } - .grid > * { + .grid>* { grid-column: span 1; grid-row: span 1; display: flex; @@ -45,19 +46,47 @@ } + - +
  • h
  • e
  • l
    • -
  • l
    • +
  • l
  • o
    • -
  • !
    • +
  • !
  • @@ -109,4 +138,5 @@
    + \ No newline at end of file From eef4141062a798e3a52bc28aedb3e246c9e24f6d Mon Sep 17 00:00:00 2001 From: Lilli Paris Date: Thu, 10 Mar 2022 16:04:16 -0700 Subject: [PATCH 7/8] JS Complete --- .../3. Objects as a Map/index.html | 30 ++++++++-------- .../4. Event Listeners/index.html | 8 ++--- .../5. DOM Manipulation/index.html | 4 ++- .../Data Fetching/index.html | 35 +++++++++++++------ 4 files changed, 47 insertions(+), 30 deletions(-) diff --git a/Week 1.3 - JavaScript/3. Objects as a Map/index.html b/Week 1.3 - JavaScript/3. Objects as a Map/index.html index 3004949a..a3864106 100644 --- a/Week 1.3 - JavaScript/3. Objects as a Map/index.html +++ b/Week 1.3 - JavaScript/3. Objects as a Map/index.html @@ -1,33 +1,33 @@ + Objects as a Map + - + + \ No newline at end of file diff --git a/Week 1.3 - JavaScript/4. Event Listeners/index.html b/Week 1.3 - JavaScript/4. Event Listeners/index.html index d284e48f..704d4bb7 100644 --- a/Week 1.3 - JavaScript/4. Event Listeners/index.html +++ b/Week 1.3 - JavaScript/4. Event Listeners/index.html @@ -6,10 +6,8 @@ Event Listeners -

    0

    - diff --git a/Week 1.3 - JavaScript/5. DOM Manipulation/index.html b/Week 1.3 - JavaScript/5. DOM Manipulation/index.html index ba0e04f2..4b58bb07 100644 --- a/Week 1.3 - JavaScript/5. DOM Manipulation/index.html +++ b/Week 1.3 - JavaScript/5. DOM Manipulation/index.html @@ -23,7 +23,9 @@

    More Jeff Goldblum

    diff --git a/Week 1.3 - JavaScript/Data Fetching/index.html b/Week 1.3 - JavaScript/Data Fetching/index.html index c1da8137..251986e5 100644 --- a/Week 1.3 - JavaScript/Data Fetching/index.html +++ b/Week 1.3 - JavaScript/Data Fetching/index.html @@ -1,17 +1,32 @@ - - - Data Fetching + + + Data Fetching - -
      - - - +
        + \ No newline at end of file From 98772855febb4484f9c9e0c48c1780b30b760b37 Mon Sep 17 00:00:00 2001 From: Lilli Paris Date: Mon, 14 Mar 2022 08:51:08 -0700 Subject: [PATCH 8/8] HTML 1-4 Complete --- Week 1.1 - HTML/1. Build a Form/index.html | 13 +++++-- .../index.html | 12 +++++-- .../index.html | 15 +++++--- .../4. Mock Up a Design/index.html | 34 +++++++++++++++++-- 4 files changed, 62 insertions(+), 12 deletions(-) diff --git a/Week 1.1 - HTML/1. Build a Form/index.html b/Week 1.1 - HTML/1. Build a Form/index.html index 50432a8b..92d60fb0 100644 --- a/Week 1.1 - HTML/1. Build a Form/index.html +++ b/Week 1.1 - HTML/1. Build a Form/index.html @@ -1,13 +1,20 @@ + Build a Form - - - + +
        + + + + +
        + + \ No newline at end of file diff --git a/Week 1.1 - HTML/2. Create a Responsive Image - Resolution/index.html b/Week 1.1 - HTML/2. Create a Responsive Image - Resolution/index.html index a132ac2a..676081ca 100644 --- a/Week 1.1 - HTML/2. Create a Responsive Image - Resolution/index.html +++ b/Week 1.1 - HTML/2. Create a Responsive Image - Resolution/index.html @@ -23,8 +23,14 @@ - - - + \ No newline at end of file diff --git a/Week 1.1 - HTML/3. Create a Reponsive Image - Aspect Ratio/index.html b/Week 1.1 - HTML/3. Create a Reponsive Image - Aspect Ratio/index.html index d8bb518c..ca79a8d2 100644 --- a/Week 1.1 - HTML/3. Create a Reponsive Image - Aspect Ratio/index.html +++ b/Week 1.1 - HTML/3. Create a Reponsive Image - Aspect Ratio/index.html @@ -1,5 +1,6 @@ + @@ -8,7 +9,9 @@ - - - + + + + + resource + + \ No newline at end of file diff --git a/Week 1.1 - HTML/4. Mock Up a Design/index.html b/Week 1.1 - HTML/4. Mock Up a Design/index.html index a7252a6f..49f529df 100644 --- a/Week 1.1 - HTML/4. Mock Up a Design/index.html +++ b/Week 1.1 - HTML/4. Mock Up a Design/index.html @@ -1,13 +1,43 @@ + Mock Up a Design + - - + +
        +

        Phase 4:

        +

        Destination Thrive

        +

        Objective: Create omni-channel synergy

        +
        +
        +

        Lorem ipsum, dolor sit amet consectetur adipisicing elit. Unde fugit, possimus suscipit culpa quibusdam + blanditiis delectus, tempora in itaque, nam quos nisi. Cumque voluptates, molestias quo quisquam fugiat + itaque + nam blanditiis suscipit ad obcaecati dolores iusto optio unde doloremque dolor saepe expedita nemo dicta + labore + in fugit consequuntur deleniti! Eveniet ea minima, adipisci necessitatibus asperiores aliquid ullam + laboriosam + iusto ratione vero ex quidem est deleniti voluptatem, a unde eius ab, impedit accusamus? Hic, optio commodi + aliquid minima iusto eaque quaerat?

        +
        +

        Key Focus:

        +
      • Harvesting the demand created by your content marketing efforts
        • +
      • Scale paid media and social efforts
        • +
      • Leverage your new audiances
        • +
      • Omni-channel synergy
        • +
        + +
        +

        Time 🕢

        +

        approx. 24 months and beyond

        +
        +
        + \ No newline at end of file