Skip to content

Commit

Permalink
Reorganize, bump to 0.3.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ned Zimmerman committed Jan 6, 2018
1 parent c41d1f9 commit 8298742
Show file tree
Hide file tree
Showing 33 changed files with 914 additions and 1,117 deletions.
24 changes: 22 additions & 2 deletions assets/styles/aetna.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,27 @@
* Prefix your imports with `~` to grab from node_modules/
* @see https://github.com/webpack-contrib/sass-loader#imports
*/
// @import "~tachyons-sass/tachyons";
@import "~reboot.css/dist/reboot.css";

/** Import theme styles */
@import "library/library";
@import "common/variables";
@import "common/functions";
@import "common/mixins";
@import "common/global";
@import "common/utils";
@import "components/a11y";
@import "components/buttons";
@import "components/comments";
@import "components/icon";
@import "components/social";
@import "components/toc";
@import "components/typography";
@import "layouts/block";
@import "layouts/book-header";
@import "layouts/book-info";
@import "layouts/book-meta";
@import "layouts/content";
@import "layouts/footer";
@import "layouts/header";
@import "layouts/reading-header";
@import "layouts/section";
219 changes: 125 additions & 94 deletions assets/styles/common/_global.scss
Original file line number Diff line number Diff line change
@@ -1,99 +1,130 @@
html {
-webkit-font-smoothing: antialiased;
}

* {
box-sizing: border-box;
}

body {
margin: 0;
font-family: $font-family-serif;
font-size: rem(18);
background: $white;
}

h1,
h2,
h3,
h4,
h5,
h6 {
font-family: $font-family-sans-serif;
}

h1 {
font-size: rem(30);
font-weight: 600;
letter-spacing: rem(2);
line-height: (36/30);
margin: 0;
}

h2 {
font-size: rem(30);
font-weight: 600;
color: var(--primary, $brand-primary);
letter-spacing: 2px;
line-height: (36/30);
text-transform: uppercase;
text-align: center;
margin: 0;

&::before {
content: "";
display: block;
margin: 0 auto 1em;
width: 46px;
height: 5px;
background: var(--accent, $brand-accent);
}
}

a {
color: var(--primary, $brand-primary);
text-decoration: none;
}

:root {
--primary: $brand-primary;
--font-family-sans-serif: $font-family-sans-serif;
--font-family-monospace: $font-family-monospace;
--brand: $brand;
--brand-hover: $brand-hover;
--brand-accent: $brand-accent;
--body-bg: $body-bg;
--body-bg-alt: $brand-bg-alt;
--body-bg-alt2: $brand-bg-alt2;
--body-color: $body-color;
--button-primary-color: $btn-color;
--button-primary-hover-color: $brand-hover;
--button-secondary-color: $brand;
--button-secondary-hover-color: $brand-hover;
--header-bg: $header-bg;
--header-color: $header-color;
--footer-bg: $footer-bg;
--footer-color: $footer-color;
--book-bg: $book-bg;
--brand-orig: $brand;
--brand-hover-orig: $brand-hover;
--brand-accent-orig: $brand-accent;
--primary: $brand;
--accent: $brand-accent;
--primary-fg: $white;
--accent-fg: $white;
--header-text: $black;
--primary-fg: $color-primary-fg;
--accent-fg: $color-accent-fg;
--header-text: $color-header-text;
--cover-header-bg: $color-cover-header-bg;
}

.primary {
color: var(--brand-primary, $brand-primary);
}

.bg-primary {
background-color: var(--brand-primary, $brand-primary);
}

.b--primary {
border-color: var(--brand-primary, $brand-primary);
}

.accent {
color: var(--brand-secondary, $brand-accent);
}

.bg-accent {
background-color: var(--brand-secondary, $brand-accent);
}

.b--accent {
border-color: var(--brand-secondary, $brand-accent);
}

@media (min-width: $medium) {
h2 {
font-size: rem(48);
line-height: (56/48);

&::before {
width: 74px;
}
}
}
// html {
// -webkit-font-smoothing: antialiased;
// }

// * {
// box-sizing: border-box;
// }

// body {
// margin: 0;
// font-family: $font-family-serif;
// font-size: rem(18);
// background: $white;
// }

// h1,
// h2,
// h3,
// h4,
// h5,
// h6 {
// font-family: $font-family-sans-serif;
// }

// h1 {
// font-size: rem(30);
// font-weight: 600;
// letter-spacing: rem(2);
// line-height: (36/30);
// margin: 0;
// }

// h2 {
// font-size: rem(30);
// font-weight: 600;
// color: var(--primary, $brand-primary);
// letter-spacing: 2px;
// line-height: (36/30);
// text-transform: uppercase;
// text-align: center;
// margin: 0;

// &::before {
// content: "";
// display: block;
// margin: 0 auto 1em;
// width: 46px;
// height: 5px;
// background: var(--accent, $brand-accent);
// }
// }

// a {
// color: var(--primary, $brand-primary);
// text-decoration: none;
// }

// :root {
// --primary: $brand-primary;
// --accent: $brand-accent;
// --primary-fg: $white;
// --accent-fg: $white;
// --header-text: $black;
// }

// .primary {
// color: var(--brand-primary, $brand-primary);
// }

// .bg-primary {
// background-color: var(--brand-primary, $brand-primary);
// }

// .b--primary {
// border-color: var(--brand-primary, $brand-primary);
// }

// .accent {
// color: var(--brand-secondary, $brand-accent);
// }

// .bg-accent {
// background-color: var(--brand-secondary, $brand-accent);
// }

// .b--accent {
// border-color: var(--brand-secondary, $brand-accent);
// }

// @media (min-width: $medium) {
// h2 {
// font-size: rem(48);
// line-height: (56/48);

// &::before {
// width: 74px;
// }
// }
// }
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,3 @@ img {
clear: both;
content: '';
}

@mixin debug {
* {
border: solid 1px silver;
}
}
Loading

0 comments on commit 8298742

Please sign in to comment.