Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMP] theme_*: adapt themes with new global roundness option #846

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions theme_anelusia/static/src/scss/bootstrap_overridden.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ $spacer: 1.25rem !default;
//
// Define common padding and border radius sizes and more.

$border-radius: 0 !default;
$border-radius-lg: 0 !default;
$border-radius-sm: 0 !default;

$box-shadow-sm: 0 0 .3125rem rgba(0,0,0,.25) !default;
$box-shadow: 0 0 .3125rem rgba(0,0,0,.25) !default;
$box-shadow-lg: 0 0 .3125rem rgba(0,0,0,.25) !default;
Expand Down
6 changes: 6 additions & 0 deletions theme_anelusia/static/src/scss/primary_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ $o-website-values-palettes: (
'font': 'Source Sans Pro',
'headings-font': 'Spartan',

// Roundness
'roundness': 'rounded-0',
'border-radius-sm': null,
'border-radius': null,
'border-radius-lg': null,

// Links
'link-underline': 'never',

Expand Down
4 changes: 1 addition & 3 deletions theme_aviato/static/src/scss/bootstrap_overridden.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ $spacer: 1.25rem !default;
//
// Define common padding and border radius sizes and more.

$border-radius: .375rem !default;
$border-radius-lg: .5rem !default;
$border-radius-sm: .25rem !default;
$border-radius-lg: o-website-value('border-radius-lg') or map-get(map-get($o-theme-border-radius, o-website-value('roundness')), border-radius-lg) !default;

// Buttons + Forms
//
Expand Down
4 changes: 1 addition & 3 deletions theme_bistro/static/src/scss/bootstrap_overridden.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ $spacer: 1.25rem !default;
//
// Define common padding and border radius sizes and more.

$border-radius: .375rem !default;
$border-radius-lg: .5rem !default;
$border-radius-sm: .25rem !default;
$border-radius-lg: o-website-value('border-radius-lg') or map-get(map-get($o-theme-border-radius, o-website-value('roundness')), border-radius-lg) !default;

// Typography
//
Expand Down
4 changes: 1 addition & 3 deletions theme_treehouse/static/src/scss/bootstrap_overridden.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ $spacer: 1.25rem !default;
//
// Define common padding and border radius sizes and more.

$border-radius: .375rem !default;
$border-radius-lg: .5rem !default;
$border-radius-sm: .25rem !default;
$border-radius-lg: o-website-value('border-radius-lg') or map-get(map-get($o-theme-border-radius, o-website-value('roundness')), border-radius-lg) !default;

// Typography
//
Expand Down
4 changes: 1 addition & 3 deletions theme_zap/static/src/scss/bootstrap_overridden.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ $spacer: 1.25rem !default;
//
// Define common padding and border radius sizes and more.

$border-radius: .125rem !default;
$border-radius-lg: .25rem !default;
$border-radius-sm: 0 !default;
$border-radius-lg: o-website-value('border-radius-lg') or map-get(map-get($o-theme-border-radius, o-website-value('roundness')), border-radius-lg) !default;

// Typography
//
Expand Down
1 change: 1 addition & 0 deletions theme_zap/static/src/scss/primary_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
$o-website-values-palettes: (
(
'color-palettes-name': 'zap-1',
'roundness': 'rounded-1',

// Header
'header-template': 'hamburger',
Expand Down