Cleans up CSS & updates Craft CMS

Pageworks · Jun 21, 2019 · f72264b · f72264b
1 parent 85ad1ef
commit f72264b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@
 - Adds: `public/automation/` directory due to gitignore issues with the assets directory [#180](https://github.com/Pageworks/papertrain/issues/180)
 - Adds: `.editorconfig` file to `.gitignore`
 
+### Fixed
+
+- Fixes: updates Craft CMS to latest version
+- Fixes: sets min-height to `100vh`
+- Fixes: removes default padding from `<main>`
+
 ### Removed
 
 - Removes: `.editorconfig` file

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
   },
   "require": {
     "php": ">=7.0.0",
-    "craftcms/cms": "3.1.29",
+    "craftcms/cms": "3.1.31",
     "vlucas/phpdotenv": "^2.4.0",
     "roave/security-advisories": "dev-master",
     "sebastianlenz/linkfield": "1.0.19",

diff --git a/composer.lock b/composer.lock
diff --git a/utils/styles/base/_page.scss b/utils/styles/base/_page.scss
@@ -7,7 +7,7 @@ html
     font-weight: $font-weight;
     color: $font-base;
     font-size: $base-font-size;
-    overflow-y: scroll;
+    overflow-y: auto;
     min-height: 100vh;
     text-align: left;
     position: relative;
@@ -20,20 +20,9 @@ body{
     min-height: 100vh;
     overflow-x: hidden;
 
-    page-view{
-        width: 100%;
-        display: block;
-    }
-
     main{
-        min-height: 80vh;
+        min-height: 100vh;
         width: 100%;
-        padding-top: 126px;
-        line-height: 0;
-
-        @media (min-width: $screen-medium){
-            padding-top: 125px;
-        }
     }
 }