Skip to content
This repository was archived by the owner on Nov 28, 2022. It is now read-only.

Removed third step to invite staff users from self-hoster setup #2286

Merged
merged 12 commits into from
Mar 8, 2022
Merged

Removed third step to invite staff users from self-hoster setup #2286

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b9df00f
Removed third step to invite staff users from self-hoster setup
sanne-san Mar 2, 2022
42aaf50
Updated routes and fixed test
sanne-san Mar 3, 2022
fa7e443
Fixed auth when transitioning to dashboard
daniellockyer Mar 3, 2022
95b144e
Removed first step and redundant files and updated UI
sanne-san Mar 7, 2022
007a48a
Consolidated everything into a single /setup page without any steps
sanne-san Mar 7, 2022
c0f6973
Cleaned up code
sanne-san Mar 7, 2022
a794a37
Updated signup, signin and reset password screens
sanne-san Mar 7, 2022
d98bd62
Updated reset, signin and signup pages
sanne-san Mar 8, 2022
0955a35
Updated tests
sanne-san Mar 8, 2022
1f44150
Updated more tests
sanne-san Mar 8, 2022
d1b6bce
Fixed failing tests
sanne-san Mar 8, 2022
c173226
Fixed linter error
sanne-san Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cleaned up code
  • Loading branch information
@sanne-san
sanne-san committed Mar 8, 2022
commit c0f6973c99f1d615f3dfa542f612a121050edc1d
10 changes: 0 additions & 10 deletions app/routes/setup/three.js
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions app/styles/layouts/auth.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

.gh-signin .gh-btn-login,
.gh-signin .gh-btn-reset,
.gh-flow.setup .gh-btn-signup {
.gh-setup .gh-btn-signup {
height: 54px;
border-radius: 8px;
line-height: 54px;
Expand All @@ -60,7 +60,7 @@

.gh-signin .gh-btn-login span,
.gh-signin .gh-btn-reset span,
.gh-flow.setup .gh-btn-signup span {
.gh-setup .gh-btn-signup span {
font-size: 1.8rem;
color: #fff;
}
Expand Down
60 changes: 15 additions & 45 deletions app/styles/layouts/flow.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
background: linear-gradient(315deg,#efefef,#fff);
}

.gh-flow.setup {
.gh-setup {
align-items: center;
justify-content: center;
width: 100%;
Expand Down Expand Up @@ -55,14 +55,14 @@
}
}

.gh-flow.setup .gh-flow-content {
.gh-setup .gh-flow-content {
max-width: 520px;
margin: 4.8rem 0 8rem;
text-align: left;
}

@media (max-width: 400px) {
.gh-flow.setup .gh-flow-content {
.gh-setup .gh-flow-content {
margin: 4rem 0 6rem;
}
}
Expand All @@ -72,24 +72,25 @@
max-width: 520px;
}

.gh-flow.setup .gh-flow-content header {
.gh-setup .gh-flow-content header {
margin: 0 0 1rem;
text-align: center;
}

.gh-flow.setup .gh-flow-content header svg {
.gh-setup .gh-flow-content header svg {
width: 7.2rem;
margin: 0 0 1rem;
}

.gh-flow.setup .gh-flow-content p {
.gh-setup .gh-flow-content p {
color: var(--midgrey);
font-size: 1.9rem;
font-weight: 400;
line-height: 1.4em;
}

@media (max-width: 520px) {
.gh-flow.setup .gh-flow-content p {
.gh-setup .gh-flow-content p {
font-size: 1.7rem;
}
}
Expand All @@ -116,46 +117,19 @@
font-style: normal;
}

.gh-flow-content .gh-flow-screenshot {
display: flex;
align-items: center;
margin: 0;
height: 45vh;
}

.gh-flow-content .gh-flow-screenshot img {
position: relative;
left: -3%;
flex-shrink: 0;
display: block;
margin: 0 auto;
max-height: 100%;
}

@media (max-width: 860px) {
.gh-flow-content .gh-flow-screenshot img {
left: 0;
}
}
@media (max-width: 600px) {
.gh-flow-content .gh-flow-screenshot {
height: auto;
}
}

.gh-flow-content .gh-btn {
display: block;
margin: 40px auto 0;
max-width: 400px;
}

.gh-flow.setup .gh-flow-content .gh-btn {
.gh-setup .gh-flow-content .gh-btn {
height: 52px;
max-width: unset;
margin: 40px 0 0
}

.gh-flow.setup .gh-flow-content .gh-btn span {
.gh-setup .gh-flow-content .gh-btn span {
font-size: 1.7rem;
}

Expand Down Expand Up @@ -330,10 +304,6 @@
border-radius: 8px;
}

.gh-flow-content input::placeholder {
opacity: 0.4;
}

.gh-flow-content .gh-input:focus {
border-color: var(--green);
box-shadow: 0 0 0 3px rgba(26,170,96,.15);
Expand Down Expand Up @@ -420,7 +390,7 @@
}

.gh-flow-content .response,
.gh-flow.setup .gh-flow-content .response {
.gh-setup .gh-flow-content .response {
position: absolute;
right: 0;
bottom: -24px;
Expand Down Expand Up @@ -451,19 +421,19 @@
}

.gh-flow-content .error .response,
.gh-flow.setup .gh-flow-content .error .response {
.gh-setup .gh-flow-content .error .response {
color: var(--red);
}

.gh-flow-content .main-error,
.gh-flow.setup .gh-flow-content .main-error {
.gh-setup .gh-flow-content .main-error {
margin-top: 8px;
color: var(--midgrey);
font-size: 1.35rem;
text-align: center;
}

.gh-flow.setup .gh-flow-form .gh-btn-red,
.gh-flow.setup .gh-flow-form .gh-btn-red:active {
.gh-setup .gh-flow-form .gh-btn-red,
.gh-setup .gh-flow-form .gh-btn-red:active {
background: var(--black) !important;
}
6 changes: 6 additions & 0 deletions app/styles/patterns/forms.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ input[type=number] {
font-weight: 400;
}

::-moz-placeholder {
color: var(--midlightgrey);
font-weight: 400;
opacity: 1;
}

.error .response {
color: var(--red);
}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/setup.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section class="gh-flow setup">
<section class="gh-flow gh-setup">
<div class="gh-flow-content">
<header>
{{svg-jar "ghost-orb" alt="Ghost"}}
Expand Down