From 52edf55d99af4de2b3367fd5074882c37b4801ad Mon Sep 17 00:00:00 2001 From: Darius Rosendahl Date: Wed, 18 Oct 2017 17:32:13 +0200 Subject: [PATCH 1/3] Variables for castlecss-stickers --- sass/variables.scss | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/sass/variables.scss b/sass/variables.scss index 2e7449b..a1873cd 100644 --- a/sass/variables.scss +++ b/sass/variables.scss @@ -26,6 +26,7 @@ $theme05: #FFFFFF; // Destroyer white /* Notification colors + https://github.com/CastleCSS/castlecss-notifications */ $alert: #c0dbff; $warning: #ffe283; @@ -133,10 +134,14 @@ $font-sec: Arial, Helvetica, sans-serif; $font-size-default: 1.6rem; $line-height-default: 1.5; -/* Breadcrumbs seperator */ +/* Breadcrumbs seperator + https://github.com/CastleCSS/castlecss-buttons +*/ $breadcrumbs-separator: '\00bb'; -/* Form specific variables */ +/* Form specific variables + https://github.com/CastleCSS/castlecss-forms +*/ /* Standard Inputs */ $input-height: 4.8rem; @@ -164,4 +169,15 @@ $input-transition: .1s all ease-in-out; /* Icons */ $input-icon-color: #eee; -$input-icon-bg-color: #797979; \ No newline at end of file +$input-icon-bg-color: #797979; + +/* Default sticker styles + https://github.com/CastleCSS/castlecss-stickers +*/ +$sticker-font-size: 1.4rem; +$sticker-font-size-large: 1.6rem; +$sticker-bgcolor: $color03; +$sticker-color: $color02; +$sticker-text-transform: none; +$sticker-weight: normal; +$sticker-radius: $radius; \ No newline at end of file From 7c28130d86c5eedfea575b95abcdc569fb05ab80 Mon Sep 17 00:00:00 2001 From: Darius Rosendahl Date: Wed, 18 Oct 2017 17:32:29 +0200 Subject: [PATCH 2/3] 2.6.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 253703d..94d2832 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { "name": "castlecss-core", - "version": "2.5.0", + "version": "2.6.0", "lockfileVersion": 1 } diff --git a/package.json b/package.json index c2d0e54..c4d76ac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "castlecss-core", - "version": "2.5.0", + "version": "2.6.0", "description": "CastleCSS a SCSS framework with modular building blocks for the web", "main": "index.js", "scripts": { From 04de78cf76f977e0b782880d9069b70c428b457f Mon Sep 17 00:00:00 2001 From: Darius Rosendahl Date: Wed, 18 Oct 2017 17:33:27 +0200 Subject: [PATCH 3/3] Updated license to current year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index a7d04da..6ce9216 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 De Nieuwe Zaak +Copyright (c) 2016-2017 De Nieuwe Zaak Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal