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

Jump to bottom

refactor(cxl-lumo-styles): update cxl-lumo-styles and storybook #300

Merged
merged 3 commits into from
Nov 23, 2023
Merged

refactor(cxl-lumo-styles): update cxl-lumo-styles and storybook #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a22bd56
refactor(cxl-lumo-styles): update cxl-lumo-styles and storybook
freudFlintstone Nov 2, 2023
839e821
fix(cxl-ui): set max three lines to cxl-light-card header
freudFlintstone Nov 22, 2023
f2451b5
chore: restore .gitignore to it's standard
freudFlintstone Nov 22, 2023
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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ packages/**/pkg
coverage
tmp
test/visual/screenshots
.idea
9 changes: 5 additions & 4 deletions packages/cxl-lumo-styles/scss/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ img {
ol,
ul {
padding-left: var(--lumo-space-l);
font-family: var(--cxl-lumo-font-secondary);
}

/**
Expand Down Expand Up @@ -268,18 +269,18 @@ ol.ordered-list-heavy {
/* stylelint-enable order/properties-order */

ul.courses-list {
padding-left: 0;
font-family: inherit;
list-style: none;
padding-left: 0;

cxl-card {
display: flex;
align-items: center;
padding: var(--lumo-space-m) var(--lumo-space-s);
margin: 0;
border: none;
border-radius: 0;
box-shadow: none;
display: flex;
margin: 0;
padding: var(--lumo-space-m) var(--lumo-space-s);

.entry-byline {
margin-bottom: 0;
Expand Down
10 changes: 10 additions & 0 deletions packages/cxl-lumo-styles/scss/themes/vaadin-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
:host([theme="x-large"]), :host(.cxl-homepage-button) {
--lumo-button-size: calc(var(--lumo-size-xl) * 1.25);
cursor: pointer;
padding: 1.25em 3.5em 1.25em 3em;
font-size: calc(var(--lumo-font-size-xxxl) / 2) !important;
}

:host(.wide) {
width: 100%;
}
81 changes: 75 additions & 6 deletions packages/cxl-lumo-styles/scss/typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/* stylelint-disable selector-no-qualifying-type */
@use "./icons";
@use "./mq";
@use "./mixins";

html {
/**
Expand All @@ -16,9 +18,22 @@ html {
* @ see https://cdn.vaadin.com/vaadin-lumo-styles/1.5.0/demo/typography.html#font-size
*/
--cxl-lumo-font-size-hero: var(--lumo-font-size-xxxl);
--cxl-lumo-font-size-xxl: calc(var(--lumo-font-size-xl) + var(--lumo-font-size-m));

/**
* Line height.
*
* @see https://cdn.vaadin.com/vaadin-lumo-styles/1.5.0/demo/typography.html#line-height
*/
--cxl-lumo-line-height-xl: 2;
--cxl-lumo-line-height-l: var(--lumo-line-height-m); // 1.625
--cxl-lumo-line-height-m: 1.5;
--cxl-lumo-line-height-s: var(--lumo-line-height-s); // 1.375
--cxl-lumo-line-height-xs: var(--lumo-line-height-xs); // 1.25
--cxl-lumo-line-height-xxs: 1.15;

@media #{mq.$small} {
--cxl-lumo-font-size-hero: 4rem;
--cxl-lumo-font-size-hero: 3.5rem;
}
}

Expand All @@ -34,11 +49,13 @@ h4,
h5,
h6 {
font-weight: 700;
line-height: var(--cxl-lumo-line-height-xs);
word-break: break-word;
}

h1 {
margin-top: 0;
margin-bottom: 0.75em;
font-size: var(--cxl-lumo-font-size-hero);
font-weight: 900;

Expand All @@ -49,15 +66,66 @@ h1 {
}

h2 {
@media #{mq.$small} {
font-size: var(--lumo-font-size-xxxl);
font-size: var(--cxl-lumo-font-size-xxl);
line-height: var(--cxl-lumo-line-height-xxs);

&.wp-block-heading {
&.separator {
&::after {
display: block;
width: 33%;
height: 3px;
margin: 1.5em auto 1.5em 0;
font-size: 16px;
content: "";
background: var(--lumo-primary-color);
}
}


&.separator-wide {
&::after {
width: 100%;
}
}

&.center {
text-align: center;
&::after {
margin: 1.5em auto;
}
}

&.right {
text-align: right;
&::after {
margin: 1.5em 0 1.5em auto;
}
}

&.separator-white {
&::after {
background: #fff;
}
}

&.separator-black {
&::after {
background: #000;
}
}

&.separator-gray {
&::after {
background: var(--lumo-contrast-20pct);
}
}
}
}

h3 {
@media #{mq.$small} {
font-size: var(--lumo-font-size-xxl);
}
font-size: var(--lumo-font-size-xl);
font-weight: 700;
}

h4 {
Expand All @@ -75,6 +143,7 @@ h6 {
}

p {
font-family: var(--cxl-lumo-font-secondary);
.entry-content & {
font-family: var(--cxl-lumo-font-secondary);
}
Expand Down
4 changes: 4 additions & 0 deletions packages/cxl-lumo-styles/src/themes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import cxlVaadinNotificationContainerStyles from './styles/themes/vaadin-notific
import cxlVaadinOverlayStyles from './styles/themes/vaadin-overlay-css.js';
import cxlVaadinTabStyles from './styles/themes/vaadin-tab-css.js';
import cxlVaadinTabsStyles from './styles/themes/vaadin-tabs-css.js';
import cxlVaadinButtonStyles from './styles/themes/vaadin-button-css.js';

/* Mixins, alphabetic order. */
registerStyles('cxl-accordion-card', cxlAccordionCardStyles, {
Expand Down Expand Up @@ -61,3 +62,6 @@ registerStyles('vaadin-tab', cxlVaadinTabStyles, {
registerStyles('vaadin-tabs', cxlVaadinTabsStyles, {
moduleId: 'cxl-vaadin-tabs-styles',
});
registerStyles('vaadin-button', cxlVaadinButtonStyles, {
moduleId: 'cxl-vaadin-button-styles',
})
4 changes: 2 additions & 2 deletions packages/cxl-ui/scss/cxl-base-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,12 @@ header {
}

.name {
@include mixins.ellipsis-for-lines(3);
@include mixins.ellipsis-for-lines(2);
font-family: var(--lumo-font-family);
font-size: var(--lumo-font-size-xl);
font-style: normal;
font-weight: 700;
line-height: var(--lumo-line-height-xs);
line-height: var(--cxl-lumo-line-height-xs);

a {
color: var(--lumo-body-text-color);
Expand Down
2 changes: 1 addition & 1 deletion packages/cxl-ui/scss/cxl-course-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ footer {
&::part(content) {
padding-bottom: 0;
font-size: var(--lumo-font-size-s);
line-height: var(--lumo-line-height-s);
line-height: var(--cxl-lumo-line-height-s);
}
}

Expand Down
1 change: 0 additions & 1 deletion packages/cxl-ui/scss/cxl-dashboard-notification.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
height: 12px;
font-size: 8px;
font-weight: 700;
line-height: normal;
color: var(--lumo-tint);
content: attr(count);
background-color: var(--lumo-primary-color);
Expand Down
4 changes: 4 additions & 0 deletions packages/cxl-ui/scss/cxl-light-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use './mixins';

:host {
min-width: 267px; // 3col widths on 1400px
max-width: 300px;
Expand All @@ -21,6 +23,7 @@
max-width: none;

.name {
@include mixins.ellipsis-for-lines(3);
font-size: var(--lumo-font-size-m);
font-weight: 600;
}
Expand All @@ -33,6 +36,7 @@
padding-top: var(--lumo-space-xs);
padding-bottom: 0;
gap: var(--lumo-space-xs);
align-items: start;
}

cxl-time {
Expand Down
2 changes: 1 addition & 1 deletion packages/cxl-ui/scss/cxl-like-or-dislike.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

span {
margin-left: var(--lumo-space-s);
line-height: var(--lumo-line-height-xs);
line-height: var(--cxl-lumo-line-height-xs);
}
}

Expand Down
31 changes: 13 additions & 18 deletions packages/cxl-ui/scss/cxl-section.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,6 @@
display: flow-root;
}

/**
* Wave design bottom.
*/
:host(.has-wave) {
position: relative;

.wrap {
z-index: 1;
}
}

#wave {
position: absolute;
bottom: 0;
display: block;
width: 100%;
}

/**
* Content readability.
*/
Expand All @@ -61,3 +43,16 @@
max-width: var(--cxl-content-max-width-wide);
}
}

:host(.has-gray-background-color) {
background-color: var(--cxl-color-light-gray);
}

:host(.has-black-background-color) {
color: var(--lumo-tint);
background-color: #000;

> * {
--lumo-header-text-color: var(--lumo-tint);
}
}
6 changes: 0 additions & 6 deletions packages/cxl-ui/scss/global/cxl-app-layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,6 @@ cxl-app-layout {
}
}

&[layout^="2c"] {
> .entry > .entry-header > .entry-title {
font-size: var(--lumo-font-size-xxxl);
}
}

&[layout^="2c"][wide] {
iframe {
height: $iframe-height * 2;
Expand Down
4 changes: 0 additions & 4 deletions packages/cxl-ui/scss/global/cxl-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
cxl-card {
p {
font-family: inherit;
}

.entry-header {
.thumbnail {
margin: 0 auto;
Expand Down
4 changes: 0 additions & 4 deletions packages/cxl-ui/scss/global/cxl-course-dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@ vaadin-dialog-overlay[theme="cxl-course-dialog"] {
max-width: 75%;
padding-bottom: var(--lumo-space-l);
margin: 0 auto;

p {
font-family: var(--cxl-lumo-font-secondary);
}
}

.content-tags {
Expand Down
1 change: 0 additions & 1 deletion packages/cxl-ui/scss/global/cxl-playbook-accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ cxl-playbook-accordion {
.entry-title {
margin-top: 0.5em; /* match h3 */
margin-right: var(--lumo-space-m);
font-size: var(--lumo-font-size-m);
}

> vaadin-checkbox {
Expand Down
16 changes: 2 additions & 14 deletions packages/cxl-ui/scss/global/cxl-vaadin-accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ cxl-vaadin-accordion {
--vaadin-icon-width: var(--vaadin-icon-height);
}

p {
font-family: inherit;
}

.entry {
//mixin affects: .entry-header > label
@include mixins.label-contrast("> .entry-header") {
Expand Down Expand Up @@ -47,7 +43,7 @@ cxl-vaadin-accordion {

.entry-title {
flex: 1;
height: calc(var(--lumo-line-height-xs) * 4em);
height: calc(var(--cxl-lumo-line-height-xs) * 4em);
font-size: var(--lumo-font-size-xl);
word-break: break-word;
}
Expand Down Expand Up @@ -100,10 +96,6 @@ cxl-vaadin-accordion {
* Theme "cxl-minidegree-course".
*/
&[theme~="cxl-minidegree-course"] {
p {
font-family: inherit;
}

.entry-header {
display: grid;
grid-column-gap: var(--lumo-space-m);
Expand Down Expand Up @@ -160,10 +152,6 @@ cxl-vaadin-accordion {
--vaadin-icon-width: var(--vaadin-icon-height);
}

p {
font-family: inherit;
}

.entry {
@include mixins.label-contrast("> .entry-header") {
flex-basis: 100%;
Expand Down Expand Up @@ -220,7 +208,7 @@ cxl-vaadin-accordion {
flex: 1;
flex-basis: auto;
/* stylelint-disable-next-line declaration-no-important */
height: calc(var(--lumo-line-height-xs) * 3em) !important;
height: calc(var(--cxl-lumo-line-height-xs) * 3em) !important;
margin-top: 0;
margin-bottom: 0;
overflow: hidden;
Expand Down
2 changes: 1 addition & 1 deletion packages/cxl-ui/scss/jw-player/chapter.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
padding: var(--lumo-space-s) 0;
margin-bottom: var(--lumo-space-s);
font-size: var(--lumo-font-size-s);
line-height: var(--lumo-line-height-xs);
line-height: var(--cxl-lumo-line-height-xs);
cursor: pointer;
}

Expand Down
Loading
Loading