From b13f8aa310f916b1f62a6266cfe16c8372078376 Mon Sep 17 00:00:00 2001 From: Hina Khadim Date: Thu, 25 Apr 2024 12:51:19 +0500 Subject: [PATCH] fix: rebase with quince/indigo (#18) --- paragon/_overrides.scss | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/paragon/_overrides.scss b/paragon/_overrides.scss index 6d587222..0eae6ea2 100644 --- a/paragon/_overrides.scss +++ b/paragon/_overrides.scss @@ -596,15 +596,7 @@ div[role=heading].h2 + .list-unstyled.m-0.mt-4.pt-2 { margin: 0 0 5px; } p { -<<<<<<< HEAD -<<<<<<< HEAD color: #515661; -======= - color: #6B7280; ->>>>>>> 08fb0ed (feat: style profile page and account page) -======= - color: #515661; ->>>>>>> df6eecd (feat:updates colors) margin: 0; font-size: 12px; line-height: 16px; @@ -780,15 +772,7 @@ div[role=heading].h2 + .list-unstyled.m-0.mt-4.pt-2 { p { .small.text-muted { font-size: 16px; -<<<<<<< HEAD -<<<<<<< HEAD color: #515661 !important; -======= - color: #6B7280 !important; ->>>>>>> 08fb0ed (feat: style profile page and account page) -======= - color: #515661 !important; ->>>>>>> df6eecd (feat:updates colors) line-height: 20px; } } @@ -928,15 +912,7 @@ div[role=heading].h2 + .list-unstyled.m-0.mt-4.pt-2 { .account-section { font-size: 14px; line-height: 20px; -<<<<<<< HEAD -<<<<<<< HEAD color: #515661; -======= - color: #6B7280; ->>>>>>> 08fb0ed (feat: style profile page and account page) -======= - color: #515661; ->>>>>>> df6eecd (feat:updates colors) p { margin: 0 0 15px; } @@ -1096,15 +1072,7 @@ div[role=heading].h2 + .list-unstyled.m-0.mt-4.pt-2 { p.text-truncate, p[data-hj-suppress="true"] { font-weight: 600; font-size: 16px; -<<<<<<< HEAD -<<<<<<< HEAD - color: #515661; -======= - color: #6B7280; ->>>>>>> 08fb0ed (feat: style profile page and account page) -======= color: #515661; ->>>>>>> df6eecd (feat:updates colors) margin: 5px 0 0 !important; button { font-weight: 600; @@ -1142,15 +1110,7 @@ div[role=heading].h2 + .list-unstyled.m-0.mt-4.pt-2 { p { .small.text-muted { font-size: 16px; -<<<<<<< HEAD -<<<<<<< HEAD - color: #515661 !important; -======= - color: #6B7280 !important; ->>>>>>> 08fb0ed (feat: style profile page and account page) -======= color: #515661 !important; ->>>>>>> df6eecd (feat:updates colors) line-height: 20px; } }