Fixing merge conflicts

Pageworks · May 14, 2019 · 157ebb0 · 157ebb0
1 parent 019c200
commit 157ebb0
Show file tree

Hide file tree

Showing 23 changed files with 6 additions and 9 deletions.
diff --git a/config/general.php b/config/general.php
@@ -27,11 +27,11 @@
 
         // Leave at bottom of global settings
 <<<<<<< HEAD
-        'jsCacheBustTimestamp' => '53100426',
-        'cssCacheBustTimestamp' => '53101146',
+        'jsCacheBustTimestamp' => '53210445',
+        'cssCacheBustTimestamp' => '53211169',
 =======
-        'jsCacheBustTimestamp' => '53100426',
-        'cssCacheBustTimestamp' => '53101146',
+        'jsCacheBustTimestamp' => '53210445',
+        'cssCacheBustTimestamp' => '53211169',
 >>>>>>> develop
     ],
 

diff --git a/...ic/assets/scripts/application.53100426.js → ...ic/assets/scripts/application.53210445.js b/...ic/assets/scripts/application.53100426.js → ...ic/assets/scripts/application.53210445.js
diff --git a/public/assets/scripts/env.53100426.js → public/assets/scripts/env.53210445.js b/public/assets/scripts/env.53100426.js → public/assets/scripts/env.53210445.js
diff --git a/public/assets/scripts/globals.53100426.js → public/assets/scripts/globals.53210445.js b/public/assets/scripts/globals.53100426.js → public/assets/scripts/globals.53210445.js
diff --git a/public/assets/scripts/module.53100426.js → public/assets/scripts/module.53210445.js b/public/assets/scripts/module.53100426.js → public/assets/scripts/module.53210445.js
diff --git a/.../assets/scripts/npm.pageworks.53100426.js → .../assets/scripts/npm.pageworks.53210445.js b/.../assets/scripts/npm.pageworks.53100426.js → .../assets/scripts/npm.pageworks.53210445.js
diff --git a/public/assets/scripts/npm.uuid.53100426.js → public/assets/scripts/npm.uuid.53210445.js b/public/assets/scripts/npm.uuid.53100426.js → public/assets/scripts/npm.uuid.53210445.js
diff --git a/public/assets/scripts/runtime.53100426.js → public/assets/scripts/runtime.53210445.js b/public/assets/scripts/runtime.53100426.js → public/assets/scripts/runtime.53210445.js
diff --git a/public/assets/styles/button.53101146.css → public/assets/styles/button.53211169.css b/public/assets/styles/button.53101146.css → public/assets/styles/button.53211169.css
diff --git a/public/assets/styles/container.53101146.css → public/assets/styles/container.53211169.css b/public/assets/styles/container.53101146.css → public/assets/styles/container.53211169.css
diff --git a/public/assets/styles/fonts.53101146.css → public/assets/styles/fonts.53211169.css b/public/assets/styles/fonts.53101146.css → public/assets/styles/fonts.53211169.css
diff --git a/public/assets/styles/grid.53101146.css → public/assets/styles/grid.53211169.css b/public/assets/styles/grid.53101146.css → public/assets/styles/grid.53211169.css
diff --git a/public/assets/styles/heading.53101146.css → public/assets/styles/heading.53211169.css b/public/assets/styles/heading.53101146.css → public/assets/styles/heading.53211169.css
diff --git a/public/assets/styles/homepage.53101146.css → public/assets/styles/homepage.53211169.css b/public/assets/styles/homepage.53101146.css → public/assets/styles/homepage.53211169.css
diff --git a/public/assets/styles/main.53101146.css b/public/assets/styles/main.53101146.css
diff --git a/public/assets/styles/main.53211169.css b/public/assets/styles/main.53211169.css
diff --git a/public/assets/styles/ratio.53101146.css → public/assets/styles/ratio.53211169.css b/public/assets/styles/ratio.53101146.css → public/assets/styles/ratio.53211169.css
diff --git a/public/assets/styles/spacing.53101146.css → public/assets/styles/spacing.53211169.css b/public/assets/styles/spacing.53101146.css → public/assets/styles/spacing.53211169.css
diff --git a/public/assets/styles/utility.53101146.css → public/assets/styles/utility.53211169.css b/public/assets/styles/utility.53101146.css → public/assets/styles/utility.53211169.css
diff --git a/public/assets/styles/widths.53101146.css → public/assets/styles/widths.53211169.css b/public/assets/styles/widths.53101146.css → public/assets/styles/widths.53211169.css
diff --git a/public/assets/styles/wrapper.53101146.css → public/assets/styles/wrapper.53211169.css b/public/assets/styles/wrapper.53101146.css → public/assets/styles/wrapper.53211169.css
diff --git a/utils/styles/base/_normalize.scss b/utils/styles/base/_normalize.scss
@@ -17,9 +17,7 @@
 
 body{
     *{
-        &:not(script):not(style){
-            display: inline-block;
-        }
+        display: inline-block;
     }
 }
 

diff --git a/utils/styles/base/_page.scss b/utils/styles/base/_page.scss
@@ -21,7 +21,6 @@ body{
     main{
         min-height: 80vh;
         width: 100%;
-        line-height: 0;
     }
 }