From 7c859b629eb761cdff08b3ccb71910b2e892af76 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 2 Feb 2018 15:29:17 +0000 Subject: [PATCH] item sass --- package.json | 2 +- public/css/app.css | 10 ++++++++++ public/mix-manifest.json | 4 ++-- resources/assets/sass/_app.scss | 6 ++++++ resources/views/item.blade.php | 2 +- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 846b12eb..063a56e9 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "devDependencies": { "axios": "^0.17", "bootstrap-sass": "^3.3.7", - "cross-env": "^5.1", + "cross-env": "^5.1.3", "jquery": "^3.2", "laravel-mix": "^1.0", "lodash": "^4.17.4", diff --git a/public/css/app.css b/public/css/app.css index cdc2da6d..7a098479 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -433,6 +433,12 @@ body { -webkit-transition: all .35s ease-in-out; transition: all .35s ease-in-out; outline: 1px solid transparent; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: start; + -ms-flex-align: start; + align-items: flex-start; } .item:after { @@ -642,6 +648,10 @@ div.create .input input { border-radius: 6px; } +.app-icon { + max-width: 50px; +} + /*! Huebee v2.0.0 http://huebee.buzz ---------------------------------------------- */ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 06cbf2da..87aef93c 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,4 +1,4 @@ { - "/css/app.css": "/css/app.css?id=54bcdb4cb450b166634d", - "/js/app.js": "/js/app.js?id=86f37c024211b755c39e" + "/css/app.css": "/css/app.css?id=6ca0518736a7940b1f8a", + "/js/app.js": "/js/app.js?id=04ddfaaf5e66ed51b426" } \ No newline at end of file diff --git a/resources/assets/sass/_app.scss b/resources/assets/sass/_app.scss index 973af38b..47c0ed34 100644 --- a/resources/assets/sass/_app.scss +++ b/resources/assets/sass/_app.scss @@ -157,6 +157,8 @@ body { position: relative; transition: all .35s ease-in-out; outline: 1px solid transparent; + display: flex; + align-items: flex-start; &:after { content: ""; position: absolute; @@ -325,3 +327,7 @@ div.create { } } } + +.app-icon { + max-width: 50px; +} \ No newline at end of file diff --git a/resources/views/item.blade.php b/resources/views/item.blade.php index 77d5f734..570b9cbe 100644 --- a/resources/views/item.blade.php +++ b/resources/views/item.blade.php @@ -1,7 +1,7 @@
@if($app->icon) - + @else @endif