From feacdd70dcc2beffd31235a85f4c0d74afe9e65b Mon Sep 17 00:00:00 2001 From: Tim Down <158919+timdown@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:02:01 +0000 Subject: [PATCH] Merge pull request #17205 from overleaf/td-color-not-colour Bootstrap 5: change spelling of colour to color GitOrigin-RevId: 3edd3537532877e50646bd5d5514cb2d6ec1bd64 --- .../foundations/{colours.scss => colors.scss} | 18 +++++++++--------- .../stylesheets/bootstrap-5/main-style.scss | 2 +- .../bootstrap-variable-overrides/fonts.scss | 2 +- .../bootstrap-5/scss/bootstrap.scss | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) rename services/web/frontend/stylesheets/bootstrap-5/foundations/{colours.scss => colors.scss} (96%) diff --git a/services/web/frontend/stylesheets/bootstrap-5/foundations/colours.scss b/services/web/frontend/stylesheets/bootstrap-5/foundations/colors.scss similarity index 96% rename from services/web/frontend/stylesheets/bootstrap-5/foundations/colours.scss rename to services/web/frontend/stylesheets/bootstrap-5/foundations/colors.scss index 9ea164d6f3..35ef688b52 100644 --- a/services/web/frontend/stylesheets/bootstrap-5/foundations/colours.scss +++ b/services/web/frontend/stylesheets/bootstrap-5/foundations/colors.scss @@ -1,7 +1,7 @@ -// This file provides CSS and Sass variables for colours as both RGB triples, -// which can be combined with an alpha value, and actual colour values. +// This file provides CSS and Sass variables for colors as both RGB triples, +// which can be combined with an alpha value, and actual color values. -// Note that colours used by Bootstrap's Sass are used in calculations and +// Note that colors used by Bootstrap's Sass are used in calculations and // therefore cannot contain CSS variables /* ====== RGB triples, for use with alpha values ====== */ @@ -54,7 +54,7 @@ $yellow-50-rgb: 143 85 20; $yellow-60-rgb: 122 67 4; $yellow-70-rgb: 99 58 11; -/* ====== Full RGB colour values ====== */ +/* ====== Full RGB color values ====== */ /* Neutral */ $white: rgb($white-rgb); @@ -104,7 +104,7 @@ $yellow-50: rgb($yellow-50-rgb); $yellow-60: rgb($yellow-60-rgb); $yellow-70: rgb($yellow-70-rgb); -/* ====== RGB triples for semantic colour variables, for use with alpha values ====== */ +/* ====== RGB triples for semantic color variables, for use with alpha values ====== */ $bg-light-primary-rgb: $white-rgb; $bg-light-secondary-rgb: $neutral-10-rgb; $bg-light-tertiary-rgb: $neutral-20-rgb; @@ -175,7 +175,7 @@ $link-ui-dark-rgb: $blue-30-rgb; $link-ui-hover-dark-rgb: $blue-40-rgb; $link-ui-visited-dark-rgb: $blue-40-rgb; -/* ====== Full RGB colour values for semantic colour variables ====== */ +/* ====== Full RGB color values for semantic color variables ====== */ $bg-light-primary: rgb($bg-light-primary-rgb); $bg-light-secondary: rgb($bg-light-secondary-rgb); $bg-light-tertiary: rgb($bg-light-tertiary-rgb); @@ -297,7 +297,7 @@ $link-ui-visited-dark: rgb($link-ui-visited-dark-rgb); --yellow-60-rgb: #{$yellow-60-rgb}; --yellow-70-rgb: #{$yellow-70-rgb}; - /* ====== Full RGB colour values ====== */ + /* ====== Full RGB color values ====== */ /* Neutral */ --white: rgb(var(--white-rgb)); @@ -347,7 +347,7 @@ $link-ui-visited-dark: rgb($link-ui-visited-dark-rgb); --yellow-60: rgb(var(--yellow-60-rgb)); --yellow-70: rgb(var(--yellow-70-rgb)); - /* ====== RGB triples for semantic colour variables, for use with alpha values ====== */ + /* ====== RGB triples for semantic color variables, for use with alpha values ====== */ --bg-light-primary-rgb: var(--white-rgb); --bg-light-secondary-rgb: var(--neutral-10-rgb); --bg-light-tertiary-rgb: var(--neutral-20-rgb); @@ -419,7 +419,7 @@ $link-ui-visited-dark: rgb($link-ui-visited-dark-rgb); --link-ui-visited-dark-rgb: var(--blue-40-rgb); - /* ====== Full RGB colour values for semantic colour variables ====== */ + /* ====== Full RGB color values for semantic color variables ====== */ --bg-light-primary: rgb(var(--bg-light-primary-rgb)); --bg-light-secondary: rgb(var(--bg-light-secondary-rgb)); --bg-light-tertiary: rgb(var(--bg-light-tertiary-rgb)); diff --git a/services/web/frontend/stylesheets/bootstrap-5/main-style.scss b/services/web/frontend/stylesheets/bootstrap-5/main-style.scss index cee84391c1..d718832896 100644 --- a/services/web/frontend/stylesheets/bootstrap-5/main-style.scss +++ b/services/web/frontend/stylesheets/bootstrap-5/main-style.scss @@ -15,7 +15,7 @@ $is-overleaf-light: false; @import '../vendor/select/select.css'; // Sass and CSS variables from Overleaf foundations -@import 'foundations/colours'; +@import 'foundations/colors'; @import 'foundations/spacing'; @import 'foundations/typography'; @import 'foundations/border-radius'; diff --git a/services/web/frontend/stylesheets/bootstrap-5/scss/bootstrap-variable-overrides/fonts.scss b/services/web/frontend/stylesheets/bootstrap-5/scss/bootstrap-variable-overrides/fonts.scss index 5bd443436b..aa63595afd 100644 --- a/services/web/frontend/stylesheets/bootstrap-5/scss/bootstrap-variable-overrides/fonts.scss +++ b/services/web/frontend/stylesheets/bootstrap-5/scss/bootstrap-variable-overrides/fonts.scss @@ -6,6 +6,6 @@ $font-family-monospace: 'DM Mono', monospace; $font-size-base: $default-font-size; $line-height-base: $default-line-height; -// Colours +// Colors $primary: $bg-accent-01; $secondary: $bg-light-primary; diff --git a/services/web/frontend/stylesheets/bootstrap-5/scss/bootstrap.scss b/services/web/frontend/stylesheets/bootstrap-5/scss/bootstrap.scss index c5bfe02c4f..8fb3fb3cce 100644 --- a/services/web/frontend/stylesheets/bootstrap-5/scss/bootstrap.scss +++ b/services/web/frontend/stylesheets/bootstrap-5/scss/bootstrap.scss @@ -5,7 +5,7 @@ // Overrides for Bootstrap 5 Sass variables. These have to be included before // Bootstrap itself because Bootstrap uses them to create the CSS variables it -// uses, and in calculations to determine, for example, what colour text to use +// uses, and in calculations to determine, for example, what color text to use // on a button based on contrast. @import 'bootstrap-variable-overrides';