From 4c4c06e2d394169f0c9e3755d3c18d9fce85b1c3 Mon Sep 17 00:00:00 2001 From: Angelos Chalaris Date: Wed, 12 Oct 2016 20:15:17 +0300 Subject: [PATCH] Updated base --- docs/v2/DEVLOG.md | 4 +++- scss/v2/_base.scss | 57 ++++++++-------------------------------------- 2 files changed, 13 insertions(+), 48 deletions(-) diff --git a/docs/v2/DEVLOG.md b/docs/v2/DEVLOG.md index 6c5fa2a..c4620c9 100644 --- a/docs/v2/DEVLOG.md +++ b/docs/v2/DEVLOG.md @@ -27,4 +27,6 @@ - Removed the styling fix for `figure` for IE 8. `figure` styling will probably be built from the ground up in the core anyways, so this should not be a problem. - Kept styling fixes for `figure` and `figcaption` for IE 9-. These elements are supported by IE 9, but not the older versions of IE. - Kept the styling fixes for `article`, `aside`, `footer`, `header`, `nav` and `section` for IE 9-. Elements are only supported in IE 9. - \ No newline at end of file +- **Organized and cleaned the base** + - Merged styling fixes for `article`, `aside`, `footer`, `header`, `nav` and `section` with fixes for `figure`, `figcaption` and `main`. + - Merged styling for `kbd`, `code`, `pre` and `samp`. diff --git a/scss/v2/_base.scss b/scss/v2/_base.scss index 44bce5a..3a45381 100644 --- a/scss/v2/_base.scss +++ b/scss/v2/_base.scss @@ -7,9 +7,6 @@ * IE on Windows Phone and in iOS. */ -/* Document - ========================================================================== */ - html { font-family: sans-serif; /* 1 */ line-height: 1.15; /* 2 */ @@ -17,9 +14,6 @@ html { -webkit-text-size-adjust: 100%; /* 3 */ } -/* Sections - ========================================================================== */ - /** * Remove the margin in all browsers (opinionated). */ @@ -28,19 +22,6 @@ body { margin: 0; } -/** - * Add the correct display in IE 9-. - */ - -article, -aside, -footer, -header, -nav, -section { - display: block; -} - /** * Correct the font size and margin on `h1` elements within `section` and * `article` contexts in Chrome, Firefox, and Safari. @@ -51,14 +32,17 @@ h1 { margin: 0.67em 0; } -/* Grouping content - ========================================================================== */ - /** * Add the correct display in IE 9-. * 1. Add the correct display in IE. */ +article, +aside, +footer, +header, +nav, +section, figcaption, figure, main { /* 1 */ @@ -81,14 +65,14 @@ hr { * 2. Correct the odd `em` font sizing in all browsers. */ -pre { +code, +kbd, +pre, +samp { font-family: monospace, monospace; /* 1 */ font-size: 1em; /* 2 */ } -/* Text-level semantics - ========================================================================== */ - /** * 1. Remove the gray background on active links in IE 10. * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. @@ -138,18 +122,6 @@ strong { font-weight: bolder; } -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -code, -kbd, -samp { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - /** * Add the correct font style in Android 4.3-. */ @@ -196,9 +168,6 @@ sup { top: -0.5em; } -/* Embedded content - ========================================================================== */ - /** * Add the correct display in IE 9-. */ @@ -216,9 +185,6 @@ svg:not(:root) { overflow: hidden; } -/* Forms - ========================================================================== */ - /** * 1. Change the font styles in all browsers (opinionated). * 2. Remove the margin in Firefox and Safari. @@ -371,9 +337,6 @@ textarea { font: inherit; /* 2 */ } -/* Interactive - ========================================================================== */ - /* * Add the correct display in IE 9-. * 1. Add the correct display in Edge, IE, and Firefox.