Skip to content
Permalink
Browse files

Updated the normalise css.

  • Loading branch information...
frjo committed Jan 30, 2018
1 parent 5fb50a6 commit fbf7a90ed38dab3ebf4a1066e2f10d379ea5a9d8
Showing with 438 additions and 413 deletions.
  1. +18 −21 .sass-lint.yml
  2. +3 −4 sass/_custom.scss
  3. +8 −13 sass/_zen.scss
  4. +1 −0 sass/base/_fonts.scss
  5. +0 −45 sass/base/_html5.scss
  6. +15 −5 sass/base/_normalize.scss
  7. +8 −22 sass/base/{_root.scss → document/_document.scss}
  8. +21 −11 sass/base/embedded/_embedded.scss
  9. +54 −53 sass/base/forms/_forms.scss
  10. +27 −49 sass/base/grouping/_grouping.scss
  11. +8 −0 sass/base/hidden/_hidden.scss
  12. +35 −0 sass/base/interactive/_interactive.scss
  13. +1 −11 sass/base/links/_links.scss
  14. +18 −0 sass/base/scripting/_scripting.scss
  15. +25 −6 sass/base/{headings/_headings.scss → sections/_sections.scss}
  16. +0 −4 sass/base/tables/_tables.scss
  17. +18 −71 sass/base/text/_text.scss
  18. +13 −7 sass/components/box/_box.scss
  19. +7 −23 sass/components/button/_button.scss
  20. +33 −15 sass/components/header/_header.scss
  21. +10 −5 sass/components/hidden/_hidden.scss
  22. +9 −0 sass/components/highlight-mark/_highlight-mark.scss
  23. +12 −0 sass/components/inline-links/_inline-links.scss
  24. +22 −0 sass/components/inline-sibling/_inline-sibling.scss
  25. +0 −4 sass/components/print-none/_print-none.scss
  26. +9 −0 sass/components/responsive-video/_responsive-video.scss
  27. +13 −0 sass/components/visually-hidden/_visually-hidden.scss
  28. +7 −13 sass/components/wireframe/_wireframe.scss
  29. +3 −1 sass/init/_colors.scss
  30. +0 −2 sass/init/clearfix/_clearfix.scss
  31. +0 −2 sass/init/image-url/_image-url.scss
  32. +0 −2 sass/init/rtl/_rtl.scss
  33. +0 −6 sass/init/visually-hidden/_visually-hidden.scss
  34. +2 −0 sass/layouts/_layouts.scss
  35. +2 −2 sass/navigation/mobile/_mobile.scss
  36. +13 −1 sass/navigation/more-link/_more-link.scss
  37. +18 −4 sass/navigation/navbar/_navbar.scss
  38. +1 −5 sass/navigation/pager/_pager.scss
  39. +1 −1 sass/print.scss
  40. +1 −3 sass/styles.scss
  41. +1 −1 static/css/print.css
  42. +1 −1 static/css/styles.css
@@ -31,15 +31,19 @@ rules:
single-line-per-selector: 2

# Disallows
# no-color-keywords: 2
# no-color-literals: 2
# no-css-comments: 2
no-attribute-selectors: 0
no-color-hex: 2
no-color-keywords: 2
no-color-literals: 2
no-combinators: 0
no-css-comments: 2
no-debug: 2
# no-duplicate-properties: 2
no-empty-rulesets: 2
no-disallowed-properties: 2
no-duplicate-properties: 2
no-empty-rulesets: 0
no-extends: 0
# no-ids: 2
# no-important: 2
no-ids: 2
no-important: 2
no-invalid-hex: 2
no-mergeable-selectors: 2
no-misspelled-properties:
@@ -52,10 +56,12 @@ rules:
- '*vertical-align'
- '*width'
no-qualifying-elements: 0
no-trailing-whitespace: 2
no-trailing-zero: 2
no-transition-all: 1
no-transition-all: 0
no-universal-selectors: 0
no-url-protocols: 2
# no-vendor-prefixes: 2
no-vendor-prefixes: 2
no-warn: 2
property-units: 0

@@ -79,6 +85,7 @@ rules:
variable-name-format: 2

# Style Guide
attribute-quotes: 2
bem-depth: 0
border-zero: 2
brace-style:
@@ -89,12 +96,13 @@ rules:
empty-args: 0
hex-length: 2
hex-notation: 2
# indentation: 2
indentation: 2
leading-zero: 2
nesting-depth:
- 2
- max-depth: 4
property-sort-order: 0
pseudo-element: 1
quotes: 2
shorthand-values: 2
url-quotes: 2
@@ -114,14 +122,3 @@ rules:
# Final Items
trailing-semicolon: 2
final-newline: 2

# Work-around for sass-lint not having per-file/block/line rule config.
# @TODO: Re-enable these disabled rules. See https://www.drupal.org/node/2717117
indentation: 0
no-color-keywords: 0
no-color-literals: 0
no-css-comments: 0
no-duplicate-properties: 0
no-ids: 0
no-important: 0
no-vendor-prefixes: 0
@@ -1,4 +1,3 @@
/**
* @file
* Site custom styles
*/
// sass-lint:disable no-css-comments, no-color-hex, no-color-literals

// Site custom styles
@@ -1,17 +1,12 @@
/**
* @file
* Zen custom styles
*/

/* Zen overrides */
// Zen custom styles

p,
pre {
// Set 1 unit of vertical rhythm on the top and bottom margin.
@include margin(.75 0);
}

/* Page */
// Page

body {
background-color: color(backdrop);
@@ -40,7 +35,7 @@ body {
}
}

/* Apply smaller text to blocks, footer etc. */
// Apply smaller text to blocks, footer etc.

th,
label,
@@ -63,7 +58,7 @@ article > header,
}
}

/* Apply heading font stack to heading, labels etc. */
// Apply heading font stack to heading, labels etc.

h1,
h2,
@@ -215,7 +210,7 @@ figcaption {
}
}

/* Navigation */
// Navigation

.main-menu {
@include margin-top(.5);
@@ -251,7 +246,7 @@ figcaption {
text-decoration: none;
}

/* Messages */
// Messages

.message {
padding: 10px;
@@ -278,7 +273,7 @@ figcaption {
}
}

/* Search */
// Search

.search-form {
@include padding(.5 0);
@@ -288,7 +283,7 @@ figcaption {
@include type-layout(l, 1);
}

/* Form */
// Form

.content {
input,
@@ -9,6 +9,7 @@
// websites where you can find Open Source fonts to download:
// - http://www.fontsquirrel.com/fontface
// - http://www.theleagueofmoveabletype.com
// - https://fonts.google.com
//
// In order to use these fonts, you will need to convert them into formats
// suitable for web fonts. We recommend the free-to-use Font Squirrel's

This file was deleted.

Oops, something went wrong.
@@ -6,19 +6,29 @@
// @see http://snook.ca/archives/html_and_css/no_css_reset/
//
// This directory is a slight fork of this original source:
// - normalize-scss 5.0.3 | MIT/GPLv2 License | bit.ly/normalize-scss
// normalize-scss 7.0.0 | MIT/GPLv2 License | bit.ly/normalize-scss


// Universal
// ==========================================================================

// Use the saner border-box model for all elements.
* {
box-sizing: border-box;
}

// Normalize-scss is broken into modular pieces to make it easier to edit.
@import 'root';
@import 'html5';
@import 'document/document';
@import 'sections/sections';
@import 'grouping/grouping';
@import 'links/links';
@import 'headings/headings';
@import 'text/text';
@import 'grouping/grouping';
@import 'embedded/embedded';
@import 'forms/forms';
@import 'tables/tables';
@import 'interactive/interactive';
@import 'scripting/scripting';
@import 'hidden/hidden';

// Note: we allow the .button component (loaded by forms) to override :link, by
// loading links first.
@@ -1,37 +1,23 @@
// sass-lint:disable no-vendor-prefixes

// Use the saner border-box model for all elements.
* {
box-sizing: border-box;
}
// Document
//
// The default font styles are inherited from the `<html>` element.

html {
@include define-type-sizing();
// Change the default font family in all browsers (opinionated).
@include typeface(body);
// Prevent adjustments of font size after orientation changes in IE and iOS.
// Correct the line height in all browsers.
@include define-type-sizing();
// Prevent adjustments of font size after orientation changes in IE on Windows
// Phone and in iOS.
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
// On short pages, we want any background gradients to fill the entire height
// of the browser.
min-height: 100%;
}

body {
// Output a horizontal grid to help with debugging typography. The
// $typey-debug variable will toggle its output.
@include typey-debug-grid();
// Remove default margin and padding.
margin: 0;
padding: 0;
color: color(text);
background-color: color(text-bg);
}

@include respond-to(xxl) {

html {
@include respond-to(xxl) {
@include define-type-sizing($base-font-size-2, $base-line-height-2);
}

}
@@ -1,19 +1,26 @@
// Embedded content
//
// Weight: 2
//
// Style guide: base.embedded

// Audio

audio {
// Add the correct display in IE 9-.
display: inline-block;
}

// Add the correct display in iOS 4-7.
audio:not([controls]) {
display: none;
height: 0;
}

// Image
//
// An `<img>` element represents an image.
//
// Markup: embedded-img.twig
//
// Style guide: base.embedded.img

img {
// Remove the border on images inside links in IE <11.
// Remove the border on images inside links in IE 10-.
border-style: none;
}

@@ -30,12 +37,15 @@ svg {
// Scalable vector
//
// A `<svg>` element represents an image encoded as a Scalable Vector Graphic.
//
// Markup: embedded-svg.twig
//
// Style guide: base.embedded.svg

svg:not(:root) {
// Hide the overflow in IE.
overflow: hidden;
}

// Video

video {
// Add the correct display in IE 9-.
display: inline-block;
}
Oops, something went wrong.

0 comments on commit fbf7a90

Please sign in to comment.
You can’t perform that action at this time.