From 377a86bb337d07a7503f3a07054d1421ea439faa Mon Sep 17 00:00:00 2001 From: Darius Date: Mon, 11 Jul 2016 13:29:19 +0200 Subject: [PATCH 1/3] 1.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e5f48ff..bba75a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "castlecss-core", - "version": "1.0.0", + "version": "1.1.0", "description": "CastleCSS a SCSS framework with modular building blocks for the web", "main": "index.js", "scripts": { From dbcbde8183315ef4ab1ed774f5183be0ec8cb3a5 Mon Sep 17 00:00:00 2001 From: Darius Date: Mon, 11 Jul 2016 15:22:14 +0200 Subject: [PATCH 2/3] Static_content and folders Added static_content to main.scss Put everything in folders (base and layout) --- sass/{ => base}/defaults.scss | 0 sass/{ => base}/mixins.scss | 0 sass/{ => base}/reset.scss | 0 sass/{ => base}/utility.scss | 0 sass/{ => base}/utility_spacers.scss | 0 sass/{ => base}/variables.scss | 0 sass/{ => layout}/grid.scss | 0 sass/{ => layout}/static_content.scss | 2 +- sass/main.scss | 18 +++++++++++------- 9 files changed, 12 insertions(+), 8 deletions(-) rename sass/{ => base}/defaults.scss (100%) rename sass/{ => base}/mixins.scss (100%) rename sass/{ => base}/reset.scss (100%) rename sass/{ => base}/utility.scss (100%) rename sass/{ => base}/utility_spacers.scss (100%) rename sass/{ => base}/variables.scss (100%) rename sass/{ => layout}/grid.scss (100%) rename sass/{ => layout}/static_content.scss (99%) diff --git a/sass/defaults.scss b/sass/base/defaults.scss similarity index 100% rename from sass/defaults.scss rename to sass/base/defaults.scss diff --git a/sass/mixins.scss b/sass/base/mixins.scss similarity index 100% rename from sass/mixins.scss rename to sass/base/mixins.scss diff --git a/sass/reset.scss b/sass/base/reset.scss similarity index 100% rename from sass/reset.scss rename to sass/base/reset.scss diff --git a/sass/utility.scss b/sass/base/utility.scss similarity index 100% rename from sass/utility.scss rename to sass/base/utility.scss diff --git a/sass/utility_spacers.scss b/sass/base/utility_spacers.scss similarity index 100% rename from sass/utility_spacers.scss rename to sass/base/utility_spacers.scss diff --git a/sass/variables.scss b/sass/base/variables.scss similarity index 100% rename from sass/variables.scss rename to sass/base/variables.scss diff --git a/sass/grid.scss b/sass/layout/grid.scss similarity index 100% rename from sass/grid.scss rename to sass/layout/grid.scss diff --git a/sass/static_content.scss b/sass/layout/static_content.scss similarity index 99% rename from sass/static_content.scss rename to sass/layout/static_content.scss index 1b22708..9c130f2 100644 --- a/sass/static_content.scss +++ b/sass/layout/static_content.scss @@ -31,4 +31,4 @@ .container { width: $b5-container; } -} +} \ No newline at end of file diff --git a/sass/main.scss b/sass/main.scss index 5ace1c4..c8e457e 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -1,7 +1,11 @@ -@import 'reset'; -@import 'variables'; -@import 'grid'; -@import 'defaults'; -@import 'mixins'; -@import 'utility'; -@import 'utility_spacers'; \ No newline at end of file +/* Base */ +@import 'base/reset'; +@import 'base/variables'; +@import 'base/defaults'; +@import 'base/mixins'; +@import 'base/utility'; +@import 'base/utility_spacers'; + +/* Layout */ +@import 'layout/grid'; +@import 'layout/static_content'; \ No newline at end of file From 0d857bd618ff37ed35e8711c5308ec920413cc68 Mon Sep 17 00:00:00 2001 From: Darius Date: Mon, 11 Jul 2016 15:26:31 +0200 Subject: [PATCH 3/3] 1.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bba75a6..cbd8428 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "castlecss-core", - "version": "1.1.0", + "version": "1.2.0", "description": "CastleCSS a SCSS framework with modular building blocks for the web", "main": "index.js", "scripts": {