🚸 minor improvement

JAGFx · May 2, 2020 · f9718fd · f9718fd
1 parent c0517fb
commit f9718fd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/public/index.html b/public/index.html
@@ -18,15 +18,11 @@
 		</noscript>
 
 	</body>
-	<!--<script src="node_modules/jquery/dist/jquery.min.js"></script>-->
-	<!--<script src="node_modules/nosleep.js/dist/NoSleep.min.js"></script>-->
 	<script>
 		$( function () {
 			var noSleep = new NoSleep();
 
-			console.log( 'Hellow' );
-
-			$( '#overlay' ).click( function () {
+			$( 'html' ).on( 'click', '#overlay', function () {
 				console.log( 'Plop' );
 				var elem = document.querySelector( 'html' );
 

diff --git a/src/assets/scss/common/_variables.scss b/src/assets/scss/common/_variables.scss
@@ -14,14 +14,14 @@
 // --- Color
 
 $cBlack: #002b36;
-$cBlackTransparentMid: lighten( $cBlack, 0.5 );
-$cBlackTransparentHigh: lighten( $cBlack, 3% );
+$cBlackTransparentMid: lighten($cBlack, 0.5);
+$cBlackTransparentHigh: lighten($cBlack, 3%);
 $cWhite: #eee8d5;
 $cWhiteGray: #eaeaea;
 $cRed: #dc322f;
 $cOrange: #cb4b16;
 $cGreen: #00E070;
-$cGray: #4c4d50;
+$cGray: lighten($cBlack, 15%);
 $cYellow: #f5bb00;
 $cBlue: #26d2e2;
 

diff --git a/src/components/Menu/tabs/TabSkins.vue b/src/components/Menu/tabs/TabSkins.vue
@@ -8,7 +8,8 @@
 			v-for="skin in $skins()"
 		>
 			<div>
-				<img alt="..." class="img-fluid" src="https://dummyimage.com/850x455/000455/fff.pngs">
+				<img class="img-fluid" v-show="skin.screenshot" :src="skin.screenshot">
+				<img class="img-fluid" v-show="!skin.screenshot" src="https://dummyimage.com/800x455/002b36/ffffff.png&text=No+screenshot">
 			</div>
 			<div class="card-body">
 				<h5 class="card-title mb-0 d-flex justify-content-sm-start align-items-center">

diff --git a/src/dashboards/jagfx/components/Zone/Job/Trailer.vue b/src/dashboards/jagfx/components/Zone/Job/Trailer.vue
@@ -4,7 +4,10 @@
 			<div class="trailer-data">
 				<!--<span>{{bodyType}}</span>
 				<small>{{chainType}}</small>-->
-				<div class="job" v-if="hasTrailer()">{{cargo.name}}</div>
+				<div class="job" v-if="hasTrailerAndJob()">{{cargo.name}}</div>
+				<div class="job disabled" v-else-if="hasTrailer()">
+					<i>-- No Job --</i>
+				</div>
 				<div class="job disabled" v-else>
 					<i>-- No trailer --</i>
 				</div>
@@ -59,9 +62,12 @@
 		],
 		
 		methods: {
-			hasTrailer: function () {
+			hasTrailer:       function () {
 				return this.model.id.length !== 0;
 			},
+			hasTrailerAndJob: function () {
+				return this.model.id.length !== 0 && this.cargo.name.length !== 0;
+			},
 			getAverageDamage() {
 				const keyLength = Object.keys( this.damage ).length;
 				let sum         = 0;

diff --git a/src/data/skins.json b/src/data/skins.json
@@ -14,7 +14,7 @@
 				"name" : "ets2-dashboard-skin",
 				"url" :  "https://github.com/JAGFx/ets2-dashboard-skin"
 			},
-			"screenshot" :  ""
+			"screenshot" :  "https://github.com/JAGFx/ets2-dashboard-skin/raw/master/screenshot.png"
 		},
 		{
 			"id" :          "Test",