From 442aaa909971efcfd808568dab1cf697abe8d6ef Mon Sep 17 00:00:00 2001 From: Jip Fr Date: Mon, 9 Mar 2020 13:13:12 +0100 Subject: [PATCH 1/3] Small UI / UX improvements --- assets/css/pretendo-common.css | 13 +++++++++++-- assets/css/pretendo-faq.css | 4 ++-- views/cemu.hbs | 2 +- views/connecting.hbs | 2 +- views/faq.hbs | 4 ++-- views/partials/navbar.hbs | 4 ++-- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/assets/css/pretendo-common.css b/assets/css/pretendo-common.css index 6b0ab4d..5be4c1d 100644 --- a/assets/css/pretendo-common.css +++ b/assets/css/pretendo-common.css @@ -44,6 +44,13 @@ nav.navWrapper .navItem { font-size: 1em; cursor: pointer; align-self: stretch; + display: flex; + align-items: center; +} +nav.navWrapper .navItem svg { + width: 1.1rem; + height: 1.1rem; + margin-right: 5px; } nav.navWrapper .navItem:hover, nav.navWrapper .navItem.active { color: white; @@ -207,6 +214,7 @@ nav.navWrapper ~ .contentWrapper:nth-child(2) { footer { background: #673db6; padding: 2em 1em; + padding-bottom: calc(2em + env(safe-area-inset-bottom)); } footer .content { background: white; @@ -322,7 +330,7 @@ button:disabled, .btn:disabled, .btn-alt:disabled { min-width: 250px; width: 50%; max-width: 550px; - margin-bottom: 10px; + margin-bottom: 20px; display: flex; } .profileIcon { @@ -333,7 +341,7 @@ button:disabled, .btn:disabled, .btn-alt:disabled { } .profileText { width: calc(100% - 130px); - min-width: 200px; + min-width: 150px; display: flex; flex-direction: column; justify-content: center; @@ -343,6 +351,7 @@ button:disabled, .btn:disabled, .btn-alt:disabled { } .profileText p { margin-top: 5px; + margin-bottom: 10px; } /* components - inputs */ diff --git a/assets/css/pretendo-faq.css b/assets/css/pretendo-faq.css index 4990f49..cdcf22d 100644 --- a/assets/css/pretendo-faq.css +++ b/assets/css/pretendo-faq.css @@ -24,6 +24,6 @@ details summary { } details .text { - margin-left: 10px; - padding-bottom: 10px; + margin: 0; + padding: 15px 20px; } \ No newline at end of file diff --git a/views/cemu.hbs b/views/cemu.hbs index ebcbf20..5540215 100644 --- a/views/cemu.hbs +++ b/views/cemu.hbs @@ -3,7 +3,7 @@ {{> head-common }} - + {{> navbar }}
diff --git a/views/connecting.hbs b/views/connecting.hbs index 259b2cd..3593c48 100644 --- a/views/connecting.hbs +++ b/views/connecting.hbs @@ -3,7 +3,7 @@ {{> head-common }} - + {{> navbar }}
diff --git a/views/faq.hbs b/views/faq.hbs index 84ba0ca..c1e065e 100644 --- a/views/faq.hbs +++ b/views/faq.hbs @@ -5,7 +5,7 @@ - + {{> navbar }}
@@ -51,7 +51,7 @@
Will Pretendo support the Wii/Switch? -

The Wii already has custom servers provided by Wiimmfi. We currently have no plans on supporting the Switch, as not only is it a completely different platform with a different online network, but Switch online is a paid service

+

The Wii already has custom servers provided by Wiimmfi. We currently have no plans on supporting the Switch, as not only is it a completely different platform with a different online network, but Switch online is a paid service

diff --git a/views/partials/navbar.hbs b/views/partials/navbar.hbs index 6f7a895..5625676 100644 --- a/views/partials/navbar.hbs +++ b/views/partials/navbar.hbs @@ -3,8 +3,8 @@ Connecting Cemu FAQ - GitHub - Discord + GitHub + Discord
From c4cdb43c89a63d22c60f6a638794973b9c5b87a6 Mon Sep 17 00:00:00 2001 From: Jip Fr Date: Mon, 9 Mar 2020 19:36:48 +0100 Subject: [PATCH 2/3] Fix off-center icon and wrap text in seperate div --- assets/css/pretendo-common.css | 3 +- views/home.hbs | 50 ++++++++++++++++++++++------------ 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/assets/css/pretendo-common.css b/assets/css/pretendo-common.css index 5be4c1d..5c0f361 100644 --- a/assets/css/pretendo-common.css +++ b/assets/css/pretendo-common.css @@ -51,6 +51,7 @@ nav.navWrapper .navItem svg { width: 1.1rem; height: 1.1rem; margin-right: 5px; + display: block; } nav.navWrapper .navItem:hover, nav.navWrapper .navItem.active { color: white; @@ -141,7 +142,7 @@ nav.navWrapper.open .navItem.hamburger { display: none; } nav.navWrapper.open .navItem { - display: block; + display: flex; } nav.navWrapper .navItem.hamburger { display: flex; diff --git a/views/home.hbs b/views/home.hbs index a836aa6..2725e4b 100644 --- a/views/home.hbs +++ b/views/home.hbs @@ -34,64 +34,80 @@
-

Jonathan Barrow (RedDucks)

-

Project owner and lead developer

+
+

Jonathan Barrow (RedDucks)

+

Project owner and lead developer

+
-
-

Jemma (CaramelKat)

-

Miiverse research and development

+
' +
+

Jemma (CaramelKat)

+

Miiverse research and development

+
-

superwhiskers

-

crunch library development

+
+

superwhiskers

+

crunch library development

+
-

SuperMarioDaBom

-

Console and other system research

+
+

SuperMarioDaBom

+

Console and other system research

+
-

Rambo6Glaz

-

Network installer and console research

+
+

Rambo6Glaz

+

Network installer and console research

+
-

mrjvs

-

Web development and early eShop research

+
+

mrjvs

+

Web development and early eShop research

+
-

Benjamin Moss (kxpler442b)

-

Web development

+
+

Benjamin Moss (kxpler442b)

+

Web development

+
-

Kinnay

-

None of this would be possible without the research and help done by Kinnay on PRUDP and nex

+
+

Kinnay

+

None of this would be possible without the research and help done by Kinnay on PRUDP and nex

+
From 0863f2857ba7ea743355e165d4a2eec3553bad85 Mon Sep 17 00:00:00 2001 From: Jip Fr Date: Wed, 11 Mar 2020 15:03:05 +0100 Subject: [PATCH 3/3] Add myself to the credits --- views/home.hbs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/views/home.hbs b/views/home.hbs index 2725e4b..c123ab6 100644 --- a/views/home.hbs +++ b/views/home.hbs @@ -101,6 +101,16 @@
+
+ +
+
+

Jip Fr

+

Web development

+
+ +
+