diff --git a/app/css/card-grid.css b/app/css/card-grid.css index 5d6a80f..3e8f07f 100644 --- a/app/css/card-grid.css +++ b/app/css/card-grid.css @@ -25,8 +25,13 @@ margin-top: auto; margin-bottom: 36px; } -.mdc-card .mdc-card__primary-action .game-card__primary h2 { +.mdc-card .mdc-card__primary-action .game-card__primary .mdc-typography--headline6 { color: white; + margin-bottom: 0; +} +.mdc-card .mdc-card__primary-action .game-card__primary .mdc-typography--subtitle2 { + margin-top: 0; + margin-bottom: 0; } .mdc-card .mdc-card__action-buttons { margin-top: -48px; @@ -68,22 +73,13 @@ overflow: hidden; border-radius: 8px; } -.selected-game .top-row .mdc-card .mdc-card__primary-action .mdc-typography--headline6 { - margin-bottom: 0; -} -.selected-game .top-row .mdc-card .mdc-card__primary-action .mdc-typography--subtitle2 { - margin-top: 0; -} .selected-game .top-row .title-desc-container { display: flex; flex-direction: column; -} -.selected-game .top-row .title-desc-container .mdc-typography--headline4 { - color: white; + color: var(--color); } .selected-game .top-row .title-desc-container .mdc-typography--body2 { width: 100%; - color: white; max-height: 495px; overflow-y: auto; } @@ -115,7 +111,7 @@ width: 100%; display: flex; justify-content: space-around; - color: white; + color: var(--color); margin-top: 16px; } .selected-game .bottom-row .details div { diff --git a/app/css/home.css b/app/css/home.css index abb7832..840f22c 100644 --- a/app/css/home.css +++ b/app/css/home.css @@ -15,7 +15,7 @@ } .cards .mdc-card__primary-action { padding: 0 0 8px 16px; - color: white; + color: var(--color); } .cards .demo-card__title { margin-top: 12px; diff --git a/app/css/store.css b/app/css/store.css index 448182f..2dd9194 100644 --- a/app/css/store.css +++ b/app/css/store.css @@ -41,9 +41,9 @@ .store .genres .genre-container { min-height: 350px; } -.store .genres .genre-container h3 { +.store .genres .genre-container .genre-title { margin-left: 5vw; - color: white; + color: var(--color); } .store .genres .genre-container .genre-cards { height: 100%; diff --git a/app/html/installed.html b/app/html/installed.html index 3e0c5da..34c0503 100644 --- a/app/html/installed.html +++ b/app/html/installed.html @@ -51,3 +51,5 @@

+ + diff --git a/app/html/store.html b/app/html/store.html index 899b41e..13574da 100644 --- a/app/html/store.html +++ b/app/html/store.html @@ -19,27 +19,27 @@
-

Action

+

Action

-

Adventure

+

Adventure

-

Indie

+

Indie

-

Racing

+

Racing

-

Sports

+

Sports

diff --git a/app/js/components/card-grid/card-builder.js b/app/js/components/card-grid/card-builder.js index 056c314..1a704eb 100644 --- a/app/js/components/card-grid/card-builder.js +++ b/app/js/components/card-grid/card-builder.js @@ -31,6 +31,7 @@ function selectCard(gameInfo, fetchName, type) {

${gameInfo.name}

+

${fetchName}

`; @@ -40,6 +41,7 @@ function selectCard(gameInfo, fetchName, type) {

${gameInfo.name}

+

${fetchName}

diff --git a/app/js/components/updater/updater.js b/app/js/components/updater/updater.js index 6f3c7ee..1bca9f7 100644 --- a/app/js/components/updater/updater.js +++ b/app/js/components/updater/updater.js @@ -97,7 +97,9 @@ if (!isDev) { function installUpdate(fileName) { //Run exe (async () => { - await exec(path.join(localStorage.getItem('downloadDir'), fileName)); + setTimeout(() => { + exec(path.join(localStorage.getItem('downloadDir'), fileName)); + }, 250); //Close vaporstore setTimeout(() => { winClose(); diff --git a/app/js/store.js b/app/js/store.js index 3f7bb3b..0ff5038 100644 --- a/app/js/store.js +++ b/app/js/store.js @@ -141,15 +141,16 @@ $.getJSON(file, async (data) => { function createGenreCard(fetchData, gameName, genre) { var fetchName = gameName.replace(/ /g, '-').substring(1).slice(0, -1); var cardContent = ` -
-
-

${fetchData.name}

-
-
-
- - -
+
+
+

${fetchData.name}

+

${gameName}

+
+
+
+ + +
`; var card = document.createElement('div'); diff --git a/app/scss/card-grid.scss b/app/scss/card-grid.scss index 1c3b401..28af106 100644 --- a/app/scss/card-grid.scss +++ b/app/scss/card-grid.scss @@ -30,9 +30,14 @@ .game-card__primary { margin-top: auto; margin-bottom: 36px; - - h2 { + + .mdc-typography--headline6 { color: white; + margin-bottom: 0; + } + .mdc-typography--subtitle2 { + margin-top: 0; + margin-bottom: 0; } } } @@ -81,24 +86,14 @@ min-height: 600px; overflow: hidden; border-radius: 8px; - - .mdc-typography--headline6 { - margin-bottom: 0; - } - .mdc-typography--subtitle2 { - margin-top: 0; - } } } .title-desc-container { display: flex; flex-direction: column; - .mdc-typography--headline4 { - color: white; - } + color: var(--color); .mdc-typography--body2 { width: 100%; - color: white; max-height: 495px; overflow-y: auto; @@ -137,7 +132,7 @@ width: 100%; display: flex; justify-content: space-around; - color: white; + color: var(--color); margin-top: 16px; div { diff --git a/app/scss/home.scss b/app/scss/home.scss index a73d05c..ebfd1e8 100644 --- a/app/scss/home.scss +++ b/app/scss/home.scss @@ -16,7 +16,7 @@ .mdc-card__primary-action { padding: 0 0 8px 16px; - color: white; + color: var(--color); } .demo-card__title { diff --git a/app/scss/store.scss b/app/scss/store.scss index 6caef3f..658c80d 100644 --- a/app/scss/store.scss +++ b/app/scss/store.scss @@ -49,9 +49,9 @@ .genre-container { min-height: 350px; - h3 { + .genre-title { margin-left: 5vw; - color: white; + color: var(--color); } .genre-cards { diff --git a/package.json b/package.json index a0ddada..b679b03 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vapor-store", - "version": "2.0.0-beta-25", + "version": "2.0.0-beta-26", "description": "Vapor Store", "author": "SushyDev", "main": "app.js",