From 896d5ebe2a150db0d06057ea996c4349593caa38 Mon Sep 17 00:00:00 2001 From: hinakhadim Date: Thu, 25 Apr 2024 12:47:17 +0500 Subject: [PATCH] fix: rebase with quince/indigo --- paragon/_overrides.scss | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/paragon/_overrides.scss b/paragon/_overrides.scss index 89f42bb1..3eb6b54b 100644 --- a/paragon/_overrides.scss +++ b/paragon/_overrides.scss @@ -2318,15 +2318,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; @@ -2502,15 +2494,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; } } @@ -2650,15 +2634,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; } @@ -2818,15 +2794,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; @@ -2864,15 +2832,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; } }