Skip to content
This repository was archived by the owner on May 17, 2023. It is now read-only.

Commit c80a8df

Browse files
authored
Merge resets into globals (#572)
Fixes #570 Super tiny side effect, the loader inside button has become smaller: https://www.chromaticqa.com/snapshot?appId=5aba7f6a07f95800202658ff&id=5b0f9717129fa30024fb6f22 Can tackle that separately
1 parent 01b7d5b commit c80a8df

File tree

5 files changed

+61
-66
lines changed

5 files changed

+61
-66
lines changed

changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## 0.2.3 [May 31, 2018]
9+
10+
### Fixed
11+
12+
* Fixes problem where fonts are not loading [#571]
813

914
## 0.2.2 [May 29, 2018]
1015

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cosmos",
3-
"version": "0.2.2",
3+
"version": "0.2.3",
44
"engine": "^7.0.0",
55
"private": true,
66
"workspaces": [

src/components/_helpers/globals.js

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,61 @@
11
import { injectGlobal } from 'styled-components'
2-
32
import { fonts, misc } from '@auth0/cosmos-tokens'
43

54
injectGlobal`
5+
html, body, div, span, applet, object, iframe,
6+
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
7+
a, abbr, acronym, address, big, cite, code,
8+
del, dfn, em, img, ins, kbd, q, s, samp,
9+
small, strike, strong, sub, sup, tt, var,
10+
b, u, i, center,
11+
dl, dt, dd, ol, ul, li,
12+
fieldset, form, label, legend,
13+
table, caption, tbody, tfoot, thead, tr, th, td,
14+
article, aside, canvas, details, embed,
15+
figure, figcaption, footer, header, hgroup,
16+
menu, nav, output, ruby, section, summary,
17+
time, mark, audio, video {
18+
margin: 0;
19+
padding: 0;
20+
border: 0;
21+
font-size: 100%;
22+
font: inherit;
23+
vertical-align: baseline;
24+
}
25+
26+
/* HTML5 display-role reset for older browsers */
27+
article, aside, details, figcaption, figure,
28+
footer, header, hgroup, menu, nav, section {
29+
display: block;
30+
}
31+
body {
32+
line-height: 1;
33+
}
34+
ol, ul {
35+
list-style: none;
36+
}
37+
blockquote, q {
38+
quotes: none;
39+
}
40+
blockquote:before, blockquote:after,
41+
q:before, q:after {
42+
content: '';
43+
content: none;
44+
}
45+
table {
46+
border-collapse: collapse;
47+
border-spacing: 0;
48+
}
49+
50+
51+
/* Our resets */
52+
* {
53+
box-sizing: border-box;
54+
}
55+
56+
strong, em {
57+
font-weight: ${fonts.weight.bold};
58+
}
659
760
body, input, textarea, button, select {
861
font-family: ${fonts.family.text};
@@ -70,4 +123,5 @@ injectGlobal`
70123
src: local('Roboto Mono'), local('RobotoMono-Regular'), url(https://fonts.gstatic.com/s/robotomono/v5/hMqPNLsu_dywMa4C_DEpY4gp9Q8gbYrhqGlRav_IXfk.woff2) format('woff2');
71124
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215;
72125
}
126+
73127
`

src/components/_helpers/reset.js

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

src/components/tokens.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
import { colors, spacing, fonts, misc } from '@auth0/cosmos-tokens'
22

3-
/* TODO: Find better place to add resets globally */
4-
import reset from './_helpers/reset'
5-
reset()
6-
73
export { colors, spacing, fonts, misc }

0 commit comments

Comments
 (0)