Fix getbase installation and npm scripts, watch doesn't work yet

yaph · yaph · commit 71588dbf9cb7 · 2022-06-21T02:39:47.000+02:00
diff --git a/package.json b/package.json
@@ -12,10 +12,11 @@
   },
   "scripts": {
     "build:scripts": "babel src/js --out-dir static/compiled --minified --no-comments",
-    "build:style-coder": "sass src/scss/coder.scss static/compiled/coder.css --style compressed",
-    "build:style-main": "sass src/scss/style.scss static/compiled/style.css --style compressed",
+    "build:style-coder": "sass src/scss/coder.scss:static/compiled/coder.css --style compressed",
+    "build:style-main": "sass src/scss/style.scss:static/compiled/style.css --style compressed",
     "watch:scripts": "nodemon -e js -w src/js -x 'npm run build:scripts'",
-    "watch:styles": "nodemon -e css -w src/scss -x 'npm run build:style-coder; npm run build:style-main'",
+    "watch:style-coder": "nodemon -e css -w src/scss -x 'npm run build:style-coder'",
+    "watch:style-main": "nodemon -e css -w src/scss -x 'npm run build:style-main'",
     "build": "run-p build:*",
     "watch": "run-p watch:*"
   },
@@ -30,15 +31,6 @@
     "sass": "^1.52.3"
   },
   "dependencies": {
-    "@getbase/base": "^5.2.0",
-    "@getbase/buttons": "^4.1.0",
-    "@getbase/containers": "^4.2.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"
+    "@getbase/base": "^5.2.0"
   }
 }
diff --git a/src/scss/style.scss b/src/scss/style.scss
@@ -4,23 +4,26 @@ $base-heading-font-family: Arial Black;
 $base-link-color: #0000ee;
 $base-link-hover-color: #0000ff;
 
-// Import Base & Modules
-@import "../../node_modules/@getbase/base/scss/index";
-@import "../../node_modules/@getbase/buttons/scss/index";
-@import "../../node_modules/@getbase/containers/scss/index";
-@import "../../node_modules/@getbase/forms/scss/index";
-@import "../../node_modules/@getbase/grid/scss/index";
-@import "../../node_modules/@getbase/tables/scss/index";
-@import "../../node_modules/@getbase/typography/scss/index";
+/* Import Base */
+@import "../../node_modules/@getbase/base/scss/_mixins";
+@import "../../node_modules/@getbase/base/scss/core";
 
-// Base Typography and Layout Helpers
-@import "../../node_modules/@getbase/typography-helpers/scss/index";
-@import "../../node_modules/@getbase/layout-helpers/scss/index";
-@import "../../node_modules/@getbase/layout-spacers/scss/index";
+/* Import Base Common */
+@import "../../node_modules/@getbase/base/scss/code";
+@import "../../node_modules/@getbase/base/scss/forms";
+@import "../../node_modules/@getbase/base/scss/tables";
+@import "../../node_modules/@getbase/base/scss/typography";
+@import "../../node_modules/@getbase/base/scss/headings";
 
 @import 'palette';
 @import 'blockquote';
 
+// Additional Modules
+@import "../../node_modules/@getbase/base/scss/containers";
+@import "../../node_modules/@getbase/base/scss/grid";
+@import "../../node_modules/@getbase/base/scss/typography-helpers";
+@import "../../node_modules/@getbase/base/scss/display-helpers";
+
 a {
     cursor: pointer;
     text-decoration: none;
@@ -47,6 +50,7 @@ img {
 .box-search input, .box-search button {
     font-size: 1.8rem;
     min-height: 4rem;
+    width: 100%;
 }
 .box-search button {
     min-width: 12rem;
@@ -66,28 +70,36 @@ img {
     display: inline-block;
 }
 
+.container, .container-full {
+    padding-left: 15px;
+    padding-right: 15px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
 .main {
     background-color: #fff;
 }
-
 .main h2 {
     margin: 1rem 0;
 }
 
 .padb {
     padding-bottom: 1em;
 }
-
 .padh {
     padding-left: 1em;
     padding-right: 1em;
 }
-
 .padv {
     padding-top: 1em;
     padding-bottom: 1em;
 }
 
+.right {
+    float: right;
+}
+
 .user {
     width: 9%;
     margin-right: 1%;
