From 68758a2c5a9b84b9ee973f0eca483a2846a6ded9 Mon Sep 17 00:00:00 2001 From: David Clarke Date: Tue, 19 Jul 2022 13:52:56 +0100 Subject: [PATCH 1/9] Added Images and Paragraphs --- index.html | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 763b073..0ab7996 100644 --- a/index.html +++ b/index.html @@ -1 +1,27 @@ - \ No newline at end of file + + + +Mac vs Windows + + +
+

Mac

+
Mac laptop 1
+

This is a Mac Laptop number 1

+
mac laptop 2
+

This is a Mac Laptop number 2

+
mac laptop 3
+

This is a Mac Laptop number 3

+
    +
    +
    +

    Windows

    +
    windows laptop 1
    +

    This is a Windows Laptop number 1

    +
    windows laptop 2
    +

    This is a Windows Laptop number 2

    +
    windows laptop 3
    +

    This is a Windows Laptop number 3

    +
    + + \ No newline at end of file From 4819b948150518296600520b1367f7bc4f83f1ab Mon Sep 17 00:00:00 2001 From: David Clarke Date: Tue, 19 Jul 2022 13:55:36 +0100 Subject: [PATCH 2/9] pushed to simon --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 0ab7996..b5e0ae4 100644 --- a/index.html +++ b/index.html @@ -23,5 +23,6 @@

    Windows

    windows laptop 3

    This is a Windows Laptop number 3

    + \ No newline at end of file From f516ec84822fe557ea4bb40d66d48a0c124e9c5c Mon Sep 17 00:00:00 2001 From: David Clarke Date: Tue, 19 Jul 2022 14:13:15 +0100 Subject: [PATCH 3/9] update --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index b5e0ae4..916cb79 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ -Mac vs Windows +Mac versus Windows
    From ce29989d22dcf7e9b9d14a0c504ce3dd7ab11fea Mon Sep 17 00:00:00 2001 From: Jordan <43437534+Jaardy@users.noreply.github.com> Date: Tue, 19 Jul 2022 16:24:39 +0100 Subject: [PATCH 4/9] my first commit --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b9bd107..e32e2cb 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ # mac-and-windows W3D2 Exercise + + +Testing here \ No newline at end of file From 19fa8179a466ae614145b8a9a82ddb49cd1622ab Mon Sep 17 00:00:00 2001 From: Simon Love Date: Tue, 19 Jul 2022 16:40:11 +0100 Subject: [PATCH 5/9] simons additions --- .vscode/settings.json | 3 +++ index.html | 53 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..6f3a291 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "liveServer.settings.port": 5501 +} \ No newline at end of file diff --git a/index.html b/index.html index 763b073..ca7cf96 100644 --- a/index.html +++ b/index.html @@ -1 +1,52 @@ - \ No newline at end of file + + + +Mac vs Windows + + +
    +

    Mac

    +
    Mac laptop 1
    +

    This is a Mac Laptop number 1

    +
    mac laptop 2
    +

    This is a Mac Laptop number 2

    +
    mac laptop 3
    +

    This is a Mac Laptop number 3

    +

    The Top 3 Most Popular Mac Laptops

    +
      +
    1. MacBook Air
      2. +
    2. MacBook Pro 16"
      3. +
    3. MacBook Pro 13"
      4. +
    +

    Mac Laptop Prices

    +
      +
    • £899
      • +
    • £1099
      • +
    • £1399
      • +
    + Click Here to look at Apple Laptops +
    +
    +

    Windows

    +
    windows laptop 1
    +

    This is a Windows Laptop number 1

    +
    windows laptop 2
    +

    This is a Windows Laptop number 2

    +
    windows laptop 3
    +

    This is a Windows Laptop number 3

    +

    The Top 3 Most Popular Windows Laptops

    +
      +
    1. Microsoft Surface Pro 8
      2. +
    2. ASUS E510 Laptop
      3. +
    3. Dell Inspiron 13 5310 Laptop
      4. +
    +

    Windows Laptop Prices

    +
      +
    • £799
      • +
    • £999
      • +
    • £1299
      • +
    + Click Here to look at Windows Laptops +
    + + \ No newline at end of file From cf8a347e5bc85f5ade3814e854e5274a0e404a19 Mon Sep 17 00:00:00 2001 From: David Clarke Date: Tue, 19 Jul 2022 16:44:16 +0100 Subject: [PATCH 6/9] added lists --- .vscode/settings.json | 3 +++ index.html | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..6f3a291 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "liveServer.settings.port": 5501 +} \ No newline at end of file diff --git a/index.html b/index.html index 916cb79..614c8b9 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,20 @@

    Mac

    This is a Mac Laptop number 2

    mac laptop 3

    This is a Mac Laptop number 3

    -
      +

      The Top 3 Most Popular Mac Laptops

      +
        +
      1. MacBook Air
        2. +
      2. MacBook Pro 16"
        3. +
      3. MacBook Pro 13"
        4. +
      +

      Mac Laptop Prices

      +
        +
      • £899
        • +
      • £1099
        • +
      • £1399
        • +
      + Click Here to look at Apple Laptops +

      Windows

      @@ -24,5 +37,24 @@

      Windows

      This is a Windows Laptop number 3

      + +

      The Top 3 Most Popular Windows Laptops

      +
        +
      1. Microsoft Surface Pro 8
        2. +
      2. ASUS E510 Laptop
        3. +
      3. Dell Inspiron 13 5310 Laptop
        4. +
      +

      Windows Laptop Prices

      +
        +
      • £799
        • +
      • £999
        • +
      • £1299
        • +
      +Click Here to look at Windows Laptops + + + + + \ No newline at end of file From 3a4aeab7e7eab6f66858cab05af90476cb866d95 Mon Sep 17 00:00:00 2001 From: Simon Love Date: Tue, 19 Jul 2022 16:50:52 +0100 Subject: [PATCH 7/9] simons changes --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index ca7cf96..272a835 100644 --- a/index.html +++ b/index.html @@ -46,7 +46,8 @@

      Windows Laptop Prices

    1. £999
    2. £1299
      3. - Click Here to look at Windows Laptops + Click Here to look at Windows Laptops7826347821365 + \ No newline at end of file From eeee67a5de83499ac33b431f9f1bbda10ac174fb Mon Sep 17 00:00:00 2001 From: Simon Love Date: Tue, 19 Jul 2022 17:05:52 +0100 Subject: [PATCH 8/9] complete --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 272a835..85999cd 100644 --- a/index.html +++ b/index.html @@ -46,7 +46,7 @@

      Windows Laptop Prices

    3. £999
    4. £1299
      5. - Click Here to look at Windows Laptops7826347821365 + Click Here to look at Windows Laptops From bf0fd40ba2de3872da78b4020af226d6e3a4dcc4 Mon Sep 17 00:00:00 2001 From: CDGADonc <107880611+CDGADonc@users.noreply.github.com> Date: Tue, 19 Jul 2022 20:09:12 +0100 Subject: [PATCH 9/9] Update index.html --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 614c8b9..25a3bc9 100644 --- a/index.html +++ b/index.html @@ -7,11 +7,11 @@

      Mac

      Mac laptop 1
      -

      This is a Mac Laptop number 1

      +

      This is a Mac portable computer number 1

      mac laptop 2
      -

      This is a Mac Laptop number 2

      +

      This is a Mac portable computer number 2

      mac laptop 3
      -

      This is a Mac Laptop number 3

      +

      This is a Mac portable computer number 3

      The Top 3 Most Popular Mac Laptops

      1. MacBook Air
        2. @@ -57,4 +57,4 @@

        Windows Laptop Prices

        - \ No newline at end of file +