Updating to normalize.css 8.0.1 minus IE fixes. Other sass file cleanup as well.

This commit is contained in:
Fredrik Jonsson 2019-03-31 20:50:25 +02:00
commit 9d02a3fb30
20 changed files with 73 additions and 223 deletions

View file

@ -4,55 +4,19 @@
// project, each .scss file has a `@import 'init';` declaration. The _init.scss // project, each .scss file has a `@import 'init';` declaration. The _init.scss
// file is in charge of importing all the other partials needed for the // file is in charge of importing all the other partials needed for the
// project. // project.
//
// The initialization partial is organized in this way:
// - First we set any shared Sass variables.
// - Next we import Sass modules.
// - Last we define our custom mixins for this project.
//
// Weight: -1
//
// Style guide: sass.init
// The following Sass functions/mixins are required to generate some variables'
// values, so we load them first.
@import 'init/breakpoint/respond-to';
// Colours and variables.
@import 'init/colors'; @import 'init/colors';
@import 'init/variables'; @import 'init/variables';
// 3rd party libraries
//
// The following sass modules are shared with all .scss files:
// - [Breakpoint](http://breakpoint-sass.com/)
// - [Typey](https://github.com/jptaranto/typey)
//
// Additional pre-built libraries can be found on the [Sache website](http://www.sache.in/).
//
// Style guide: sass.modules
// Add typey to manage font sizes and margins. // Add typey to manage font sizes and margins.
@import 'typey'; @import 'typey';
// Mixins
//
// Custom mixins used on this site. // Custom mixins used on this site.
// @import 'init/breakpoint/respond-to';
// Weight: 1
//
// Style guide: sass.mixins
@import 'init/clearfix/clearfix'; @import 'init/clearfix/clearfix';
@import 'init/rtl/rtl'; @import 'init/rtl/rtl';
@import 'init/visually-hidden/visually-hidden'; @import 'init/visually-hidden/visually-hidden';
// Functions
//
// Custom functions used on this site. // Custom functions used on this site.
//
// Weight: 1
//
// Style guide: sass.functions
@import 'init/image-url/image-url'; @import 'init/image-url/image-url';

View file

@ -1,10 +1,5 @@
// Zen custom styles // Zen custom styles
p,
pre {
@include margin(.75 0);
}
// Page // Page
body { body {
@ -245,33 +240,6 @@ figcaption {
text-decoration: none; text-decoration: none;
} }
// Messages
.message {
padding: 10px;
border-width: 1px;
border-style: solid;
width: 95%;
&.status {
background-color: $status-bg;
color: $status;
border-color: $status;
}
&.warning {
background-color: $warning-bg;
color: $warning;
border-color: $warning;
}
&.error {
background-color: $error-bg;
color: $error;
border-color: $error;
}
}
// Search // Search
.search-form { .search-form {
@ -282,22 +250,6 @@ figcaption {
@include type-layout(l, 1); @include type-layout(l, 1);
} }
// Language selector
.language-selector {
.navbar {
&::before {
content: '';
background-image: url('../images/language-icon.png');
background-size: 24px;
background-repeat: no-repeat;
height: 24px;
width: 24px;
margin-right: 8px;
}
}
}
// Form // Form
.content { .content {

View file

@ -1,29 +1,15 @@
// Normalize.css is intended to be used as an alternative to CSS resets. // Normalize.css is intended to be used as an alternative to CSS resets.
// //
// @see http://nicolasgallagher.com/about-normalize-css/ // @see https://necolas.github.io/normalize.css/
//
// Also: @see http://meiert.com/en/blog/20080419/reset-style-sheets-are-bad/
// @see http://snook.ca/archives/html_and_css/no_css_reset/
// //
// This directory is a slight fork of this original source: // This directory is a slight fork of this original source:
// normalize-scss 7.0.0 | MIT/GPLv2 License | bit.ly/normalize-scss // normalize.css 8.0.1 | MIT License
// Universal // Universal
// ========================================================================== // ==========================================================================
// Use the saner border-box model for all elements. // Broken into modular pieces to make it easier to edit.
html {
box-sizing: border-box;
}
*,
*::before,
*::after {
box-sizing: inherit;
}
// Normalize-scss is broken into modular pieces to make it easier to edit.
@import 'document/document'; @import 'document/document';
@import 'sections/sections'; @import 'sections/sections';
@import 'grouping/grouping'; @import 'grouping/grouping';
@ -34,7 +20,6 @@ html {
@import 'tables/tables'; @import 'tables/tables';
@import 'interactive/interactive'; @import 'interactive/interactive';
@import 'scripting/scripting'; @import 'scripting/scripting';
@import 'hidden/hidden';
// Note: we allow the .button component (loaded by forms) to override :link, by // Note: we allow the .button component (loaded by forms) to override :link, by
// loading links first. // loading links first.

View file

@ -16,8 +16,18 @@ html {
// On short pages, we want any background gradients to fill the entire height // On short pages, we want any background gradients to fill the entire height
// of the browser. // of the browser.
min-height: 100%; min-height: 100%;
// Use the saner border-box model.
box-sizing: border-box;
@include respond-to(xxl) { @include respond-to(xxl) {
@include define-type-sizing($base-font-size-2, $base-line-height-2); @include define-type-sizing($base-font-size-2, $base-line-height-2);
} }
} }
// Use the saner border-box model for all elements.
*,
*::before,
*::after {
box-sizing: inherit;
}

View file

@ -1,18 +1,9 @@
// Embedded content // Embedded content
//
// Weight: 2
// Audio // Audio
audio { audio {
// Add the correct display in IE 9-. // Add your styles.
display: inline-block;
}
// Add the correct display in iOS 4-7.
audio:not([controls]) {
display: none;
height: 0;
} }
// Image // Image
@ -20,8 +11,7 @@ audio:not([controls]) {
// An `<img>` element represents an image. // An `<img>` element represents an image.
img { img {
// Remove the border on images inside links in IE 10-. // Add your styles.
border-style: none;
} }
img, img,
@ -34,18 +24,8 @@ svg {
height: auto; height: auto;
} }
// Scalable vector
//
// A `<svg>` element represents an image encoded as a Scalable Vector Graphic.
svg:not(:root) {
// Hide the overflow in IE.
overflow: hidden;
}
// Video // Video
video { video {
// Add the correct display in IE 9-. // Add your styles.
display: inline-block;
} }

View file

@ -6,8 +6,6 @@
// //
// Component classes can override these styles, but if no class applies a style // Component classes can override these styles, but if no class applies a style
// to an HTML form element, these styles will be the ones displayed. // to an HTML form element, these styles will be the ones displayed.
//
// Weight: -1
// //
// The following rules are from normalize.css and help to fix inconsistencies // The following rules are from normalize.css and help to fix inconsistencies
@ -216,8 +214,6 @@ select {
// The `<progress>` element represents the completion progress of a task. // The `<progress>` element represents the completion progress of a task.
progress { progress {
// Add the correct display in IE 9-.
display: inline-block;
// Add the correct vertical alignment in Chrome, Firefox, and Opera. // Add the correct vertical alignment in Chrome, Firefox, and Opera.
vertical-align: baseline; vertical-align: baseline;
} }

View file

@ -2,8 +2,6 @@
@import 'components/divider/divider'; @import 'components/divider/divider';
// Grouping content // Grouping content
//
// Weight: 1
// Block quotes // Block quotes
@ -24,8 +22,6 @@ blockquote {
// Lists // Lists
// //
// Weight: -1
//
// Style guide: base.grouping.lists // Style guide: base.grouping.lists
// Unordered list // Unordered list
@ -41,8 +37,6 @@ blockquote {
// Description list // Description list
// //
// The `<dl>` element is a list of terms with their associated descriptions. // The `<dl>` element is a list of terms with their associated descriptions.
//
// Weight: 1
dl, dl,
ol, ol,
@ -86,15 +80,11 @@ ul {
// caption of the figure. // caption of the figure.
figure { figure {
// Add the correct margin in IE 8. // Add your styles.
@include margin(1 0);
// Add the correct display in IE 9-.
display: block;
} }
figcaption { figcaption {
// Add the correct display in IE 9-. // Add your styles.
display: block;
} }
// Horizontal rule // Horizontal rule
@ -117,8 +107,7 @@ hr {
// The `<main>` element represents the main content of the page. // The `<main>` element represents the main content of the page.
main { main {
// Add the correct display in IE. // Add your styles.
display: block;
} }
// Body copy // Body copy
@ -126,13 +115,10 @@ main {
// The default `font-size` and `line-height` properties are applied to the // The default `font-size` and `line-height` properties are applied to the
// `<body>` element and all paragraphs. In addition, `<p>` (paragraphs) receive // `<body>` element and all paragraphs. In addition, `<p>` (paragraphs) receive
// a top and bottom margin. // a top and bottom margin.
//
// Weight: -2
p, p,
pre { pre {
// Set 1 unit of vertical rhythm on the top and bottom margin. @include margin(.75 0);
@include margin(1 0);
} }
// Preformatted text // Preformatted text

View file

@ -1,8 +0,0 @@
// Hidden
//
// Some older browsers do not hide elements that have a `hidden` attribute.
[hidden] {
// Add the correct display in IE 10-.
display: none;
}

View file

@ -17,8 +17,6 @@ summary {
menu { menu {
// Set 1 unit of vertical rhythm on the top and bottom margin. // Set 1 unit of vertical rhythm on the top and bottom margin.
@include margin(1 0); @include margin(1 0);
// Add the correct display in IE 9-.
display: block;
// Set consistent space for the list style image. // Set consistent space for the list style image.
padding: 0 0 0 $indent-amount; padding: 0 0 0 $indent-amount;

View file

@ -33,9 +33,4 @@ a:focus {
a:active { a:active {
color: $link-active; color: $link-active;
&:not(.button) {
// Remove the gray background on active links in IE 10.
background-color: transparent;
}
} }

View file

@ -3,16 +3,11 @@
// Canvas // Canvas
canvas { canvas {
// Add the correct display in IE 9-. // Add your styles.
display: inline-block;
} }
// Template // Template
//
// Some older browsers do not hide elements the web components' `template`
// element.
template { template {
// Add the correct display in IE. // Add your styles.
display: none;
} }

View file

@ -11,16 +11,6 @@ body {
padding: 0; padding: 0;
} }
// Add the correct display in IE 9-.
article,
aside,
footer,
header,
nav,
section {
display: block;
}
// Headings // Headings
// //
// All HTML headings, `<h1>` through `<h6>`, are available. `%h1` through `%h6` // All HTML headings, `<h1>` through `<h6>`, are available. `%h1` through `%h6`

View file

@ -1,8 +1,6 @@
// Tables // Tables
// //
// The `<table>` element displays tabular data in rows, columns, and cells. // The `<table>` element displays tabular data in rows, columns, and cells.
//
// Weight: 1
table { table {
// Add vertical rhythm margins. // Add vertical rhythm margins.

View file

@ -1,8 +1,6 @@
// Text-level semantics // Text-level semantics
// //
// The elements in this section give semantics to inline text. // The elements in this section give semantics to inline text.
//
// Weight: 1
// Abbreviation / Acroynym // Abbreviation / Acroynym
// //
@ -25,8 +23,6 @@ abbr[title] {
// //
// Feel free to use `<b>` in HTML5. `<b>` is meant to highlight words or phrases // Feel free to use `<b>` in HTML5. `<b>` is meant to highlight words or phrases
// without conveying additional importance. // without conveying additional importance.
//
// Weight: -1
// Prevent the duplicate application of `bolder` by the next rule in Safari 6. // Prevent the duplicate application of `bolder` by the next rule in Safari 6.
@ -76,8 +72,7 @@ del {
// The `<dfn>` element represents the defining instance of a term. // The `<dfn>` element represents the defining instance of a term.
dfn { dfn {
// Add the correct font style in Android 4.3-. // Add your styles.
font-style: italic;
} }
// Italics // Italics
@ -87,8 +82,6 @@ dfn {
// //
// Feel free to use `<i>` element in HTML5. `<i>` is meant to convey voice, // Feel free to use `<i>` element in HTML5. `<i>` is meant to convey voice,
// technical terms, etc. // technical terms, etc.
//
// Weight: -1
i, i,
em { em {
@ -109,9 +102,7 @@ ins {
// context. // context.
mark { mark {
// Add the correct background and color in IE 9-. // Add your styles.
background-color: $mark-bg;
color: $text;
} }
// Quote // Quote

View file

@ -8,21 +8,6 @@
// :hover - Hover styling. // :hover - Hover styling.
// :active - Depressed button styling. // :active - Depressed button styling.
// 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
// controls in Android 4.
// 2. Correct the inability to style clickable types in iOS and Safari.
.button,
%button,
button,
// 1
html [type='button'],
[type='reset'],
[type='submit'] {
// sass-lint:disable no-vendor-prefixes
-moz-appearance: button;
-webkit-appearance: button; // 2
}
.button, .button,
%button, %button,
button, button,
@ -53,8 +38,11 @@ button,
border-bottom-color: #b4b4b4; border-bottom-color: #b4b4b4;
border-radius: 2px; border-radius: 2px;
// sass-lint:disable no-vendor-prefixes // sass-lint:disable no-vendor-prefixes
// Correct the inability to style clickable types in iOS and Safari.
-moz-appearance: button;
-webkit-appearance: button;
// Remove the inner border and padding in Firefox. // Remove the inner border and padding in Firefox.
&::-moz-focus-inner { &::-moz-focus-inner {
border-style: none; border-style: none;

View file

@ -0,0 +1,15 @@
// Language selector
.language-selector {
.navbar {
&::before {
content: '';
background-image: url('../images/language-icon.png');
background-size: 24px;
background-repeat: no-repeat;
height: 24px;
width: 24px;
margin-right: 8px;
}
}
}

View file

@ -0,0 +1,26 @@
// Messages
.message {
padding: 10px;
border-width: 1px;
border-style: solid;
width: 95%;
&.status {
background-color: $status-bg;
color: $status;
border-color: $status;
}
&.warning {
background-color: $warning-bg;
color: $warning;
border-color: $warning;
}
&.error {
background-color: $error-bg;
color: $error;
border-color: $error;
}
}

View file

@ -148,8 +148,6 @@ $zen-gutters: 20px;
// `$indent-amount` controls the amount lists, blockquotes and comments are indented. // `$indent-amount` controls the amount lists, blockquotes and comments are indented.
// //
// `$include-rtl` controls whether RTL styles are output. // `$include-rtl` controls whether RTL styles are output.
//
// weight: 10
$indent-amount: 2 * $base-font-size; $indent-amount: 2 * $base-font-size;

View file

@ -4,14 +4,10 @@
// Colors and Sass // Colors and Sass
// //
// Documentation for colors and Sass mixins and variables. // Documentation for colors and Sass mixins and variables.
//
// Weight: -1
@import 'init'; @import 'init';
// Components // Components
//
// Weight: 1
@import 'components/print-none/print-none'; @import 'components/print-none/print-none';

View file

@ -4,12 +4,9 @@
// We categorize our components by creating headings in this file. See the // We categorize our components by creating headings in this file. See the
// description on the style guide home page for more information. // description on the style guide home page for more information.
// Colors and Sass // Colors and Sass
// //
// Documentation for colors and Sass mixins and variables. // Documentation for colors and Sass mixins and variables.
//
// Weight: -1
@import 'init'; @import 'init';
@ -36,8 +33,6 @@
// //
// Design components are reusable designs that can be applied using just the CSS // Design components are reusable designs that can be applied using just the CSS
// class names specified in the component. // class names specified in the component.
//
// Weight: 1
@import 'components/box/box'; @import 'components/box/box';
@import 'components/clearfix/clearfix'; @import 'components/clearfix/clearfix';
@ -47,7 +42,9 @@
@import 'components/inline-links/inline-links'; @import 'components/inline-links/inline-links';
@import 'components/inline-sibling/inline-sibling'; @import 'components/inline-sibling/inline-sibling';
@import 'components/inverted-box/inverted-box'; @import 'components/inverted-box/inverted-box';
@import 'components/language-selector/language-selector';
@import 'components/list-straight-left/list-straight-left'; @import 'components/list-straight-left/list-straight-left';
@import 'components/messages/messages';
@import 'components/responsive-video/responsive-video'; @import 'components/responsive-video/responsive-video';
@import 'components/visually-hidden/visually-hidden'; @import 'components/visually-hidden/visually-hidden';
@import 'components/watermark/watermark'; @import 'components/watermark/watermark';
@ -57,8 +54,6 @@
// //
// Navigation components are specialized design components that are used for // Navigation components are specialized design components that are used for
// page navigation. // page navigation.
//
// Weight: 2
@import 'navigation/more-link/more-link'; @import 'navigation/more-link/more-link';
@import 'navigation/navbar/navbar'; @import 'navigation/navbar/navbar';