From e519ca795c6ce3b1bda9f4f7e00bcaf09c335c3c Mon Sep 17 00:00:00 2001 From: NobleAxolotl Date: Sun, 26 Jan 2025 21:08:42 -0800 Subject: [PATCH 1/6] Update style.css --- style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/style.css b/style.css index b1a4e3b87..e5b7463ec 100644 --- a/style.css +++ b/style.css @@ -3,6 +3,6 @@ } .circle{ border-radius:50%; - width:300px; - height:300px; + width:500px; + height:500px; } From bbdfcbeb58f6653f74f43f1f2ab8d6633df22d3a Mon Sep 17 00:00:00 2001 From: Jason Su <156534672+NobleAxolotl@users.noreply.github.com> Date: Sun, 26 Jan 2025 21:30:18 -0800 Subject: [PATCH 2/6] Update style.css --- style.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/style.css b/style.css index e5b7463ec..9c595520e 100644 --- a/style.css +++ b/style.css @@ -1,6 +1,9 @@ .blue { background-color:blue } +.red { + background-color:blue +} .circle{ border-radius:50%; width:500px; From 6042addd15ec9fde9bd530fc4c8c6768e7f81373 Mon Sep 17 00:00:00 2001 From: Jason Su <156534672+NobleAxolotl@users.noreply.github.com> Date: Sun, 26 Jan 2025 21:53:42 -0800 Subject: [PATCH 3/6] Update style.css --- style.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/style.css b/style.css index 9c595520e..6d89530a6 100644 --- a/style.css +++ b/style.css @@ -1,9 +1,7 @@ .blue { background-color:blue } -.red { - background-color:blue -} + .circle{ border-radius:50%; width:500px; From c9a27f9f97842555bf63109eb99c396f7929cef4 Mon Sep 17 00:00:00 2001 From: NobleAxolotl Date: Sun, 26 Jan 2025 21:56:03 -0800 Subject: [PATCH 4/6] Update style.css --- style.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/style.css b/style.css index b1a4e3b87..0be086c8c 100644 --- a/style.css +++ b/style.css @@ -1,6 +1,9 @@ .blue { background-color:blue } +.red { + background-color:red +} .circle{ border-radius:50%; width:300px; From a20b233f49d2b3ff0c3f6bb28391c5d073eaa53a Mon Sep 17 00:00:00 2001 From: Jason Su <156534672+NobleAxolotl@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:05:58 -0800 Subject: [PATCH 5/6] Update style.css --- style.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/style.css b/style.css index a5cf2a650..e5b7463ec 100644 --- a/style.css +++ b/style.css @@ -1,13 +1,6 @@ .blue { background-color:blue } -<<<<<<< HEAD - -======= -.red { - background-color:red -} ->>>>>>> feature-add-color .circle{ border-radius:50%; width:500px; From f4220011dc8c3ad7c557b3e1d4a0f5140aac4551 Mon Sep 17 00:00:00 2001 From: NobleAxolotl Date: Sun, 26 Jan 2025 22:21:38 -0800 Subject: [PATCH 6/6] Update style.css --- style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/style.css b/style.css index e5b7463ec..aafd5f51a 100644 --- a/style.css +++ b/style.css @@ -1,6 +1,10 @@ .blue { background-color:blue } + +.red { + background-color:red +} .circle{ border-radius:50%; width:500px;