From 1946117dad43b9da5f5c844c626d9af7874dcd47 Mon Sep 17 00:00:00 2001 From: Stanley Yip Date: Wed, 2 Sep 2020 13:30:09 -0400 Subject: [PATCH 1/4] added style.css and linked from index.html --- index.html | 3 +++ style.css | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 style.css diff --git a/index.html b/index.html index 039cd5b..64464ad 100644 --- a/index.html +++ b/index.html @@ -1,9 +1,12 @@ + Studio 0 Hello, world! + + diff --git a/style.css b/style.css new file mode 100644 index 0000000..2712b1f --- /dev/null +++ b/style.css @@ -0,0 +1,3 @@ +body { + background-color: lightblue; +} From 79748245218bfff071fb8754e94f7eaa825c00a1 Mon Sep 17 00:00:00 2001 From: Stanley Yip Date: Wed, 2 Sep 2020 13:31:33 -0400 Subject: [PATCH 2/4] trying to make a merge conflict --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 64464ad..a6e08b8 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ Studio 0 - Hello, world! + Hello, world! (Except this time there is blue!!) From 869f0366e544352b11c91043e46d88e841d9377d Mon Sep 17 00:00:00 2001 From: Kate Nelson Date: Mon, 14 Sep 2020 20:50:04 -0400 Subject: [PATCH 3/4] testing out git commit with new changes: added bulleted list. --- index.html | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 039cd5b..6ae90ac 100644 --- a/index.html +++ b/index.html @@ -1,9 +1,13 @@ - - Studio 0 - - - Hello, world! - + + Studio 0 + + +

Hello, world!

+
    +
  • test one
    • +
  • test two
    • +
+ From 0670b212eb0d36b2b8d1a6b62fc701b81d309471 Mon Sep 17 00:00:00 2001 From: Kate Nelson Date: Mon, 14 Sep 2020 21:14:09 -0400 Subject: [PATCH 4/4] css changes --- index.html | 3 +++ style.css | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 6ae90ac..526bd78 100644 --- a/index.html +++ b/index.html @@ -1,9 +1,12 @@ + Studio 0 +
Hey there!
+

I’m Kate

Hello, world!

  • test one
    • diff --git a/style.css b/style.css index 2712b1f..1f7a41d 100644 --- a/style.css +++ b/style.css @@ -1,3 +1,14 @@ body { - background-color: lightblue; + background-color: lightblue; +} + +h1 { + color: white; + text-align: center; +} + +p { + color: green; + font-family: verdana; + font-size: 20px; }