diff --git a/public/css/app.css b/public/css/app.css index c535d5fb..b65d33c8 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -342,17 +342,33 @@ body { margin: 0; } -#app main .config, -#app #sortable .config { +#config-buttons { position: absolute; bottom: 0; right: 0; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; +} + +#config-buttons a { width: 50px; height: 50px; background: rgba(0, 0, 0, 0.8); text-align: center; line-height: 50px; color: white; + margin-top: 1px; +} + +#config-buttons a img { + width: 26px; + height: 26px; + margin-top: 12px; } .message-container { @@ -422,10 +438,6 @@ body { color: #91a1b3; } -#app.header .appheader { - top: 0; -} - #app.header .item, #app.header .add-item { -webkit-transform: scale(0.8); diff --git a/public/img/yggdrasil.svg b/public/img/yggdrasil.svg new file mode 100644 index 00000000..d8e2f64e --- /dev/null +++ b/public/img/yggdrasil.svg @@ -0,0 +1,171 @@ + +image/svg+xml \ No newline at end of file diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 794d0dd1..c85baa59 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,4 +1,4 @@ { - "/css/app.css": "/css/app.css?id=5230540b4eebff9be644", + "/css/app.css": "/css/app.css?id=d707c4c337b9e3cb0cf8", "/js/app.js": "/js/app.js?id=aa9e426dc7b92d42d3b2" } \ No newline at end of file diff --git a/resources/assets/sass/_app.scss b/resources/assets/sass/_app.scss index 271c17da..b347f298 100644 --- a/resources/assets/sass/_app.scss +++ b/resources/assets/sass/_app.scss @@ -77,19 +77,30 @@ body { align-content: center; list-style: none; margin: 0; - .config { - position: absolute; - bottom: 0; - right: 0; - width: 50px; - height: 50px; - background: rgba(0,0,0,0.8); - text-align: center; - line-height: 50px; - color: white; + } +} +#config-buttons { + position: absolute; + bottom: 0; + right: 0; + display:flex; + flex-direction: column; + a { + width: 50px; + height: 50px; + background: rgba(0,0,0,0.8); + text-align: center; + line-height: 50px; + color: white; + margin-top: 1px; + img { + width: 26px; + height: 26px; + margin-top: 12px; } } } + .item-container { //width: 340px; //transition: width .35s ease-in-out; @@ -148,7 +159,7 @@ body { #app { &.header { .appheader { - top: 0; + //top: 0; } .item-container { //width: 240px; diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index 8f480f11..834b0d93 100644 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -55,7 +55,15 @@ @endif @yield('content') - +
+ @if(!Route::is('dash')) + + @endif + @if(!Request::is(['items', 'items/*'])) + + @endif + +
diff --git a/resources/views/items/form.blade.php b/resources/views/items/form.blade.php index c320d876..925fac27 100644 --- a/resources/views/items/form.blade.php +++ b/resources/views/items/form.blade.php @@ -29,7 +29,7 @@
@if(isset($item->icon) && !empty($item->icon)) - {{ asset('storage/'.$item->icon) }} + View current icon {!! Form::hidden('icon', $item->icon, ['class' => 'form-control']) !!} @endif @@ -41,7 +41,7 @@