version 6.1.0
see changelog
This commit is contained in:
Raphael Goetter
parent
0a5de6e6c2
commit
e29a67981e
11 changed files with 472 additions and 284 deletions
|
|
@ -1,14 +1,24 @@
|
|||
// Config file and project variables
|
||||
|
||||
// font sizes
|
||||
$base-font-size : 1.6rem !default; // ex. 1.6rem would be "16px" equivalent
|
||||
$line-height : 1.5 !default; // equiv line-height 1.5
|
||||
$h1-size : 3.2rem !default; // equiv "32px"
|
||||
$h2-size : 2.8rem !default; // equiv "28px"
|
||||
$h3-size : 2.4rem !default; // equiv "24px"
|
||||
$h4-size : 2.0rem !default; // equiv "20px"
|
||||
$h5-size : 1.8rem !default; // equiv "18px"
|
||||
$h6-size : 1.6rem !default; // equiv "16px"
|
||||
// tiny font sizes (mobile first)
|
||||
$base-font-size : 1.4rem !default; // ex. 1.4rem would be "14px" equivalent
|
||||
$line-height : 1.4 !default;
|
||||
$h1-size : 2.8rem !default; // equiv "28px"
|
||||
$h2-size : 2.4rem !default; // equiv "24px"
|
||||
$h3-size : 2.0rem !default; // equiv "20px"
|
||||
$h4-size : 1.8rem !default; // equiv "18px"
|
||||
$h5-size : 1.6rem !default; // equiv "18px"
|
||||
$h6-size : 1.4rem !default; // equiv "14px"
|
||||
|
||||
// large font sizes
|
||||
$base-font-size-l : 1.6rem !default; // ex. 1.6rem would be "16px" equivalent
|
||||
$line-height-l : 1.5 !default;
|
||||
$h1-size-l : 3.2rem !default; // equiv "32px"
|
||||
$h2-size-l : 2.8rem !default; // equiv "28px"
|
||||
$h3-size-l : 2.4rem !default; // equiv "24px"
|
||||
$h4-size-l : 2.0rem !default; // equiv "20px"
|
||||
$h5-size-l : 1.8rem !default; // equiv "18px"
|
||||
$h6-size-l : 1.6rem !default; // equiv "16px"
|
||||
|
||||
// font stacks
|
||||
$font-stack-common : sans-serif !default; // common font
|
||||
|
|
@ -23,12 +33,13 @@ $color4 : #000 !default;
|
|||
$color5 : #6FA939 !default;
|
||||
|
||||
// colors used in project
|
||||
$base-color: $color1;
|
||||
$link-color: $color3;
|
||||
$base-background : $color2;
|
||||
$color-base : $color1;
|
||||
$color-link : $color3;
|
||||
$background-base : $color2;
|
||||
|
||||
// If you don't want any effect on focused/hovered links,
|
||||
// comment variable below or make it equal to either $link-color or false or null
|
||||
$link-hover-color: $color4;
|
||||
// comment variable below or make it equal to either $color-link or false or null
|
||||
$color-link-hover: $color4;
|
||||
$brand-primary: $color5;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,25 @@
|
|||
/*! normalize.css v4.1.1 | 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. Prevent adjustments of font size after orientation changes in IE and iOS.
|
||||
* 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 */
|
||||
-ms-text-size-adjust: 100%; /* 2 */
|
||||
-webkit-text-size-adjust: 100%; /* 2 */
|
||||
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).
|
||||
*/
|
||||
|
|
@ -19,69 +28,73 @@ body {
|
|||
margin: 0;
|
||||
}
|
||||
|
||||
/* HTML5 display definitions
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Add the correct display in IE 9-.
|
||||
* 1. Add the correct display in Edge, IE, and Firefox.
|
||||
* 2. Add the correct display in IE.
|
||||
*/
|
||||
|
||||
article,
|
||||
aside,
|
||||
details, /* 1 */
|
||||
figcaption,
|
||||
figure,
|
||||
footer,
|
||||
header,
|
||||
main, /* 2 */
|
||||
menu,
|
||||
nav,
|
||||
section,
|
||||
summary { /* 1 */
|
||||
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-.
|
||||
*/
|
||||
|
||||
audio,
|
||||
canvas,
|
||||
progress,
|
||||
video {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the correct display in iOS 4-7.
|
||||
*/
|
||||
|
||||
audio:not([controls]) {
|
||||
display: none;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
|
||||
*/
|
||||
|
||||
progress {
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the correct display in IE 10-.
|
||||
* 1. Add the correct display in IE.
|
||||
*/
|
||||
|
||||
template, /* 1 */
|
||||
[hidden] {
|
||||
display: none;
|
||||
figcaption,
|
||||
figure,
|
||||
main { /* 1 */
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* Links
|
||||
/**
|
||||
* 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
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
|
|
@ -104,9 +117,6 @@ a:hover {
|
|||
outline-width: 0;
|
||||
}
|
||||
|
||||
/* Text-level semantics
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* 1. Remove the bottom border in Firefox 39-.
|
||||
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
|
||||
|
|
@ -136,6 +146,18 @@ 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-.
|
||||
*/
|
||||
|
|
@ -144,16 +166,6 @@ dfn {
|
|||
font-style: italic;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the correct background and color in IE 9-.
|
||||
*/
|
||||
|
|
@ -195,6 +207,24 @@ sup {
|
|||
/* 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-.
|
||||
*/
|
||||
|
|
@ -211,65 +241,25 @@ svg:not(:root) {
|
|||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* Grouping content
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* 1. Correct the inheritance and scaling of font size in all browsers.
|
||||
* 2. Correct the odd `em` font sizing in all browsers.
|
||||
*/
|
||||
|
||||
code,
|
||||
kbd,
|
||||
pre,
|
||||
samp {
|
||||
font-family: monospace, monospace; /* 1 */
|
||||
font-size: 1em; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* 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 */
|
||||
}
|
||||
|
||||
/* Forms
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* 1. Change font properties to `inherit` in all browsers (opinionated).
|
||||
* 1. Change the font styles in all browsers (opinionated).
|
||||
* 2. Remove the margin in Firefox and Safari.
|
||||
*/
|
||||
|
||||
button,
|
||||
input,
|
||||
optgroup,
|
||||
select,
|
||||
textarea {
|
||||
font: inherit; /* 1 */
|
||||
font-family: sans-serif; /* 1 */
|
||||
font-size: 100%; /* 1 */
|
||||
line-height: 1.15; /* 1 */
|
||||
margin: 0; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore the font weight unset by the previous rule.
|
||||
*/
|
||||
|
||||
optgroup {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the overflow in IE.
|
||||
* 1. Show the overflow in Edge.
|
||||
|
|
@ -352,6 +342,16 @@ legend {
|
|||
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.
|
||||
*/
|
||||
|
|
@ -391,7 +391,7 @@ textarea {
|
|||
}
|
||||
|
||||
/**
|
||||
* Remove the inner padding and cancel buttons in Chrome and Safari on OS X.
|
||||
* Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
|
||||
*/
|
||||
|
||||
[type="search"]::-webkit-search-cancel-button,
|
||||
|
|
@ -399,15 +399,6 @@ textarea {
|
|||
-webkit-appearance: none;
|
||||
}
|
||||
|
||||
/**
|
||||
* Correct the text style of placeholders in Chrome, Edge, and Safari.
|
||||
*/
|
||||
|
||||
::-webkit-input-placeholder {
|
||||
color: inherit;
|
||||
opacity: 0.54;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct the inability to style clickable types in iOS and Safari.
|
||||
* 2. Change font properties to `inherit` in Safari.
|
||||
|
|
@ -417,3 +408,54 @@ textarea {
|
|||
-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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,23 +21,33 @@ html {
|
|||
|
||||
body {
|
||||
font-size: $base-font-size;
|
||||
background-color: $base-background;
|
||||
color: $base-color;
|
||||
@if variable_exists(base-font-size-l) and $base-font-size-l != $base-font-size {
|
||||
@include respond-to("tiny-up") {
|
||||
font-size: $base-font-size-l;
|
||||
}
|
||||
}
|
||||
background-color: $background-base;
|
||||
color: $color-base;
|
||||
font-family: $font-stack-common;
|
||||
line-height: $line-height;
|
||||
@if variable_exists(line-height-l) and $line-height-l != $line-height {
|
||||
@include respond-to("tiny-up") {
|
||||
line-height: $line-height-l;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
a {
|
||||
color: $link-color;
|
||||
color: $color-link;
|
||||
|
||||
// No styling on focus/hover if there's no effect. Avoids to then have to
|
||||
// override it countless times. See Issue #232
|
||||
@if variable_exists(link-hover-color) and
|
||||
( null == index( ($link-color, null, false), $link-hover-color) ) {
|
||||
@if variable_exists(color-link-hover) and
|
||||
( null == index( ($color-link, null, false), $color-link-hover) ) {
|
||||
&:focus,
|
||||
&:hover,
|
||||
&:active {
|
||||
color: $link-hover-color;
|
||||
color: $color-link-hover;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -79,6 +89,11 @@ figure {
|
|||
|
||||
h1, .#{$kna-namespace}h1-like {
|
||||
font-size: $h1-size;
|
||||
@if variable_exists(h1-size-l) and $h1-size-l != $h1-size {
|
||||
@include respond-to("tiny-up") {
|
||||
font-size: $h1-size-l;
|
||||
}
|
||||
}
|
||||
@if variable_exists(font-stack-headings) and $font-stack-headings != $font-stack-common {
|
||||
font-family: $font-stack-headings;
|
||||
}
|
||||
|
|
@ -86,6 +101,11 @@ h1, .#{$kna-namespace}h1-like {
|
|||
|
||||
h2, .#{$kna-namespace}h2-like {
|
||||
font-size: $h2-size;
|
||||
@if variable_exists(h2-size-l) and $h2-size-l != $h2-size {
|
||||
@include respond-to("tiny-up") {
|
||||
font-size: $h2-size-l;
|
||||
}
|
||||
}
|
||||
@if variable_exists(font-stack-headings) and $font-stack-headings != $font-stack-common {
|
||||
font-family: $font-stack-headings;
|
||||
}
|
||||
|
|
@ -93,18 +113,38 @@ h2, .#{$kna-namespace}h2-like {
|
|||
|
||||
h3, .#{$kna-namespace}h3-like {
|
||||
font-size: $h3-size;
|
||||
@if variable_exists(h3-size-l) and $h3-size-l != $h3-size {
|
||||
@include respond-to("tiny-up") {
|
||||
font-size: $h3-size-l;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
h4, .#{$kna-namespace}h4-like {
|
||||
font-size: $h4-size;
|
||||
@if variable_exists(h4-size-l) and $h4-size-l != $h4-size {
|
||||
@include respond-to("tiny-up") {
|
||||
font-size: $h4-size-l;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
h5, .#{$kna-namespace}h5-like {
|
||||
font-size: $h5-size;
|
||||
@if variable_exists(h5-size-l) and $h5-size-l != $h5-size {
|
||||
@include respond-to("tiny-up") {
|
||||
font-size: $h5-size-l;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
h6, .#{$kna-namespace}h6-like {
|
||||
font-size: $h6-size;
|
||||
@if variable_exists(h6-size-l) and $h6-size-l != $h6-size {
|
||||
@include respond-to("tiny-up") {
|
||||
font-size: $h1-size-l;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* alternate font-sizing */
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ input,
|
|||
optgroup,
|
||||
select,
|
||||
textarea {
|
||||
color: $base-color;
|
||||
color: $color-base;
|
||||
}
|
||||
|
||||
label {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue