Browse Source

bugfix for config

erase body vars
master
HerrHase 7 years ago
parent
commit
3cb3c7f863
8 changed files with 209 additions and 120 deletions
  1. +98
    -1
      dest/css/styles.css
  2. +1
    -1
      dest/css/styles.min.css
  3. +1
    -1
      package.json
  4. +103
    -105
      src/scss/_base.scss
  5. +3
    -9
      src/scss/_config.scss
  6. +1
    -1
      src/scss/components/_code.scss
  7. +1
    -1
      src/scss/components/_icon.scss
  8. +1
    -1
      src/scss/components/field/_field.scss

+ 98
- 1
dest/css/styles.css
File diff suppressed because it is too large
View File


+ 1
- 1
dest/css/styles.min.css
File diff suppressed because it is too large
View File


+ 1
- 1
package.json View File

@ -1,6 +1,6 @@
{ {
"name": "crispy-boilerplate", "name": "crispy-boilerplate",
"version": "0.9.5", "version": "0.9.6",
"description": "Flat Sass Boilerplate to give you a amount of Basic Settings, Mixins and Functions", "description": "Flat Sass Boilerplate to give you a amount of Basic Settings, Mixins and Functions",
"repository": { "repository": {
"type": "git", "type": "git",


+ 103
- 105
src/scss/_base.scss View File

@ -6,135 +6,133 @@
* *
*/ */
@mixin crispy__base() { html {
html { font-size: 100%;
font-size: 100%; }
}
body,
html {
height: 100%;
}
html, body,
legend { html {
box-sizing: border-box; height: 100%;
} }
*, html,
*::after, legend {
*::before { box-sizing: border-box;
box-sizing: inherit; }
}
table { *,
border-collapse: collapse; *::after,
border-spacing: 0; *::before {
} box-sizing: inherit;
}
// paragraphs table {
p { border-collapse: collapse;
margin: toEm(0 0 $crispy__margin 0); border-spacing: 0;
} }
// Semantic text elements // paragraphs
a, p {
ins, margin: toEm(0 0 $crispy__margin 0);
u { }
text-decoration-skip: ink edges;
}
a { // Semantic text elements
color: $crispy__color-primary; a,
ins,
u {
text-decoration-skip: ink edges;
}
&:hover { a {
color: $crispy__color-text; color: $crispy__color-primary;
}
&:focus { &:hover {
outline: none; color: $crispy__color-text;
}
} }
abbr[title] { &:focus {
border-bottom: 1px dotted; outline: none;
cursor: help;
text-decoration: none;
} }
}
kbd { abbr[title] {
// @TODO do something border-bottom: 1px dotted;
} cursor: help;
text-decoration: none;
}
mark { kbd {
padding: toEm(10px); // @TODO do something
} }
mark {
padding: toEm(10px);
}
// blockquote // blockquote
blockquote { blockquote {
border-left: 1px solid $crispy__color-secondary; border-left: 1px solid $crispy__color-secondary;
margin-left: 0; margin-left: 0;
padding: toEm(10px 20px); padding: toEm(10px 20px);
p:last-child { p:last-child {
margin-bottom: 0; margin-bottom: 0;
}
} }
}
// lists // lists
dl, dl,
ol, ol,
ul { ul {
padding: 0; padding: 0;
margin: toEm(0 0 $crispy__margin $crispy__margin); margin: toEm(0 0 $crispy__margin $crispy__margin);
} }
ol ol, ol ol,
ul ul { ul ul {
margin-top: toEm(($crispy__margin / 2)); margin-top: toEm(($crispy__margin / 2));
} }
ol { ol {
list-style: decimal inside; list-style: decimal inside;
} }
ul { ul {
list-style: disc inside; list-style: disc inside;
} }
dd, dd,
dt { dt {
margin: 0; margin: 0;
} }
dt { dt {
font-weight: bold; font-weight: bold;
} }
// media // media
figure { figure {
margin: toEm(0 0 $crispy__margin); margin: toEm(0 0 $crispy__margin);
} }
figcaption { figcaption {
margin: toEm($crispy__margin 0 0); margin: toEm($crispy__margin 0 0);
} }
// divider // divider
hr { hr {
border: 0; border: 0;
border-top: 1px solid $crispy__color-secondary; border-top: 1px solid $crispy__color-secondary;
margin: toEm($crispy__margin 0); margin: toEm($crispy__margin 0);
} }
// body // body
body { body {
font-family: $crispy__body__font-family; font-family: $crispy__font-family;
font-weight: normal; font-weight: normal;
line-height: $crispy__body__line-height; line-height: $crispy__golden-ratio;
color: $crispy__body__color; color: $crispy__color-text;
background-color: $crispy__body__background-color; background-color: $crispy__color-background;
direction: $crispy__body__direction; direction: $crispy__direction;
@include crispy__font-size($crispy__body__font-size); @include crispy__font-size($crispy__font-size);
}
} }

+ 3
- 9
src/scss/_config.scss View File

@ -9,6 +9,8 @@
// font // font
$crispy__font-size: 16px !default; $crispy__font-size: 16px !default;
$crispy__golden-ratio: 1.618 !default; $crispy__golden-ratio: 1.618 !default;
$crispy__font-family: Arial, Helvetica, Neue Helvetica, sans-serif !default;
$crispy__direction: ltr !default;
// margin // margin
$crispy__margin: 10px !default; $crispy__margin: 10px !default;
@ -34,17 +36,9 @@ $crispy__colors: (
'info': $crispy__color-info 'info': $crispy__color-info
) !default; ) !default;
// body
$crispy__body__font-size: 16px !default;
$crispy__body__font-family: Arial, Helvetica, Neue Helvetica, sans-serif !default;
$crispy__body__line-height: $crispy__golden-ratio !default;
$crispy__body__direction: ltr !default;
$crispy__body__color: $crispy__color-text !default;
$crispy__body__background-color: $crispy__color-background !default;
// font-sizes as map // font-sizes as map
$crispy__font-sizes: ( $crispy__font-sizes: (
'default': $crispy__body__font-size, 'default': $crispy__font-size,
'small': 16px, 'small': 16px,
'large': 20px 'large': 20px
) !default; ) !default;


+ 1
- 1
src/scss/components/_code.scss View File

@ -11,7 +11,7 @@
* *
*/ */
$crispy__code__font-size: $crispy__body__font-size !default; $crispy__code__font-size: $crispy__font-size !default;
$crispy__code__font-family: monospace, monospace !default; $crispy__code__font-family: monospace, monospace !default;
$crispy__code__padding: toEm(10px 20px) !default; $crispy__code__padding: toEm(10px 20px) !default;
$crispy__code__margin: toEm(0 0 $crispy__margin) !default; $crispy__code__margin: toEm(0 0 $crispy__margin) !default;


+ 1
- 1
src/scss/components/_icon.scss View File

@ -17,7 +17,7 @@ $crispy__icon__vertical-align: text-bottom !default;
$crispy__icon__margin: 0 2px !default; $crispy__icon__margin: 0 2px !default;
$crispy__icon__sizes: ( $crispy__icon__sizes: (
'default': $crispy__body__font-size, 'default': $crispy__font-size,
'small': 12px, 'small': 12px,
'large': 28px 'large': 28px
) !default; ) !default;


+ 1
- 1
src/scss/components/field/_field.scss View File

@ -15,7 +15,7 @@
$crispy__field__margin: toEm(0 0 $crispy__margin 0) !default; $crispy__field__margin: toEm(0 0 $crispy__margin 0) !default;
$crispy__field__input__font-size: $crispy__body__font-size !default; $crispy__field__input__font-size: $crispy__font-size !default;
$crispy__field__input__padding: toEm(6px 8px) !default; $crispy__field__input__padding: toEm(6px 8px) !default;
$crispy__field__input__color: $crispy__color-text !default; $crispy__field__input__color: $crispy__color-text !default;


|||||||
x
 
000:0
Loading…
Cancel
Save