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

[WIP] Styles #425

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .storybook/config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '../.storybook/styles/application.scss'
import '../.storybook/styles/storybook.scss'

import { configure, addDecorator } from '@storybook/react'
import { withA11y } from '@storybook/addon-a11y'
Expand Down
69 changes: 0 additions & 69 deletions .storybook/styles/application.scss

This file was deleted.

111 changes: 54 additions & 57 deletions .storybook/styles/base/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
html{
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
font-size: 87.5%;
}

body {
background-color: $grey-lighter;
@include font-type($primary-sans-serif, normal, normal);
font: 100%/1.618;
overflow-x: hidden;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
Expand All @@ -21,64 +20,77 @@ h2,
h3,
h4,
h5,
h6
{
h6 {
color: $black-base;
@include font-type($primary-sans-serif, normal, $regular);
@include rem(margin-bottom, 12px);
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
letter-spacing: 1.75;
line-height: 1.1;

a{
@include transition(all 0.3s ease-in-out);
@include font-type($primary-sans-serif, normal, $regular);

&:hover{
text-decoration: underline;
}
}
}

h1 {
font-size: $s-bigger;
@include media($tablet) {
font-size: $s-large;
h1 {
@include rem(font-size, 28px);
font-weight: $light;

@include grid-media($tablet-landscape){
@include rem(font-size, 31px);
}
}

h2 {
font-size: $s-medium;
@include media($tablet-landscape) {
font-size: $s-bigger;
font-weight: 500;

h2 {
@include rem(font-size, 25px);
font-weight: $light;
@include rem(margin-bottom, 30px);

@include grid-media($tablet-landscape){
@include rem(font-size, 27px);
}
}

h3 {
font-size: $s-base;
@include media($tablet) {
font-size: $s-big;
@include rem(margin-bottom, 20px);
}
@include font-size-jumbo;
font-weight: $semibold;
}

h4 { font-size: $s-bigger; }
h5 { font-size: $s-big; }
h6 { font-size: $s-big; }

h4 {
@include font-size-display;
font-weight: $semibold;
}

h5 {
@include font-size-subheader;
font-weight: $semibold;
}

h6 {
@include font-size-minor;
font-weight: $semibold;
text-transform: uppercase;
font-weight: $bold;
}

p {
font-size: $s-small;
//@include rem(margin-bottom, 12px);
line-height: 22px;
color: $black-base;
@include media($tablet) {
font-size: $s-base;
}

h3, h4, h5, h6{
@include rem(margin, 30px 0px);
}

p{
color: $black-base;
font-weight: normal;
font-style: normal;
@include font-type($primary-sans-serif, normal, $regular);
@include font-size-mbody;
@include rem(margin-bottom, 12px);
line-height: $base-line-loose;
@include rem(margin-bottom, 30px);

&:last-child { @include rem(margin-bottom, 0); }
}
Expand All @@ -87,42 +99,27 @@ li,
dd{
color: $black-base;
@include font-type($primary-sans-serif, normal, normal);
@include font-size-mbody;
line-height: $base-line-height;
list-style: none;
}

a {
color: $black-base;
cursor: pointer;
@include transition(all 0.3s ease-in-out);
text-decoration: none;
border-bottom: 2px solid $blue-light;
font-size: $s-small;
@include font-size-mbody;
@include font-type($primary-sans-serif, normal, normal);
text-decoration: underline;
transition: all .5s ease-in-out;

&:hover, &:focus {
border-bottom: 2px solid $blue-base;
color: $black-dark;
}

&:active,
&:focus {
outline: none;
}
}

.edit-link {
display: inline-block;
cursor: pointer;
border-bottom: 2px solid $blue-light;
}

strong, b { font-weight: $bold; }
i, em { font-style: italic; }


b, i {
color: $black-base;
}

b, i {
font-size: $s-base;
u{
text-decoration: underline;
}
24 changes: 0 additions & 24 deletions .storybook/styles/components/_activity.scss

This file was deleted.

115 changes: 0 additions & 115 deletions .storybook/styles/components/_blade.scss

This file was deleted.

Loading