diff --git a/app/Item.php b/app/Item.php index 9aebc88b..1f3f8509 100644 --- a/app/Item.php +++ b/app/Item.php @@ -161,13 +161,21 @@ class Item extends Model public function getconfig() { - if(!isset($this->description) || empty($this->description)) return false; + $explode = explode('\\', $this->class); + + + if(!isset($this->description) || empty($this->description)) { + $config = new \stdClass; + $config->name = end($explode); + $config->enabled = false; + return $config; + } + + $config = json_decode($this->description); - $explode = explode('\\', $this->class); $config->name = end($explode); - $config->url = $this->url; diff --git a/public/css/app.css b/public/css/app.css index ee908d5d..c1bedb4c 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1302,12 +1302,22 @@ hr { -webkit-box-align: center; -ms-flex-align: center; align-items: center; + color: white; + font-size: 12px; + line-height: 1.2; } .livestats-container .livestats strong span { margin-left: 4px; } +.livestats-container .livestats.flexcolumn { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; +} + input:-webkit-autofill, input:-webkit-autofill:hover, input:-webkit-autofill:focus @@ -1329,9 +1339,16 @@ select:-webkit-autofill:focus { .title-marquee { width: 125px; overflow: hidden; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: start; + -ms-flex-align: start; + align-items: flex-start; + margin-top: 2px; } -.title-marquee span { +.title-marquee > span, .title-marquee > strong { white-space: nowrap; -webkit-transform: translate(0, 0); transform: translate(0, 0); @@ -1339,6 +1356,14 @@ select:-webkit-autofill:focus { animation: marquee 8s linear; } +.title-marquee .title { + margin-right: 4px; +} + +.no-marquee .title { + margin-right: 4px; +} + @-webkit-keyframes marquee { 0% { -webkit-transform: translate(0, 0); diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 3d8fc34c..0a42ffa3 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,4 +1,4 @@ { - "/css/app.css": "/css/app.css?id=458c92fc5ea880eda1b6", - "/js/app.js": "/js/app.js?id=8dc4a6ea723d0df7469d" -} \ No newline at end of file + "/css/app.css": "/css/app.css?id=286d5fcf1350566c1475", + "/js/app.js": "/js/app.js?id=0db2e72b5cd42d83e306" +} diff --git a/resources/assets/sass/_app.scss b/resources/assets/sass/_app.scss index 2aafc716..a4015439 100644 --- a/resources/assets/sass/_app.scss +++ b/resources/assets/sass/_app.scss @@ -886,10 +886,16 @@ hr { line-height: 1; display: flex; align-items: center; + color: white; + font-size: 12px; + line-height: 1.2; span { margin-left: 4px; } } + &.flexcolumn { + flex-direction: column; + } } } diff --git a/resources/assets/sass/_rune.scss b/resources/assets/sass/_rune.scss index 21fb5b3f..55e448b5 100644 --- a/resources/assets/sass/_rune.scss +++ b/resources/assets/sass/_rune.scss @@ -3,11 +3,22 @@ .title-marquee { width: 125px; overflow: hidden; - span { + display: flex; + align-items: flex-start; + margin-top: 2px; + > span, > strong { white-space: nowrap; transform: translate(0, 0); animation: marquee 8s linear; } + .title { + margin-right: 4px; + } +} +.no-marquee { + .title { + margin-right: 4px; + } } @keyframes marquee {