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.

Sign up for GitHub

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

fix: revert changes to components not being upgraded #1963

Merged
merged 4 commits into from
Feb 12, 2025
Merged

fix: revert changes to components not being upgraded #1963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24aef73
fix: revert o-typography changes
frshwtr Feb 11, 2025
48615dd
fix: revert o-visual-effects changes
frshwtr Feb 11, 2025
c0bde8b
fix: revert o-colors changes
frshwtr Feb 11, 2025
32fa6bc
fix: revert o-icons changes
frshwtr Feb 11, 2025
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
2 changes: 1 addition & 1 deletion components/o-colors/demos/src/color-mixer/color-mixer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ body {
}
}

input[type='radio'] {
input[type=radio] { // stylelint-disable-line selector-no-qualifying-type
appearance: none;
border: 1px solid var(--color);
display: inline-block;
Expand Down
26 changes: 13 additions & 13 deletions components/o-colors/demos/src/contrast-checker/contrast-checker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
@include oButtons();
@import '@financial-times/o-overlay/main';
@include oOverlay();

@mixin swatchStyle() {
appearance: none;
border: 1px solid lightgrey;
Expand All @@ -25,6 +24,7 @@
}

@if not oBrandIs(whitelabel) {

:root {
--background: white;
--foreground: black;
Expand Down Expand Up @@ -78,24 +78,24 @@
grid-area: 1 / 4 / span 3;
width: 320px;

.o-tabs--buttontabs[data-o-tabs--js][role='tablist'] {
.o-tabs--buttontabs[data-o-tabs--js][role="tablist"] {
border-color: black;

[role='tab'] {
[role=tab] {
color: black;
border-color: black;
background-color: oColorsByName('white');
}

[role='tab'][aria-selected='true'] {
[role=tab][aria-selected=true] {
background-color: oColorsByName('black-10');

a {
font-weight: 600;
}
}

[role='tab'][aria-selected='false'] a {
[role=tab][aria-selected=false] a {
font-weight: 400;
}
}
Expand All @@ -110,11 +110,12 @@
}
}

input[type='radio'] {
input[type=radio] { // stylelint-disable-line selector-no-qualifying-type
@include swatchStyle();

// stylelint-disable-next-line selector-no-qualifying-type
&.o-overlay-trigger,
&.trigger-input {
&.trigger-input { // stylelint-disable-line selector-no-qualifying-type
background-image: url('https://www.ft.com/__origami/service/image/v2/images/raw/fticon-v1%3Aplus?source=o-colors&width=24&height=24&tint=gray');
}
}
Expand All @@ -128,8 +129,7 @@
right: 20px;
}

// stylelint-disable selector-max-id
#add-mix {
#add-mix { //stylelint-disable-line selector-max-id
background-image: none;
font-size: inherit;
float: none;
Expand All @@ -141,10 +141,10 @@
padding: 0;
}

input[type='radio'] {
input[type=radio] { // stylelint-disable-line selector-no-qualifying-type
@include swatchStyle();

&[name='range'] {
&[name=range] { // stylelint-disable-line selector-no-qualifying-type
height: 48px;
width: 22px;
}
Expand All @@ -161,7 +161,7 @@
}

.contrast-info {
grid-area: 1 / 2 / auto / span 2;
grid-area: 1 / 2 / auto / span 2 ;
padding: 12px;
margin-top: 28px;
width: 320px;
Expand Down Expand Up @@ -189,7 +189,6 @@
}

.rating-result {

&--aaa,
&--aa {
color: oColorsMix('jade', 'black', 70);
Expand Down Expand Up @@ -228,4 +227,5 @@
color: inherit;
}
}

}
2 changes: 1 addition & 1 deletion components/o-colors/demos/src/demo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@include oColors();
@import '@financial-times/o-fonts/main';
@include oFonts();
@import "@financial-times/o-normalise/main";
@import '@financial-times/o-normalise/main';
@include oNormalise();


Expand Down
1 change: 0 additions & 1 deletion components/o-icons/stories/icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import '@financial-times/o-fonts/main';
@import '@financial-times/o-normalise/main';

@include oFonts();
@include oNormalise();

Expand Down
87 changes: 43 additions & 44 deletions components/o-typography/demos/src/demo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,66 +9,65 @@


body {
background-color: oColorsByUsecase('page', 'background');
overflow-y: scroll;
background-color: oColorsByUsecase('page', 'background');
overflow-y: scroll;
}

.demo {
// prevent images and media from expanding its container
img {
max-width: 100%;
height: auto;
display: block;
}

figure {
margin: 0 0 28px;
}
// prevent images and media from expanding its container
img {
max-width: 100%;
height: auto;
display: block;
}
figure {
margin: 0 0 28px;
}
}

.demo-inverse body {
background-color: oColorsByUsecase('page-inverse', 'background');
background-color: oColorsByUsecase('page-inverse', 'background');
}

.type-scale {
white-space: nowrap;
overflow: hidden;
white-space: nowrap;
overflow: hidden;

.type-scale__label {
@include oTypographySans(1);
color: oColorsByName('black-60');
display: inline-block;
min-width: 1ch;
padding: 0 1em;
}
.type-scale__label {
@include oTypographySans(1);
color: oColorsByName('black-60');
display: inline-block;
min-width: 1ch;
padding: 0 1em;
}

.type-scale__example {
white-space: nowrap;
overflow: hidden;
}
.type-scale__example {
white-space: nowrap;
overflow: hidden;
}

@each $scale, $values in $_o-typography-font-scale {
.type-scale__example-#{$scale} {
@include oTypographyDisplay($scale);
}
}
@each $scale, $values in $_o-typography-font-scale {
.type-scale__example-#{$scale} {
@include oTypographyDisplay($scale);
}
}
}

.line-width-demo {
display: flex;
display: flex;

.line-width-demo__selection {
min-width: 100px;
margin: 20px;
}
.line-width-demo__selection {
min-width: 100px;
margin: 20px;
}

.line-width-demo__scale {
max-width: oTypographyMaxLineWidth();
}
.line-width-demo__scale {
max-width: oTypographyMaxLineWidth();
}

@each $scale, $values in $_o-typography-font-scale {
.line-width-demo__scale--#{$scale} {
@include oTypographySans($scale);
}
}
@each $scale, $values in $_o-typography-font-scale {
.line-width-demo__scale--#{$scale} {
@include oTypographySans($scale);
}
}
}
Loading
Loading