mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
Merge pull request #17560 from overleaf/rd-boostrap-files
[web] Update Sass folder structure GitOrigin-RevId: 03ac5835e46a3a464f31fba386e2f81f4bf25c99
This commit is contained in:
Rebeka Dekany
Copybot
parent
8dd5b2574e
commit
6d331ad7ed
18 changed files with 40 additions and 50 deletions
|
|
@ -0,0 +1,2 @@
|
|||
@import 'mixins';
|
||||
@import 'variable-overrides';
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
// Button
|
||||
|
||||
@mixin ol-button-size(
|
||||
$font-size,
|
||||
$line-height,
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
// Overrides for Bootstrap 5's default Sass variables
|
||||
|
||||
// Fonts
|
||||
$font-family-sans-serif: 'Noto Sans', sans-serif;
|
||||
$font-family-serif: 'Merriweather', serif;
|
||||
$font-family-monospace: 'DM Mono', monospace;
|
||||
$font-size-base: $default-font-size;
|
||||
$line-height-base: $default-line-height;
|
||||
|
||||
// Buttons
|
||||
$btn-font-family: $font-family-sans-serif;
|
||||
$btn-font-weight: 700;
|
||||
$btn-padding-x: $spacing-06;
|
||||
$btn-padding-y: $spacing-02;
|
||||
$btn-border-radius: $border-radius-full;
|
||||
$btn-border-radius-lg: $border-radius-full;
|
||||
$btn-border-radius-sm: $border-radius-full;
|
||||
|
||||
// Colors
|
||||
$primary: $bg-accent-01;
|
||||
$secondary: $bg-light-primary;
|
||||
|
|
@ -7,7 +7,8 @@
|
|||
// Bootstrap itself because Bootstrap uses them to create the CSS variables it
|
||||
// uses, and in calculations to determine, for example, what color text to use
|
||||
// on a button based on contrast.
|
||||
@import 'bootstrap-variable-overrides';
|
||||
@import 'abstracts/all';
|
||||
@import 'foundations/all';
|
||||
|
||||
// Include remainder of required Bootstrap stylesheets (including any separate color mode stylesheets)
|
||||
@import 'bootstrap-5/scss/variables';
|
||||
|
|
@ -31,3 +32,6 @@
|
|||
@import 'bootstrap-5/scss/modal';
|
||||
@import 'bootstrap-5/scss/utilities/api';
|
||||
@import 'bootstrap-5/scss/spinners';
|
||||
|
||||
// Components custom style
|
||||
@import 'components/all';
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
@import 'button';
|
||||
@import 'dropdown-menu';
|
||||
@import 'split-button';
|
||||
|
|
@ -1 +0,0 @@
|
|||
/* IEEE CSS variable overrides go in here */
|
||||
|
|
@ -1 +0,0 @@
|
|||
/* Light theme CSS variable overrides go in here */
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
@import 'border-radius';
|
||||
@import 'colors';
|
||||
@import 'elevation';
|
||||
@import 'spacing';
|
||||
@import 'typography';
|
||||
|
|
@ -1,7 +1,4 @@
|
|||
@import 'main-style';
|
||||
|
||||
// IEEE-specific theme overrides
|
||||
@import 'css-variables/themes/ieee';
|
||||
|
||||
// IEEE-specific rules
|
||||
$ieee-wedge: 30px;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
@import 'main-style';
|
||||
@import 'css-variables/themes/light';
|
||||
|
||||
$is-overleaf-light: true;
|
||||
|
|
|
|||
|
|
@ -27,15 +27,5 @@ $is-overleaf-light: false;
|
|||
// Bootstrap's Sass variable must use @import rather than @use because
|
||||
// Bootstrap relies on its variables, mixins etc. all being global.
|
||||
|
||||
// Include Bootstrap 5 itself, plus overrides of its Sass variable
|
||||
@import 'scss/bootstrap';
|
||||
|
||||
// Override and extend Bootstrap styles. This can include overriding CSS
|
||||
// variables in the usual CSS way, and can also refer to (but not override)
|
||||
// Bootstrap Sass variables.
|
||||
@import 'scss/bootstrap-rule-overrides';
|
||||
|
||||
// Components
|
||||
@import 'scss/components/button';
|
||||
@import 'scss/components/dropdown-menu';
|
||||
@import 'scss/components/split-button';
|
||||
// Include Bootstrap 5 itself, plus overrides and extend Bootstrap styles.
|
||||
@import 'bootstrap';
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
// This file is included after Bootstrap and is used to override non-default
|
||||
// Bootstrap variables and styles
|
||||
@import 'bootstrap-rule-overrides/buttons';
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
// This file is included before Bootstrap and is used to override Bootstrap
|
||||
// default variables and styles
|
||||
@import 'bootstrap-variable-overrides/fonts';
|
||||
@import 'bootstrap-variable-overrides/buttons';
|
||||
|
||||
// This isn't great but is necessary to persuade Bootstrap to render white text
|
||||
// on our green buttons
|
||||
$min-contrast-ratio: 3;
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
// This file provides overrides for Bootstrap 5's default button-related Sass variables
|
||||
|
||||
$btn-font-family: $font-family-sans-serif;
|
||||
$btn-font-weight: 700;
|
||||
$btn-padding-x: $spacing-06;
|
||||
$btn-padding-y: $spacing-02;
|
||||
$btn-border-radius: $border-radius-full;
|
||||
$btn-border-radius-lg: $border-radius-full;
|
||||
$btn-border-radius-sm: $border-radius-full;
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
// This file provides overrides for Bootstrap 5's default font-related Sass variables
|
||||
|
||||
$font-family-sans-serif: 'Noto Sans', sans-serif;
|
||||
$font-family-serif: 'Merriweather', serif;
|
||||
$font-family-monospace: 'DM Mono', monospace;
|
||||
$font-size-base: $default-font-size;
|
||||
$line-height-base: $default-line-height;
|
||||
|
||||
// Colors
|
||||
$primary: $bg-accent-01;
|
||||
$secondary: $bg-light-primary;
|
||||
Loading…
Reference in a new issue