From 178af31cb8624567a26a1ca06cba9f3a475be330 Mon Sep 17 00:00:00 2001 From: Wicklow Date: Fri, 17 Feb 2023 10:40:37 +0100 Subject: Change bootstrap helpers and variables --- client/src/sass/class-helpers/_common.scss | 4 +-- .../class-helpers/_custom-bootstrap-helpers.scss | 30 +--------------------- client/src/sass/class-helpers/index.scss | 11 +++----- client/src/sass/include/_bootstrap-variables.scss | 4 +-- client/src/sass/include/_variables.scss | 3 +++ 5 files changed, 11 insertions(+), 41 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/class-helpers/_common.scss b/client/src/sass/class-helpers/_common.scss index 182c51c8f..d342c2ceb 100644 --- a/client/src/sass/class-helpers/_common.scss +++ b/client/src/sass/class-helpers/_common.scss @@ -1,7 +1,7 @@ -@use '_variables' as *; -@use '_mixins' as *; @use '_badges' as *; @use '_icons' as *; +@use '_mixins' as *; +@use '_variables' as *; .link-orange { color: pvar(--mainForegroundColor); diff --git a/client/src/sass/class-helpers/_custom-bootstrap-helpers.scss b/client/src/sass/class-helpers/_custom-bootstrap-helpers.scss index 78c4d30df..d5606181d 100644 --- a/client/src/sass/class-helpers/_custom-bootstrap-helpers.scss +++ b/client/src/sass/class-helpers/_custom-bootstrap-helpers.scss @@ -3,34 +3,6 @@ // Font sizes -.pt-fs-1 { - @include font-size(2.5rem); -} - -.pt-fs-2 { - @include font-size(2rem); -} - -.pt-fs-3 { - @include font-size(1.75rem); -} - -.pt-fs-4 { - @include font-size(1.5rem); -} - -.pt-fs-5 { - @include font-size(1.25rem); -} - -.pt-fs-5-5 { +.fs-5-5 { @include font-size(1.125rem); -} - -.pt-fs-6 { - @include font-size(1rem); -} - -.pt-fs-7 { - @include font-size(0.875rem); } \ No newline at end of file diff --git a/client/src/sass/class-helpers/index.scss b/client/src/sass/class-helpers/index.scss index ad5fd7838..ec0aea52e 100644 --- a/client/src/sass/class-helpers/index.scss +++ b/client/src/sass/class-helpers/index.scss @@ -1,10 +1,5 @@ -@use '_variables' as *; -@use '_mixins' as *; -@use '_badges' as *; -@use '_icons' as *; -@use '_fonts' as *; -@use '_menu' as *; @use '_buttons' as *; -@use '_forms' as *; @use '_common' as *; -@use '_custom-bootstrap-helpers' as *; \ No newline at end of file +@use '_custom-bootstrap-helpers' as *; +@use '_forms' as *; +@use '_menu' as *; \ No newline at end of file diff --git a/client/src/sass/include/_bootstrap-variables.scss b/client/src/sass/include/_bootstrap-variables.scss index 1c05f467a..558610893 100644 --- a/client/src/sass/include/_bootstrap-variables.scss +++ b/client/src/sass/include/_bootstrap-variables.scss @@ -8,9 +8,9 @@ $grid-breakpoints: ( // Extra small screen / phone xs: 0, // Small screen / phone - sm: 576px, + sm: $mobile-view, // Medium screen / tablet - md: 768px, + md: $small-view, // Large screen / desktop lg: 900px, // Extra large screens / wide desktops diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 8358270da..1243854ec 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss @@ -10,6 +10,9 @@ $font-semibold: 600; $font-bold: 700; $line-height-normal: 1.2; +$font-size-rem-13px: 0.8125rem; +$font-size-rem-14px: 0.875rem; + $grey-background-color: #E5E5E5; $grey-background-hover-color: #EFEFEF; $grey-foreground-color: #585858; -- cgit v1.2.3