From 3b81bb7423c4a9a1c2387f6fe7e9ab1e668c4aeb Mon Sep 17 00:00:00 2001 From: Andros Fenollosa Date: Sun, 3 Mar 2019 09:20:25 +0100 Subject: [PATCH] Update sass --- sass/README.md | 7 - sass/abstracts/README.md | 7 - sass/abstracts/_functions.sass | 15 +- sass/abstracts/_functions.scss | 30 --- sass/abstracts/_mixins.sass | 27 +- sass/abstracts/_mixins.scss | 34 --- sass/abstracts/_variables.sass | 45 +--- sass/abstracts/_variables.scss | 71 ----- sass/base/README.md | 5 - sass/base/_base.sass | 27 +- sass/base/_base.scss | 35 --- sass/base/_fonts.scss | 3 - sass/base/_helpers.sass | 72 ++--- sass/base/_helpers.scss | 55 ---- sass/base/_typography.sass | 8 +- sass/base/_typography.scss | 7 - sass/components/README.md | 5 - sass/components/_button.scss | 3 - sass/layout/README.md | 5 - sass/layout/_footer.scss | 3 - sass/layout/_header.scss | 3 - sass/main.sass | 42 +-- sass/main.scss | 35 --- sass/pages/README.md | 7 - sass/pages/_home.scss | 3 - sass/themes/README.md | 7 - sass/themes/_default.scss | 4 - sass/vendors/README.md | 7 - sass/vendors/_normalize.sass | 421 +++++++++++++++--------------- sass/vendors/_normalize.scss | 461 --------------------------------- 30 files changed, 303 insertions(+), 1151 deletions(-) delete mode 100644 sass/README.md delete mode 100644 sass/abstracts/README.md delete mode 100644 sass/abstracts/_functions.scss delete mode 100644 sass/abstracts/_mixins.scss delete mode 100644 sass/abstracts/_variables.scss delete mode 100644 sass/base/README.md delete mode 100644 sass/base/_base.scss delete mode 100644 sass/base/_fonts.scss delete mode 100644 sass/base/_helpers.scss delete mode 100644 sass/base/_typography.scss delete mode 100644 sass/components/README.md delete mode 100644 sass/components/_button.scss delete mode 100644 sass/layout/README.md delete mode 100644 sass/layout/_footer.scss delete mode 100644 sass/layout/_header.scss delete mode 100644 sass/main.scss delete mode 100644 sass/pages/README.md delete mode 100644 sass/pages/_home.scss delete mode 100644 sass/themes/README.md delete mode 100644 sass/themes/_default.scss delete mode 100644 sass/vendors/README.md delete mode 100644 sass/vendors/_normalize.scss diff --git a/sass/README.md b/sass/README.md deleted file mode 100644 index bf80b00..0000000 --- a/sass/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Main file - -The main file (usually labelled `main.scss`) should be the only Sass file from the whole code base not to begin with an underscore. This file should not contain anything but `@import` and comments. - -*Note: when using [Eyeglass](https://github.com/sass-eyeglass/eyeglass) for distribution, it might be a fine idea to name this file `index.scss` rather than `main.scss` in order to stick to [Eyeglass modules specifications](https://github.com/sass-eyeglass/eyeglass#writing-an-eyeglass-module-with-sass-files). See [#21](https://github.com/HugoGiraudel/sass-boilerplate/issues/21) for reference.* - -Reference: [Sass Guidelines](http://sass-guidelin.es/) > [Architecture](http://sass-guidelin.es/#architecture) > [Main file](http://sass-guidelin.es/#main-file) diff --git a/sass/abstracts/README.md b/sass/abstracts/README.md deleted file mode 100644 index 19e5889..0000000 --- a/sass/abstracts/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Abstracts - -The `abstracts/` folder gathers all Sass tools and helpers used across the project. Every global variable, function, mixin and placeholder should be put in here. - -The rule of thumb for this folder is that it should not output a single line of CSS when compiled on its own. These are nothing but Sass helpers. - -Reference: [Sass Guidelines](http://sass-guidelin.es/) > [Architecture](http://sass-guidelin.es/#architecture) > [Abstracts folder](http://sass-guidelin.es/#abstracts-folder) diff --git a/sass/abstracts/_functions.sass b/sass/abstracts/_functions.sass index d6b794f..4760e47 100644 --- a/sass/abstracts/_functions.sass +++ b/sass/abstracts/_functions.sass @@ -7,24 +7,21 @@ /// @param {String} $type - asset type folder (e.g. `fonts/`) /// @param {String} $path - asset path /// @return {Url} -@function asset($base, $type, $path) { - @return url($base + $type + $path); -} +@function asset($base, $type, $path) + @return url($base + $type + $path) /// Returns URL to an image based on its path /// @param {String} $path - image path /// @param {String} $base [$base-url] - base URL /// @return {Url} /// @require $base-url -@function image($path, $base: $base-url) { - @return asset($base, 'images/', $path); -} +@function image($path, $base: $base-url) + @return asset($base, "images/", $path) /// Returns URL to a font based on its path /// @param {String} $path - font path /// @param {String} $base [$base-url] - base URL /// @return {Url} /// @require $base-url -@function font($path, $base: $base-url) { - @return asset($base, 'fonts/', $path); -} +@function font($path, $base: $base-url) + @return asset($base, "fonts/", $path) diff --git a/sass/abstracts/_functions.scss b/sass/abstracts/_functions.scss deleted file mode 100644 index d6b794f..0000000 --- a/sass/abstracts/_functions.scss +++ /dev/null @@ -1,30 +0,0 @@ -// ----------------------------------------------------------------------------- -// This file contains all application-wide Sass functions. -// ----------------------------------------------------------------------------- - -/// Native `url(..)` function wrapper -/// @param {String} $base - base URL for the asset -/// @param {String} $type - asset type folder (e.g. `fonts/`) -/// @param {String} $path - asset path -/// @return {Url} -@function asset($base, $type, $path) { - @return url($base + $type + $path); -} - -/// Returns URL to an image based on its path -/// @param {String} $path - image path -/// @param {String} $base [$base-url] - base URL -/// @return {Url} -/// @require $base-url -@function image($path, $base: $base-url) { - @return asset($base, 'images/', $path); -} - -/// Returns URL to a font based on its path -/// @param {String} $path - font path -/// @param {String} $base [$base-url] - base URL -/// @return {Url} -/// @require $base-url -@function font($path, $base: $base-url) { - @return asset($base, 'fonts/', $path); -} diff --git a/sass/abstracts/_mixins.sass b/sass/abstracts/_mixins.sass index 56a8b90..ece57e5 100644 --- a/sass/abstracts/_mixins.sass +++ b/sass/abstracts/_mixins.sass @@ -6,29 +6,22 @@ /// @author Harry Roberts /// @param {Bool} $self [false] - Whether or not to include current selector /// @link https://twitter.com/csswizardry/status/478938530342006784 Original tweet from Harry Roberts -@mixin on-event($self: false) { - @if $self { +=on-event($self: false) + @if $self &, &:hover, &:active, - &:focus { - @content; - } - } @else { + &:focus + @content + @else &:hover, &:active, - &:focus { - @content; - } - } -} + &:focus + @content /// Make a context based selector a little more friendly /// @author Hugo Giraudel /// @param {String} $context -@mixin when-inside($context) { - #{$context} & { - @content; - } -} - +=when-inside($context) + #{$context} & + @content diff --git a/sass/abstracts/_mixins.scss b/sass/abstracts/_mixins.scss deleted file mode 100644 index 56a8b90..0000000 --- a/sass/abstracts/_mixins.scss +++ /dev/null @@ -1,34 +0,0 @@ -// ----------------------------------------------------------------------------- -// This file contains all application-wide Sass mixins. -// ----------------------------------------------------------------------------- - -/// Event wrapper -/// @author Harry Roberts -/// @param {Bool} $self [false] - Whether or not to include current selector -/// @link https://twitter.com/csswizardry/status/478938530342006784 Original tweet from Harry Roberts -@mixin on-event($self: false) { - @if $self { - &, - &:hover, - &:active, - &:focus { - @content; - } - } @else { - &:hover, - &:active, - &:focus { - @content; - } - } -} - -/// Make a context based selector a little more friendly -/// @author Hugo Giraudel -/// @param {String} $context -@mixin when-inside($context) { - #{$context} & { - @content; - } -} - diff --git a/sass/abstracts/_variables.sass b/sass/abstracts/_variables.sass index b384464..6d72f23 100644 --- a/sass/abstracts/_variables.sass +++ b/sass/abstracts/_variables.sass @@ -2,70 +2,45 @@ // This file contains all application-wide Sass variables. // ----------------------------------------------------------------------------- - - - - /// Regular font family /// @type List -$text-font-stack: 'Open Sans', 'Helvetica Neue Light', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif !default; +$text-font-stack: "Open Sans", "Helvetica Neue Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif !default /// Code (monospace) font family /// @type List -$code-font-stack: 'Courier New', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Monaco', monospace !default; - - - - +$code-font-stack: "Courier New", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Monaco", monospace !default /// Copy text color /// @type Color -$text-color: rgb(34, 34, 34) !default; +$text-color: rgb(34, 34, 34) !default /// Main brand color /// @type Color -$brand-color: rgb(229, 0, 80) !default; +$brand-color: rgb(229, 0, 80) !default /// Light grey /// @type Color -$light-grey: rgb(237, 237, 237) !default; +$light-grey: rgb(237, 237, 237) !default /// Medium grey /// @type Color -$mid-grey: rgb(153, 153, 153) !default; +$mid-grey: rgb(153, 153, 153) !default /// Dark grey /// @type Color -$dark-grey: rgb(68, 68, 68) !default; - - - - +$dark-grey: rgb(68, 68, 68) !default /// Container's maximum width /// @type Length -$max-width: 1180px !default; - - - - +$max-width: 1180px !default /// Breakpoints map /// @prop {String} keys - Keys are identifiers mapped to a given length /// @prop {Map} values - Values are actual breakpoints expressed in pixels -$breakpoints: ( - 'small': 320px, - 'medium': 768px, - 'large': 1024px, -) !default; - - - - - +$breakpoints: ("small": 320px, "medium": 768px, "large": 1024px) !default /// Relative or absolute URL where all assets are served from /// @type String /// @example scss - When using a CDN /// $base-url: 'http://cdn.example.com/assets/'; -$base-url: '/assets/' !default; +$base-url: "/assets/" !default diff --git a/sass/abstracts/_variables.scss b/sass/abstracts/_variables.scss deleted file mode 100644 index b384464..0000000 --- a/sass/abstracts/_variables.scss +++ /dev/null @@ -1,71 +0,0 @@ -// ----------------------------------------------------------------------------- -// This file contains all application-wide Sass variables. -// ----------------------------------------------------------------------------- - - - - - -/// Regular font family -/// @type List -$text-font-stack: 'Open Sans', 'Helvetica Neue Light', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif !default; - -/// Code (monospace) font family -/// @type List -$code-font-stack: 'Courier New', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Monaco', monospace !default; - - - - - -/// Copy text color -/// @type Color -$text-color: rgb(34, 34, 34) !default; - -/// Main brand color -/// @type Color -$brand-color: rgb(229, 0, 80) !default; - -/// Light grey -/// @type Color -$light-grey: rgb(237, 237, 237) !default; - -/// Medium grey -/// @type Color -$mid-grey: rgb(153, 153, 153) !default; - -/// Dark grey -/// @type Color -$dark-grey: rgb(68, 68, 68) !default; - - - - - -/// Container's maximum width -/// @type Length -$max-width: 1180px !default; - - - - - -/// Breakpoints map -/// @prop {String} keys - Keys are identifiers mapped to a given length -/// @prop {Map} values - Values are actual breakpoints expressed in pixels -$breakpoints: ( - 'small': 320px, - 'medium': 768px, - 'large': 1024px, -) !default; - - - - - - -/// Relative or absolute URL where all assets are served from -/// @type String -/// @example scss - When using a CDN -/// $base-url: 'http://cdn.example.com/assets/'; -$base-url: '/assets/' !default; diff --git a/sass/base/README.md b/sass/base/README.md deleted file mode 100644 index c0bea08..0000000 --- a/sass/base/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Base - -The `base/` folder holds what we might call the boilerplate code for the project. In there, you might find some typographic rules, and probably a stylesheet (that I’m used to calling `_base.scss`), defining some standard styles for commonly used HTML elements. - -Reference: [Sass Guidelines](http://sass-guidelin.es/) > [Architecture](http://sass-guidelin.es/#architecture) > [Base folder](http://sass-guidelin.es/#base-folder) diff --git a/sass/base/_base.sass b/sass/base/_base.sass index a0759d8..ac8a86d 100644 --- a/sass/base/_base.sass +++ b/sass/base/_base.sass @@ -4,32 +4,25 @@ /** * Set up a decent box model on the root element - */ -html { - box-sizing: border-box; -} +html + box-sizing: border-box /** * Make all elements from the DOM inherit from the parent box-sizing * Since `*` has a specificity of 0, it does not override the `html` value * making all elements inheriting from the root box-sizing value * See: https://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ - */ *, *::before, -*::after { - box-sizing: inherit; -} +*::after + box-sizing: inherit /** * Basic styles for links - */ -a { - color: $brand-color; - text-decoration: none; +a + color: $brand-color + text-decoration: none - @include on-event { - color: $text-color; - text-decoration: underline; - } -} + +on-event + color: $text-color + text-decoration: underline diff --git a/sass/base/_base.scss b/sass/base/_base.scss deleted file mode 100644 index a0759d8..0000000 --- a/sass/base/_base.scss +++ /dev/null @@ -1,35 +0,0 @@ -// ----------------------------------------------------------------------------- -// This file contains very basic styles. -// ----------------------------------------------------------------------------- - -/** - * Set up a decent box model on the root element - */ -html { - box-sizing: border-box; -} - -/** - * Make all elements from the DOM inherit from the parent box-sizing - * Since `*` has a specificity of 0, it does not override the `html` value - * making all elements inheriting from the root box-sizing value - * See: https://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ - */ -*, -*::before, -*::after { - box-sizing: inherit; -} - -/** - * Basic styles for links - */ -a { - color: $brand-color; - text-decoration: none; - - @include on-event { - color: $text-color; - text-decoration: underline; - } -} diff --git a/sass/base/_fonts.scss b/sass/base/_fonts.scss deleted file mode 100644 index f8c445e..0000000 --- a/sass/base/_fonts.scss +++ /dev/null @@ -1,3 +0,0 @@ -// ----------------------------------------------------------------------------- -// This file contains all @font-face declarations, if any. -// ----------------------------------------------------------------------------- diff --git a/sass/base/_helpers.sass b/sass/base/_helpers.sass index 18d57c0..05e8025 100644 --- a/sass/base/_helpers.sass +++ b/sass/base/_helpers.sass @@ -4,52 +4,58 @@ /** * Clear inner floats - */ -.clearfix::after { - clear: both; - content: ''; - display: table; -} +.clearfix::after + clear: both + content: '' + display: table /** * Main content containers * 1. Make the container full-width with a maximum width * 2. Center it in the viewport * 3. Leave some space on the edges, especially valuable on small screens - */ -.container { - max-width: $max-width; /* 1 */ - margin-left: auto; /* 2 */ - margin-right: auto; /* 2 */ - padding-left: 20px; /* 3 */ - padding-right: 20px; /* 3 */ - width: 100%; /* 1 */ - } +.container + max-width: $max-width + + /* 1 + margin-left: auto + + /* 2 + margin-right: auto + + /* 2 + padding-left: 20px + + /* 3 + padding-right: 20px + + /* 3 + width: 100% + + /* 1 /** * Hide text while making it readable for screen readers * 1. Needed in WebKit-based browsers because of an implementation bug; * See: https://code.google.com/p/chromium/issues/detail?id=457146 - */ -.hide-text { - overflow: hidden; - padding: 0; /* 1 */ - text-indent: 101%; - white-space: nowrap; -} +.hide-text + overflow: hidden + padding: 0 + + /* 1 + text-indent: 101% + white-space: nowrap /** * Hide element while making it readable for screen readers * Shamelessly borrowed from HTML5Boilerplate: * https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css#L119-L133 - */ -.visually-hidden { - border: 0; - clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; -} +.visually-hidden + border: 0 + clip: rect(0 0 0 0) + height: 1px + margin: -1px + overflow: hidden + padding: 0 + position: absolute + width: 1px diff --git a/sass/base/_helpers.scss b/sass/base/_helpers.scss deleted file mode 100644 index 18d57c0..0000000 --- a/sass/base/_helpers.scss +++ /dev/null @@ -1,55 +0,0 @@ -// ----------------------------------------------------------------------------- -// This file contains CSS helper classes. -// ----------------------------------------------------------------------------- - -/** - * Clear inner floats - */ -.clearfix::after { - clear: both; - content: ''; - display: table; -} - -/** - * Main content containers - * 1. Make the container full-width with a maximum width - * 2. Center it in the viewport - * 3. Leave some space on the edges, especially valuable on small screens - */ -.container { - max-width: $max-width; /* 1 */ - margin-left: auto; /* 2 */ - margin-right: auto; /* 2 */ - padding-left: 20px; /* 3 */ - padding-right: 20px; /* 3 */ - width: 100%; /* 1 */ - } - -/** - * Hide text while making it readable for screen readers - * 1. Needed in WebKit-based browsers because of an implementation bug; - * See: https://code.google.com/p/chromium/issues/detail?id=457146 - */ -.hide-text { - overflow: hidden; - padding: 0; /* 1 */ - text-indent: 101%; - white-space: nowrap; -} - -/** - * Hide element while making it readable for screen readers - * Shamelessly borrowed from HTML5Boilerplate: - * https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css#L119-L133 - */ -.visually-hidden { - border: 0; - clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; -} diff --git a/sass/base/_typography.sass b/sass/base/_typography.sass index 3308593..3ed5a31 100644 --- a/sass/base/_typography.sass +++ b/sass/base/_typography.sass @@ -1,7 +1,5 @@ /** * Basic typography style for copy text - */ -body { - color: $text-color; - font: normal 125% / 1.4 $text-font-stack; -} +body + color: $text-color + font: normal 125% / 1.4 $text-font-stack diff --git a/sass/base/_typography.scss b/sass/base/_typography.scss deleted file mode 100644 index 3308593..0000000 --- a/sass/base/_typography.scss +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Basic typography style for copy text - */ -body { - color: $text-color; - font: normal 125% / 1.4 $text-font-stack; -} diff --git a/sass/components/README.md b/sass/components/README.md deleted file mode 100644 index ba7e8c4..0000000 --- a/sass/components/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Components - -For small components, there is the `components/` folder. While `layout/` is macro (defining the global wireframe), `components/` is more focused on widgets. It contains all kind of specific modules like a slider, a loader, a widget, and basically anything along those lines. There are usually a lot of files in components/ since the whole site/application should be mostly composed of tiny modules. - -Reference: [Sass Guidelines](http://sass-guidelin.es/) > [Architecture](http://sass-guidelin.es/#architecture) > [Components folder](http://sass-guidelin.es/#components-folder) diff --git a/sass/components/_button.scss b/sass/components/_button.scss deleted file mode 100644 index 170a2b4..0000000 --- a/sass/components/_button.scss +++ /dev/null @@ -1,3 +0,0 @@ -// ----------------------------------------------------------------------------- -// This file contains all styles related to the button component. -// ----------------------------------------------------------------------------- diff --git a/sass/layout/README.md b/sass/layout/README.md deleted file mode 100644 index 3360301..0000000 --- a/sass/layout/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Layout - -The `layout/` folder contains everything that takes part in laying out the site or application. This folder could have stylesheets for the main parts of the site (header, footer, navigation, sidebar…), the grid system or even CSS styles for all the forms. - -Reference: [Sass Guidelines](http://sass-guidelin.es/) > [Architecture](http://sass-guidelin.es/#architecture) > [Layout folder](http://sass-guidelin.es/#layout-folder) diff --git a/sass/layout/_footer.scss b/sass/layout/_footer.scss deleted file mode 100644 index 7f45c71..0000000 --- a/sass/layout/_footer.scss +++ /dev/null @@ -1,3 +0,0 @@ -// ----------------------------------------------------------------------------- -// This file contains all styles related to the footer of the site/application. -// ----------------------------------------------------------------------------- diff --git a/sass/layout/_header.scss b/sass/layout/_header.scss deleted file mode 100644 index 69c86bb..0000000 --- a/sass/layout/_header.scss +++ /dev/null @@ -1,3 +0,0 @@ -// ----------------------------------------------------------------------------- -// This file contains all styles related to the header of the site/application. -// ----------------------------------------------------------------------------- diff --git a/sass/main.sass b/sass/main.sass index 206757e..ecb4a71 100644 --- a/sass/main.sass +++ b/sass/main.sass @@ -1,35 +1,35 @@ -@charset 'UTF-8'; +@charset "UTF-8" // 1. Configuration and helpers -@import - 'abstracts/variables', - 'abstracts/functions', - 'abstracts/mixins'; + +@import abstracts/variables +@import abstracts/functions +@import abstracts/mixins // 2. Vendors -@import - 'vendors/normalize'; + +@import vendors/normalize // 3. Base stuff -@import - 'base/base', - 'base/fonts', - 'base/typography', - 'base/helpers'; + +@import base/base +@import base/fonts +@import base/typography +@import base/helpers // 4. Layout-related sections -@import - 'layout/header', - 'layout/footer'; + +@import layout/header +@import layout/footer // 5. Components -@import - 'components/button'; + +@import components/button // 6. Page-specific styles -@import - 'pages/home'; + +@import pages/home // 7. Themes -@import - 'themes/default'; + +@import themes/default diff --git a/sass/main.scss b/sass/main.scss deleted file mode 100644 index 206757e..0000000 --- a/sass/main.scss +++ /dev/null @@ -1,35 +0,0 @@ -@charset 'UTF-8'; - -// 1. Configuration and helpers -@import - 'abstracts/variables', - 'abstracts/functions', - 'abstracts/mixins'; - -// 2. Vendors -@import - 'vendors/normalize'; - -// 3. Base stuff -@import - 'base/base', - 'base/fonts', - 'base/typography', - 'base/helpers'; - -// 4. Layout-related sections -@import - 'layout/header', - 'layout/footer'; - -// 5. Components -@import - 'components/button'; - -// 6. Page-specific styles -@import - 'pages/home'; - -// 7. Themes -@import - 'themes/default'; diff --git a/sass/pages/README.md b/sass/pages/README.md deleted file mode 100644 index 4e6c630..0000000 --- a/sass/pages/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Pages - -If you have page-specific styles, it is better to put them in a `pages/` folder, in a file named after the page. For instance, it’s not uncommon to have very specific styles for the home page hence the need for a `_home.scss` file in `pages/`. - -*Note — Depending on your deployment process, these files could be called on their own to avoid merging them with the others in the resulting stylesheet. It is really up to you.* - -Reference: [Sass Guidelines](http://sass-guidelin.es/) > [Architecture](http://sass-guidelin.es/#architecture) > [Pages folder](http://sass-guidelin.es/#pages-folder) diff --git a/sass/pages/_home.scss b/sass/pages/_home.scss deleted file mode 100644 index 53e07a7..0000000 --- a/sass/pages/_home.scss +++ /dev/null @@ -1,3 +0,0 @@ -// ----------------------------------------------------------------------------- -// This file contains styles that are specific to the home page. -// ----------------------------------------------------------------------------- diff --git a/sass/themes/README.md b/sass/themes/README.md deleted file mode 100644 index 40cb0e4..0000000 --- a/sass/themes/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Theme - -On large sites and applications, it is not unusual to have different themes. There are certainly different ways of dealing with themes but I personally like having them all in a `themes/` folder. - -*Note — This is very project-specific and is likely to be non-existent on many projects.* - -Reference: [Sass Guidelines](http://sass-guidelin.es/) > [Architecture](http://sass-guidelin.es/#architecture) > [Themes folder](http://sass-guidelin.es/#themes-folder) diff --git a/sass/themes/_default.scss b/sass/themes/_default.scss deleted file mode 100644 index 4be9bba..0000000 --- a/sass/themes/_default.scss +++ /dev/null @@ -1,4 +0,0 @@ -// ----------------------------------------------------------------------------- -// When having several themes, this file contains everything related to the -// default one. -// ----------------------------------------------------------------------------- diff --git a/sass/vendors/README.md b/sass/vendors/README.md deleted file mode 100644 index 546f2de..0000000 --- a/sass/vendors/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Vendors - -Most projects will have a `vendors/` folder containing all the CSS files from external libraries and frameworks – Normalize, Bootstrap, jQueryUI, FancyCarouselSliderjQueryPowered, and so on. Putting those aside in the same folder is a good way to say “Hey, this is not from me, not my code, not my responsibility”. - -If you have to override a section of any vendor, I recommend you have an 8th folder called `vendors-extensions/` in which you may have files named exactly after the vendors they overwrite. For instance, `vendors-extensions/_bootstrap.scss` is a file containing all CSS rules intended to re-declare some of Bootstrap’s default CSS. This is to avoid editing the vendor files themselves, which is generally not a good idea. - -Reference: [Sass Guidelines](http://sass-guidelin.es/) > [Architecture](http://sass-guidelin.es/#architecture) > [Vendors folder](http://sass-guidelin.es/#vendors-folder) diff --git a/sass/vendors/_normalize.sass b/sass/vendors/_normalize.sass index 9b77e0e..de987a8 100644 --- a/sass/vendors/_normalize.sass +++ b/sass/vendors/_normalize.sass @@ -1,461 +1,448 @@ -/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */ +/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css /** * 1. Change the default font family in all browsers (opinionated). * 2. Correct the line height in all browsers. * 3. Prevent adjustments of font size after orientation changes in * IE on Windows Phone and in iOS. - */ /* Document - ========================================================================== */ + * ========================================================================== -html { - font-family: sans-serif; /* 1 */ - line-height: 1.15; /* 2 */ - -ms-text-size-adjust: 100%; /* 3 */ - -webkit-text-size-adjust: 100%; /* 3 */ -} +html + font-family: sans-serif + + /* 1 + line-height: 1.15 + + /* 2 + -ms-text-size-adjust: 100% + + /* 3 + -webkit-text-size-adjust: 100% + + /* 3 /* Sections - ========================================================================== */ + * ========================================================================== /** * Remove the margin in all browsers (opinionated). - */ -body { - margin: 0; -} +body + margin: 0 /** * Add the correct display in IE 9-. - */ article, aside, footer, header, nav, -section { - display: block; -} +section + display: block /** * Correct the font size and margin on `h1` elements within `section` and * `article` contexts in Chrome, Firefox, and Safari. - */ -h1 { - font-size: 2em; - margin: 0.67em 0; -} +h1 + font-size: 2em + margin: 0.67em 0 /* Grouping content - ========================================================================== */ + * ========================================================================== /** * Add the correct display in IE 9-. * 1. Add the correct display in IE. - */ figcaption, figure, -main { /* 1 */ - display: block; -} +main + /* 1 + display: block /** * Add the correct margin in IE 8. - */ -figure { - margin: 1em 40px; -} +figure + margin: 1em 40px /** * 1. Add the correct box sizing in Firefox. * 2. Show the overflow in Edge and IE. - */ -hr { - box-sizing: content-box; /* 1 */ - height: 0; /* 1 */ - overflow: visible; /* 2 */ -} +hr + box-sizing: content-box + + /* 1 + height: 0 + + /* 1 + overflow: visible + + /* 2 /** * 1. Correct the inheritance and scaling of font size in all browsers. * 2. Correct the odd `em` font sizing in all browsers. - */ -pre { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} +pre + 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+. - */ -a { - background-color: transparent; /* 1 */ - -webkit-text-decoration-skip: objects; /* 2 */ -} +a + background-color: transparent + + /* 1 + -webkit-text-decoration-skip: objects + + /* 2 /** * Remove the outline on focused links when they are also active or hovered * in all browsers (opinionated). - */ a:active, -a:hover { - outline-width: 0; -} +a:hover + outline-width: 0 /** * 1. Remove the bottom border in Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. - */ -abbr[title] { - border-bottom: none; /* 1 */ - text-decoration: underline; /* 2 */ - text-decoration: underline dotted; /* 2 */ -} +abbr[title] + border-bottom: none + + /* 1 + text-decoration: underline + + /* 2 + text-decoration: underline dotted + + /* 2 /** * Prevent the duplicate application of `bolder` by the next rule in Safari 6. - */ b, -strong { - font-weight: inherit; -} +strong + font-weight: inherit /** * Add the correct font weight in Chrome, Edge, and Safari. - */ b, -strong { - font-weight: bolder; -} +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 */ -} +samp + font-family: monospace, monospace + + /* 1 + font-size: 1em + + /* 2 /** * Add the correct font style in Android 4.3-. - */ -dfn { - font-style: italic; -} +dfn + font-style: italic /** * Add the correct background and color in IE 9-. - */ -mark { - background-color: #ff0; - color: #000; -} +mark + background-color: #ff0 + color: #000 /** * Add the correct font size in all browsers. - */ -small { - font-size: 80%; -} +small + font-size: 80% /** * Prevent `sub` and `sup` elements from affecting the line height in * all browsers. - */ sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} +sup + font-size: 75% + line-height: 0 + position: relative + vertical-align: baseline -sub { - bottom: -0.25em; -} +sub + bottom: -0.25em -sup { - top: -0.5em; -} +sup + top: -0.5em /* Embedded content - ========================================================================== */ + * ========================================================================== /** * Add the correct display in IE 9-. - */ audio, -video { - display: inline-block; -} +video + display: inline-block /** * Add the correct display in iOS 4-7. - */ -audio:not([controls]) { - display: none; - height: 0; -} +audio:not([controls]) + display: none + height: 0 /** * Remove the border on images inside links in IE 10-. - */ -img { - border-style: none; -} +img + border-style: none /** * Hide the overflow in IE. - */ -svg:not(:root) { - overflow: hidden; -} +svg:not(:root) + overflow: hidden /* Forms - ========================================================================== */ + * ========================================================================== /** * 1. Change the font styles in all browsers (opinionated). * 2. Remove the margin in Firefox and Safari. - */ button, input, optgroup, select, -textarea { - font-family: sans-serif; /* 1 */ - font-size: 100%; /* 1 */ - line-height: 1.15; /* 1 */ - margin: 0; /* 2 */ -} +textarea + font-family: sans-serif + + /* 1 + font-size: 100% + + /* 1 + line-height: 1.15 + + /* 1 + margin: 0 + + /* 2 /** * Show the overflow in IE. * 1. Show the overflow in Edge. - */ button, -input { /* 1 */ - overflow: visible; -} +input + /* 1 + overflow: visible /** * Remove the inheritance of text transform in Edge, Firefox, and IE. * 1. Remove the inheritance of text transform in Firefox. - */ button, -select { /* 1 */ - text-transform: none; -} +select + /* 1 + text-transform: none /** * 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, -html [type="button"], /* 1 */ +html [type="button"], [type="reset"], -[type="submit"] { - -webkit-appearance: button; /* 2 */ -} +[type="submit"] + -webkit-appearance: button + + /* 2 /** * Remove the inner border and padding in Firefox. - */ button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { - border-style: none; - padding: 0; -} +[type="submit"]::-moz-focus-inner + border-style: none + padding: 0 /** * Restore the focus styles unset by the previous rule. - */ button:-moz-focusring, [type="button"]:-moz-focusring, [type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { - outline: 1px dotted ButtonText; -} +[type="submit"]:-moz-focusring + outline: 1px dotted ButtonText /** * Change the border, margin, and padding in all browsers (opinionated). - */ -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; -} +fieldset + border: 1px solid #c0c0c0 + margin: 0 2px + padding: 0.35em 0.625em 0.75em /** * 1. Correct the text wrapping in Edge and IE. * 2. Correct the color inheritance from `fieldset` elements in IE. * 3. Remove the padding so developers are not caught out when they zero out * `fieldset` elements in all browsers. - */ -legend { - box-sizing: border-box; /* 1 */ - color: inherit; /* 2 */ - display: table; /* 1 */ - max-width: 100%; /* 1 */ - padding: 0; /* 3 */ - white-space: normal; /* 1 */ -} +legend + box-sizing: border-box + + /* 1 + color: inherit + + /* 2 + display: table + + /* 1 + max-width: 100% + + /* 1 + padding: 0 + + /* 3 + white-space: normal + + /* 1 /** * 1. Add the correct display in IE 9-. * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ -progress { - display: inline-block; /* 1 */ - vertical-align: baseline; /* 2 */ -} +progress + display: inline-block + + /* 1 + vertical-align: baseline + + /* 2 /** * Remove the default vertical scrollbar in IE. - */ -textarea { - overflow: auto; -} +textarea + overflow: auto /** * 1. Add the correct box sizing in IE 10-. * 2. Remove the padding in IE 10-. - */ [type="checkbox"], -[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} +[type="radio"] + box-sizing: border-box + + /* 1 + padding: 0 + + /* 2 /** * Correct the cursor style of increment and decrement buttons in Chrome. - */ [type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { - height: auto; -} +[type="number"]::-webkit-outer-spin-button + height: auto /** * 1. Correct the odd appearance in Chrome and Safari. * 2. Correct the outline style in Safari. - */ -[type="search"] { - -webkit-appearance: textfield; /* 1 */ - outline-offset: -2px; /* 2 */ -} +[type="search"] + -webkit-appearance: textfield + + /* 1 + outline-offset: -2px + + /* 2 /** * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. - */ [type="search"]::-webkit-search-cancel-button, -[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} +[type="search"]::-webkit-search-decoration + -webkit-appearance: none /** * 1. Correct the inability to style clickable types in iOS and Safari. * 2. Change font properties to `inherit` in Safari. - */ -::-webkit-file-upload-button { - -webkit-appearance: button; /* 1 */ - font: inherit; /* 2 */ -} +\::-webkit-file-upload-button + -webkit-appearance: button + + /* 1 + font: inherit + + /* 2 /* Interactive - ========================================================================== */ + * ========================================================================== /* * Add the correct display in IE 9-. * 1. Add the correct display in Edge, IE, and Firefox. - */ -details, /* 1 */ -menu { - display: block; -} +details, +menu + display: block /* * Add the correct display in all browsers. - */ -summary { - display: list-item; -} +summary + display: list-item /* Scripting - ========================================================================== */ + * ========================================================================== /** * Add the correct display in IE 9-. - */ -canvas { - display: inline-block; -} +canvas + display: inline-block /** * Add the correct display in IE. - */ -template { - display: none; -} +template + display: none /* Hidden - ========================================================================== */ + * ========================================================================== /** * Add the correct display in IE 10-. - */ -[hidden] { - display: none; -} +[hidden] + display: none diff --git a/sass/vendors/_normalize.scss b/sass/vendors/_normalize.scss deleted file mode 100644 index 9b77e0e..0000000 --- a/sass/vendors/_normalize.scss +++ /dev/null @@ -1,461 +0,0 @@ -/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */ - -/** - * 1. Change the default font family in all browsers (opinionated). - * 2. Correct the line height in all browsers. - * 3. Prevent adjustments of font size after orientation changes in - * IE on Windows Phone and in iOS. - */ - -/* Document - ========================================================================== */ - -html { - font-family: sans-serif; /* 1 */ - line-height: 1.15; /* 2 */ - -ms-text-size-adjust: 100%; /* 3 */ - -webkit-text-size-adjust: 100%; /* 3 */ -} - -/* Sections - ========================================================================== */ - -/** - * Remove the margin in all browsers (opinionated). - */ - -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. - */ - -h1 { - font-size: 2em; - margin: 0.67em 0; -} - -/* Grouping content - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - * 1. Add the correct display in IE. - */ - -figcaption, -figure, -main { /* 1 */ - display: block; -} - -/** - * Add the correct margin in IE 8. - */ - -figure { - margin: 1em 40px; -} - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ - -hr { - box-sizing: content-box; /* 1 */ - height: 0; /* 1 */ - overflow: visible; /* 2 */ -} - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -pre { - 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+. - */ - -a { - background-color: transparent; /* 1 */ - -webkit-text-decoration-skip: objects; /* 2 */ -} - -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ - -a:active, -a:hover { - outline-width: 0; -} - -/** - * 1. Remove the bottom border in Firefox 39-. - * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. - */ - -abbr[title] { - border-bottom: none; /* 1 */ - text-decoration: underline; /* 2 */ - text-decoration: underline dotted; /* 2 */ -} - -/** - * Prevent the duplicate application of `bolder` by the next rule in Safari 6. - */ - -b, -strong { - font-weight: inherit; -} - -/** - * Add the correct font weight in Chrome, Edge, and Safari. - */ - -b, -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-. - */ - -dfn { - font-style: italic; -} - -/** - * Add the correct background and color in IE 9-. - */ - -mark { - background-color: #ff0; - color: #000; -} - -/** - * Add the correct font size in all browsers. - */ - -small { - font-size: 80%; -} - -/** - * Prevent `sub` and `sup` elements from affecting the line height in - * all browsers. - */ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -/* Embedded content - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - */ - -audio, -video { - display: inline-block; -} - -/** - * Add the correct display in iOS 4-7. - */ - -audio:not([controls]) { - display: none; - height: 0; -} - -/** - * Remove the border on images inside links in IE 10-. - */ - -img { - border-style: none; -} - -/** - * Hide the overflow in IE. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* Forms - ========================================================================== */ - -/** - * 1. Change the font styles in all browsers (opinionated). - * 2. Remove the margin in Firefox and Safari. - */ - -button, -input, -optgroup, -select, -textarea { - font-family: sans-serif; /* 1 */ - font-size: 100%; /* 1 */ - line-height: 1.15; /* 1 */ - margin: 0; /* 2 */ -} - -/** - * Show the overflow in IE. - * 1. Show the overflow in Edge. - */ - -button, -input { /* 1 */ - overflow: visible; -} - -/** - * Remove the inheritance of text transform in Edge, Firefox, and IE. - * 1. Remove the inheritance of text transform in Firefox. - */ - -button, -select { /* 1 */ - text-transform: none; -} - -/** - * 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, -html [type="button"], /* 1 */ -[type="reset"], -[type="submit"] { - -webkit-appearance: button; /* 2 */ -} - -/** - * Remove the inner border and padding in Firefox. - */ - -button::-moz-focus-inner, -[type="button"]::-moz-focus-inner, -[type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { - border-style: none; - padding: 0; -} - -/** - * Restore the focus styles unset by the previous rule. - */ - -button:-moz-focusring, -[type="button"]:-moz-focusring, -[type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { - outline: 1px dotted ButtonText; -} - -/** - * Change the border, margin, and padding in all browsers (opinionated). - */ - -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; -} - -/** - * 1. Correct the text wrapping in Edge and IE. - * 2. Correct the color inheritance from `fieldset` elements in IE. - * 3. Remove the padding so developers are not caught out when they zero out - * `fieldset` elements in all browsers. - */ - -legend { - box-sizing: border-box; /* 1 */ - color: inherit; /* 2 */ - display: table; /* 1 */ - max-width: 100%; /* 1 */ - padding: 0; /* 3 */ - white-space: normal; /* 1 */ -} - -/** - * 1. Add the correct display in IE 9-. - * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ - -progress { - display: inline-block; /* 1 */ - vertical-align: baseline; /* 2 */ -} - -/** - * Remove the default vertical scrollbar in IE. - */ - -textarea { - overflow: auto; -} - -/** - * 1. Add the correct box sizing in IE 10-. - * 2. Remove the padding in IE 10-. - */ - -[type="checkbox"], -[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} - -/** - * Correct the cursor style of increment and decrement buttons in Chrome. - */ - -[type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { - height: auto; -} - -/** - * 1. Correct the odd appearance in Chrome and Safari. - * 2. Correct the outline style in Safari. - */ - -[type="search"] { - -webkit-appearance: textfield; /* 1 */ - outline-offset: -2px; /* 2 */ -} - -/** - * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. - */ - -[type="search"]::-webkit-search-cancel-button, -[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * 1. Correct the inability to style clickable types in iOS and Safari. - * 2. Change font properties to `inherit` in Safari. - */ - -::-webkit-file-upload-button { - -webkit-appearance: button; /* 1 */ - font: inherit; /* 2 */ -} - -/* Interactive - ========================================================================== */ - -/* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. - */ - -details, /* 1 */ -menu { - display: block; -} - -/* - * Add the correct display in all browsers. - */ - -summary { - display: list-item; -} - -/* Scripting - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - */ - -canvas { - display: inline-block; -} - -/** - * Add the correct display in IE. - */ - -template { - display: none; -} - -/* Hidden - ========================================================================== */ - -/** - * Add the correct display in IE 10-. - */ - -[hidden] { - display: none; -}