Browse Source

bugfix

master
nirgendswo 7 years ago
parent
commit
16547c9b8f
11 changed files with 28 additions and 29 deletions
  1. +1
    -1
      package.json
  2. +6
    -5
      scss/components/_align.scss
  3. +2
    -1
      scss/components/_animation.scss
  4. +5
    -6
      scss/components/_body.scss
  5. +1
    -0
      scss/components/_button.scss
  6. +3
    -5
      scss/components/_heading.scss
  7. +1
    -0
      scss/components/_icon.scss
  8. +4
    -3
      scss/components/_list.scss
  9. +3
    -5
      scss/components/_margin.scss
  10. +1
    -3
      scss/components/_normalize.scss
  11. +1
    -0
      scss/components/_text-colors.scss

+ 1
- 1
package.json View File

@ -1,6 +1,6 @@
{ {
"name": "crispy-boilerplate", "name": "crispy-boilerplate",
"version": "0.4.0",
"version": "0.5.0",
"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",


+ 6
- 5
scss/components/_align.scss View File

@ -1,14 +1,15 @@
/** /**
* align
* align
* *
* - text
* - floating for elements
* - centering with margin
* - text
* - floating for elements
* - centering with margin
* *
* @author Björn Hase
* @author Björn Hase
* *
*/ */
@mixin crispy-boilerplate-align() { @mixin crispy-boilerplate-align() {
.--text-left { .--text-left {
text-align: left; text-align: left;


+ 2
- 1
scss/components/_animation.scss View File

@ -1,12 +1,13 @@
/** /**
* animation * animation
* *
*
*
* *
* @author Björn Hase * @author Björn Hase
* *
*/ */
@mixin crispy-boilerplate-animation() { @mixin crispy-boilerplate-animation() {
.--animation-rotate { .--animation-rotate {
animation: spin 3s linear infinite; animation: spin 3s linear infinite;


+ 5
- 6
scss/components/_body.scss View File

@ -1,21 +1,20 @@
@import
'../mixins/font-size';
/** /**
* body
* body
* *
* *
* *
* @author Björn Hase
* @author Björn Hase
* *
*/ */
// text
$body__font-size: 12px !default; $body__font-size: 12px !default;
$body__font-family: Arial, Helvetica, Neue Helvetica, sans-serif !default; $body__font-family: Arial, Helvetica, Neue Helvetica, sans-serif !default;
$body__line-height: 1.5 !default; $body__line-height: 1.5 !default;
$body__direction: ltr !default; $body__direction: ltr !default;
// colors
$body__color: black !default; $body__color: black !default;
$body__backgroun-color: white !default; $body__backgroun-color: white !default;


+ 1
- 0
scss/components/_button.scss View File

@ -7,6 +7,7 @@
* *
*/ */
@mixin crispy-boilerplate-button() { @mixin crispy-boilerplate-button() {
.button { .button {
position: relative; position: relative;


+ 3
- 5
scss/components/_heading.scss View File

@ -1,7 +1,3 @@
@import
'../functions/units',
'../mixins/font-size';
/** /**
* heading * heading
* *
@ -13,6 +9,8 @@
* *
*/ */
// text
$heading__font-sizes: ( $heading__font-sizes: (
'h1': 36px, 'h1': 36px,
'h2': 30px, 'h2': 30px,
@ -24,8 +22,8 @@ $heading__font-sizes: (
$heading__font-weight: bold !default; $heading__font-weight: bold !default;
$heading__font-family: Arial, Helvetica, Neue Helvetica, sans-serif !default; $heading__font-family: Arial, Helvetica, Neue Helvetica, sans-serif !default;
$heading__line-height: 1.5 !default; $heading__line-height: 1.5 !default;
$heading__margin: 0 0 pxToEm(20px) !default; $heading__margin: 0 0 pxToEm(20px) !default;
@mixin crispy-boilerplate-heading { @mixin crispy-boilerplate-heading {


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

@ -12,6 +12,7 @@
* *
*/ */
$icon__vertical-align: middle !default; $icon__vertical-align: middle !default;
$icon__margin: 0 2px !default; $icon__margin: 0 2px !default;


+ 4
- 3
scss/components/_list.scss View File

@ -1,25 +1,26 @@
/** /**
* list * list
* *
* styles and mixins for ul-element
* styles and mixins for ol and ul-element
* *
* *
* @author Björn Hase * @author Björn Hase
* *
*/ */
@mixin crispy-boilerplate-list { @mixin crispy-boilerplate-list {
.list { .list {
list-style-position: outside; list-style-position: outside;
&--horizontal { &--horizontal {
.list__item {
li {
float: left; float: left;
} }
} }
&--clear { &--clear {
@include crispy-boilerplate-ist-clear();
@include crispy-boilerplate-list-clear();
} }
} }


+ 3
- 5
scss/components/_margin.scss View File

@ -1,6 +1,3 @@
@import
'../mixins/units';
/** /**
* margin * margin
* *
@ -11,8 +8,9 @@
* *
*/ */
$margin-top: em(5px) !default;
$margin-bottom: em(20px) !default;
$margin-top: pxToEm(5px) !default;
$margin-bottom: pxToEm(20px) !default;
@mixin crispy-boilerplate-margin() { @mixin crispy-boilerplate-margin() {
.--margin-top-y0 { .--margin-top-y0 {


+ 1
- 3
scss/components/_normalize.scss View File

@ -1,6 +1,3 @@
@import
'../functions/units';
/** /**
* normalize * normalize
* *
@ -9,6 +6,7 @@
* *
*/ */
$normalize__margin: 0 0 pxToEm(20px) !default; $normalize__margin: 0 0 pxToEm(20px) !default;
@mixin crispy-boilerplate-normalize { @mixin crispy-boilerplate-normalize {


+ 1
- 0
scss/components/_text-colors.scss View File

@ -8,6 +8,7 @@
* *
*/ */
$text-colors: ( $text-colors: (
'success': green, 'success': green,
'warning': yellow, 'warning': yellow,


Loading…
Cancel
Save