Skip to content

Commit

Permalink
updated karma-css to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
bigmassa committed May 27, 2018
1 parent 7175508 commit abf728b
Show file tree
Hide file tree
Showing 12 changed files with 2,280 additions and 2,094 deletions.
26 changes: 7 additions & 19 deletions example/scss/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,33 +1,21 @@
// Variables
//––––––––––––––––––––––––––––––––––––––––––––––––––

/*
* start with a copy of the current varables file:
* https://github.com/AccentDesign/karma-css/blob/master/scss/_variables.scss
*/


// Styling
//––––––––––––––––––––––––––––––––––––––––––––––––––

// colors
$colors: (
white: rgb(255, 255, 255),
primary: rgb(67, 177, 176),
mineshaft: rgb(51, 51, 51)
"white": rgb(255, 255, 255),
"primary": rgb(67, 177, 176),
"mineshaft": rgb(51, 51, 51)

) !default;
);

// defined colors
$body-background: rgb(253, 253, 253) !default;
$body-background: rgb(253, 253, 253);


// forms
$input-use-full-width: true; // false = max-width:100%, true = width:100%
$input-use-full-width: true;


// buttons
$buttons: (
// name color font-color
mineshaft: map-get($colors, mineshaft) map-get($colors, white),
mineshaft: map-get($colors, "mineshaft") map-get($colors, "white"),
) !default;
9 changes: 3 additions & 6 deletions example/scss/karma.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
/*! Karma-CSS v1.5.0 MIT License | http://karmacss.com | https://github.com/accentdesign/karma-css */


@import "variables";

/* karma-css core */
@import "karma-css/scss/variables";
@import "karma-css/scss/import";
@import "node_modules/karma-css/scss/variables";
@import "node_modules/karma-css/scss/import";

/* add your custom modules here */
@import "module/form";
@import "module/layout";
@import "module/message";

/* karma-css utilities */
@import "karma-css/scss/utilities";
@import "node_modules/karma-css/scss/utilities";
30 changes: 19 additions & 11 deletions example/scss/module/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,29 @@ form h2 {
margin-bottom: 3rem;
}

form .field-row.has-error {
form .field-row {

input,
select,
textarea {
border-color: color(red);
ul {
list-style-type: none;
}

.errorlist {
margin-bottom: 0;
float: right;
list-style-type: none;
color: color(red);
&.has-error {

input,
select,
textarea {
border-color: color("red");
}

.errorlist {
margin-bottom: 0;
float: right;
list-style-type: none;
color: color("red");
}

}

}

form .form-actions {
Expand Down
9 changes: 6 additions & 3 deletions example/scss/module/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
// -------------------------------------------------

header {
@include box-shadow(0, 0, 10px, color(grey));
background: color(primary);
color: color(white);
@include box-shadow(0, 0, 10px, color("gray"));
background: color("primary");
margin-bottom: 5rem;
padding: 5rem 0;

h1 {
color: color("white");
}
}

footer {
Expand Down
12 changes: 6 additions & 6 deletions example/scss/module/_message.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
}

li.success {
border: 1px solid color(primary);
background: lighten(color(primary), 45%);
color: color(primary);
border: 1px solid color("primary");
background: lighten(color("primary"), 45%);
color: color("primary");
}

li.error {
border: 1px solid color(red);
background: lighten(color(red), 35%);
color: color(red);
border: 1px solid color("red");
background: color-lighten("red", 35%);
color: color("red");
}

}
Loading

0 comments on commit abf728b

Please sign in to comment.