Browse Source

Some fixes and changes to run css

pull/282/head
Chris 6 years ago
parent
commit
125b9f4160
  1. 14
      app/Item.php
  2. 27
      public/css/app.css
  3. 6
      public/mix-manifest.json
  4. 6
      resources/assets/sass/_app.scss
  5. 13
      resources/assets/sass/_rune.scss

14
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;

27
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);

6
public/mix-manifest.json

@ -1,4 +1,4 @@
{
"/css/app.css": "/css/app.css?id=458c92fc5ea880eda1b6",
"/js/app.js": "/js/app.js?id=8dc4a6ea723d0df7469d"
}
"/css/app.css": "/css/app.css?id=286d5fcf1350566c1475",
"/js/app.js": "/js/app.js?id=0db2e72b5cd42d83e306"
}

6
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;
}
}
}

13
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 {

Loading…
Cancel
Save