Upgrade getbase

yaph · yaph · commit 67bc805ac35c · 2019-05-27T22:13:12.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -4,10 +4,6 @@ deploy/
 static/compiled/
 static/data/
 
-# src
-src/scss/getbase
-src/scss/getbase4
-
 # nodejs
 .sass-cache/
 node_modules/
diff --git a/gulpfile.js b/gulpfile.js
@@ -4,7 +4,8 @@ var gulp = require('gulp'),
     cleanCSS = require('gulp-clean-css'),
     concat = require('gulp-concat'),
     spawn = require('child_process').spawn,
-    sass = require('gulp-sass');
+    sass = require('gulp-sass')
+    tildeImporter = require('node-sass-tilde-importer');
 
 var do_minify = true;
 
@@ -35,13 +36,13 @@ gulp.task('serve', function() {
 // Compile and copy scss styles
 gulp.task('scss', function () {
     gulp.src(paths.scss_coder)
-        .pipe(sass().on('error', sass.logError))
+        .pipe(sass({importer: tildeImporter}).on('error', sass.logError))
         .pipe(cleanCSS())
         .pipe(concat('coder.css'))
         .pipe(gulp.dest(paths.compiled));
 
     return gulp.src(paths.scss_main)
-        .pipe(sass().on('error', sass.logError))
+        .pipe(sass({importer: tildeImporter}).on('error', sass.logError))
         .pipe(cleanCSS())
         .pipe(concat('style.css'))
         .pipe(gulp.dest(paths.compiled));
diff --git a/package.json b/package.json
@@ -21,10 +21,19 @@
     "gulp-concat": "^2.6.1",
     "gulp-connect": "^5.7.0",
     "gulp-sass": "^3.2.1",
-    "gulp-uglify": "^3.0.2"
+    "gulp-uglify": "^3.0.2",
+    "node-sass-tilde-importer": "^1.0.2"
   },
   "dependencies": {
     "@getbase/base": "^4.1.3",
-    "getbase": "^3.5.1"
+    "@getbase/buttons": "^4.1.0",
+    "@getbase/containers": "^4.1.1",
+    "@getbase/forms": "^4.1.0",
+    "@getbase/grid": "^4.1.0",
+    "@getbase/layout-helpers": "^4.1.0",
+    "@getbase/layout-spacers": "^4.1.0",
+    "@getbase/tables": "^4.1.0",
+    "@getbase/typography": "^4.1.1",
+    "@getbase/typography-helpers": "^4.1.0"
   }
-}
+}
diff --git a/src/scss/nav.scss b/src/scss/nav.scss
@@ -16,4 +16,5 @@ nav .brand {
 nav .button {
     margin: .2rem 0 0 .2rem;
     padding: .4rem 1rem;
+    display: inline;
 }
diff --git a/src/scss/style.scss b/src/scss/style.scss
@@ -4,7 +4,20 @@ $base-heading-font-family: Arial Black;
 $base-link-color: #0000ee;
 $base-link-hover-color: #0000ff;
 
-@import 'getbase/styles';
+// Import Base & Modules
+@import "~@getbase/base/scss/index";
+@import "~@getbase/buttons/scss/index";
+@import "~@getbase/containers/scss/index";
+@import "~@getbase/forms/scss/index";
+@import "~@getbase/grid/scss/index";
+@import "~@getbase/tables/scss/index";
+@import "~@getbase/typography/scss/index";
+
+// Base Typography and Layout Helpers
+@import "~@getbase/typography-helpers/scss/index";
+@import "~@getbase/layout-helpers/scss/index";
+@import "~@getbase/layout-spacers/scss/index";
+
 @import 'palette';
 @import 'blockquote';
 
@@ -35,7 +48,7 @@ img {
     margin: 0 auto;
 }
 .box-search input, .box-search button {
-    font-size: 2rem;
+    font-size: 1.8rem;
     min-height: 4rem;
 }
 .box-search button {

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,5 @@ nav .brand {`
`16`	`16`	`nav .button {`
`17`	`17`	`margin: .2rem 0 0 .2rem;`
`18`	`18`	`padding: .4rem 1rem;`
	`19`	`+ display: inline;`
`19`	`20`	`}`