Skip to content
This repository was archived by the owner on Feb 27, 2024. It is now read-only.

Commit 5ec71ec

Browse files
author
Greg Rickaby
authored
Merge pull request #179 from WebDevStudios/feature/core-styling
Feature/core styling
2 parents 182850d + 30afc28 commit 5ec71ec

File tree

30 files changed

+299
-258
lines changed

30 files changed

+299
-258
lines changed

components/atoms/Breadcrumbs/Breadcrumbs.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Link from 'next/link'
22
import PropTypes from 'prop-types'
33
import styles from './Breadcrumbs.module.css'
4+
import cn from 'classnames'
45

56
/**
67
* Render the Breadcrumbs component.
@@ -14,7 +15,7 @@ export default function Breadcrumbs({breadcrumbs}) {
1415
return (
1516
<>
1617
{!!breadcrumbs?.length && (
17-
<ul className={styles.breadcrumbs}>
18+
<ul className={cn(styles.breadcrumbs, 'breadcrumbs')}>
1819
{breadcrumbs.map((breadcrumb, index) => (
1920
<li key={index}>
2021
<Link href={breadcrumb?.url}>

components/atoms/Breadcrumbs/Breadcrumbs.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ul.breadcrumbs {
22
@apply mb-8 flex;
33

44
& li {
5-
@apply text-sm font-semibold;
5+
@apply uppercase text-xs font-semibold p-0;
66

77
& .sep {
88
@apply px-2 opacity-50 font-normal;

components/atoms/Button/Button.module.css

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.button {
2-
@apply inline-flex items-center justify-center rounded border transition-colors duration-150 ease-in-out cursor-pointer uppercase;
2+
@apply inline-flex items-center justify-center rounded border cursor-pointer font-semibold mr-2 mb-2;
33

44
& svg {
5-
@apply ml-12;
5+
@apply ml-4;
66
}
77

88
&.iconLeft {
@@ -16,26 +16,20 @@
1616
&:hover,
1717
&:focus,
1818
&:active:not([disabled]) {
19-
@apply no-underline;
19+
@apply underline;
2020
}
2121

2222
/* SIZES */
2323
&.lg {
24-
@apply px-6 py-3;
25-
26-
line-height: 1.5625rem;
24+
@apply px-4 py-3 text-lg;
2725
}
2826

2927
&.md {
30-
@apply px-3 py-1.5;
31-
32-
line-height: 1.25rem;
28+
@apply px-3 py-2;
3329
}
3430

3531
&.sm {
3632
@apply px-1.5 py-0.5;
37-
38-
line-height: 1.0625rem;
3933
}
4034

4135
&.fluid {

components/atoms/Code/Code.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.code {
2-
@apply mb-40;
2+
@apply mb-8;
33

44
& > pre {
55
@apply rounded;

components/atoms/Columns/Columns.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.columns {
2-
@apply grid gap-16 grid-cols-3;
2+
@apply grid gap-8 grid-cols-3;
33

44
&.columns-1 {
55
@apply grid-cols-1;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
.image {
2-
@apply mb-20;
2+
@apply mb-8;
33

44
& img {
55
@apply block rounded;
66
}
77

88
& .caption {
9-
@apply text-center pt-12;
9+
@apply text-center text-xs pt-4;
1010
}
1111
}

components/atoms/Quote/Quote.module.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
.quote {
2-
@apply mb-6 p-5 px-10 border-l;
2+
@apply mb-8 p-6 px-10 border-l;
33

44
& blockquote {
55
@apply mb-8;
6+
7+
& p {
8+
@apply text-xl mb-0;
9+
}
610
}
711

812
& figcaption {

components/atoms/RichText/RichText.module.css

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,28 @@
33
@apply text-center;
44
}
55

6-
/* Paragraph, List Styles */
7-
& ul,
6+
/* List Styles */
87
&.ul,
9-
& ol,
10-
&.ol,
11-
& p,
12-
&.p {
13-
@apply mb-8;
14-
}
15-
16-
& ul,
17-
&.ul,
18-
& ol,
198
&.ol {
9+
@apply mb-4;
10+
2011
& li {
21-
@apply mb-4 relative pl-24 list-none;
12+
@apply mb-2 relative pl-6 list-none;
2213
}
2314

2415
& ul,
2516
& ol {
26-
@apply ml-16 mb-0;
17+
@apply ml-6 mb-0;
2718
}
2819
}
2920

3021
/* Unordered Lists */
31-
& ul,
3222
&.ul {
33-
& li {
23+
& > li {
3424
&::before {
3525
@apply absolute block rounded-full;
3626

27+
background: #000;
3728
content: '';
3829
width: 5px;
3930
height: 5px;
@@ -44,7 +35,6 @@
4435
}
4536

4637
/* Ordered Lists */
47-
& ol,
4838
&.ol {
4939
counter-reset: item;
5040

@@ -58,30 +48,4 @@
5848
}
5949
}
6050
}
61-
62-
/* Heading Styles */
63-
& h1,
64-
&.h1 {
65-
@apply mb-10;
66-
}
67-
68-
& h2,
69-
&.h2 {
70-
@apply mb-10;
71-
}
72-
73-
& h3,
74-
&.h3 {
75-
@apply mb-10;
76-
}
77-
78-
& h4,
79-
&.h4 {
80-
@apply mb-10;
81-
}
82-
83-
& h5,
84-
&.h5 {
85-
@apply mb-10;
86-
}
8751
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.separator {
2-
@apply w-full border-b my-40;
2+
@apply w-full border-b my-8;
33
}

components/atoms/Spacer/Spacer.module.css

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)