Skip to content

Commit

Permalink
Merge branch 'canary' into update-high-security-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jackhowa committed Oct 9, 2020
2 parents 030cb35 + 9910723 commit 32d64d5
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wpmedia/news-theme-css",
"version": "4.0.0-0",
"version": "4.0.0-1",
"description": "CSS Grid Framework with Bootstrap-like conventions",
"author": "Brent Miller",
"license": "CC-BY-NC-ND-4.0",
Expand Down
63 changes: 63 additions & 0 deletions scss/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// this is for documentation purposes of importing. please reflect any functional changes to _index.scss here for styleguide
// alas, fusion needs _index.scss https://github.com/WPMedia/news-theme-css/pull/38
// yet node sass needs index.scss for building https://github.com/sass/node-sass/issues/1505#issuecomment-651139437
html {
box-sizing: border-box;
font-size: 16px;
}

*,
*::before,
*::after {
box-sizing: inherit;
}

body,
h1,
h2,
h3,
h4,
h5,
h6,
p,
ol,
ul {
font-weight: normal;
margin: 0;
padding: 0;
}

html,
body {
height: 100%;
width: 100%;
}

ol,
ul {
list-style: none;
}

img {
height: auto;
max-width: 100%;
}

.test-class {
background-color: #000000;
}

@import './variables';
@import './functions';
@import './breakpoints';
@import './margins';
@import './mixins';
@import './padding';
@import './colors';
@import './typography/index';
@import 'grid/index';
@import 'utils/utils';
@import './buttons';
@import './links';
@import 'components/figure_caption';
@import 'components/chain_spacing';

0 comments on commit 32d64d5

Please sign in to comment.