mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-11-25 09:03:12 +03:00
Added site brand color to signup button for new staff users
This commit is contained in:
parent
28ecb820bc
commit
00a6645a00
@ -1,5 +1,6 @@
|
|||||||
import Controller from '@ember/controller';
|
import Controller from '@ember/controller';
|
||||||
import {alias} from '@ember/object/computed';
|
import {alias} from '@ember/object/computed';
|
||||||
|
import {computed} from '@ember/object';
|
||||||
import {get} from '@ember/object';
|
import {get} from '@ember/object';
|
||||||
import {isArray as isEmberArray} from '@ember/array';
|
import {isArray as isEmberArray} from '@ember/array';
|
||||||
import {
|
import {
|
||||||
@ -21,6 +22,11 @@ export default Controller.extend({
|
|||||||
|
|
||||||
signupDetails: alias('model'),
|
signupDetails: alias('model'),
|
||||||
|
|
||||||
|
accentColor: computed('config.accent_color', function () {
|
||||||
|
let color = this.get('config.accent_color');
|
||||||
|
return color;
|
||||||
|
}),
|
||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
validate(property) {
|
validate(property) {
|
||||||
return this.signupDetails.validate({property});
|
return this.signupDetails.validate({property});
|
||||||
@ -56,7 +62,7 @@ export default Controller.extend({
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
// ValidationEngine throws undefined
|
// ValidationEngine throws undefined
|
||||||
if (!error) {
|
if (!error) {
|
||||||
this.set('flowErrors', 'Please fill out the form to complete your sign-up');
|
this.set('flowErrors', 'Please fill out the form to complete your signup');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,7 +74,8 @@
|
|||||||
fill: #fff !important;
|
fill: #fff !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gh-signin .gh-btn-login:hover {
|
.gh-signin .gh-btn-login:hover,
|
||||||
|
.gh-signup .gh-btn-signup:hover {
|
||||||
opacity: 0.9;
|
opacity: 0.9;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -131,7 +132,8 @@
|
|||||||
font-size: 1.8rem;
|
font-size: 1.8rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gh-signin .gh-input:focus:not(.gh-signin .gh-input.reset-password:focus) {
|
.gh-signin .gh-input:focus:not(.gh-signin .gh-input.reset-password:focus),
|
||||||
|
.gh-signup .gh-input:focus {
|
||||||
border-color: var(--midgrey) !important;
|
border-color: var(--midgrey) !important;
|
||||||
box-shadow: none !important;
|
box-shadow: none !important;
|
||||||
}
|
}
|
||||||
|
@ -19,14 +19,6 @@
|
|||||||
padding: 0 2.4rem;
|
padding: 0 2.4rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gh-flow-head {
|
|
||||||
flex-shrink: 0;
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
padding-top: 4vh;
|
|
||||||
padding-bottom: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gh-flow-content-wrap {
|
.gh-flow-content-wrap {
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
@ -417,8 +409,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.gh-setup .gh-flow-form .gh-btn-red,
|
.gh-setup .gh-flow-form .gh-btn-red,
|
||||||
.gh-setup .gh-flow-form .gh-btn-red:active,
|
.gh-setup .gh-flow-form .gh-btn-red:active {
|
||||||
.gh-signup .gh-btn-red,
|
|
||||||
.gh-signup .gh-btn-red:active {
|
|
||||||
background: var(--black) !important;
|
background: var(--black) !important;
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<div class="gh-site-icon" style={{site-icon-style}}></div>
|
<div class="gh-site-icon" style={{site-icon-style}}></div>
|
||||||
<h1>Update your password.</h1>
|
<h1>Update your password.</h1>
|
||||||
<p>
|
<p>
|
||||||
For security, you need to create a new password. An email has been sent to you with instructions!
|
For security, you need to create a new password. An email has been sent to you with instructions.
|
||||||
</p>
|
</p>
|
||||||
</header>
|
</header>
|
||||||
</div>
|
</div>
|
||||||
|
@ -69,7 +69,7 @@
|
|||||||
</GhFormGroup>
|
</GhFormGroup>
|
||||||
|
|
||||||
<GhTaskButton @buttonText="Create Account →" @type="submit" @form="signup" @defaultClick={{true}} @runningText="Creating"
|
<GhTaskButton @buttonText="Create Account →" @type="submit" @form="signup" @defaultClick={{true}} @runningText="Creating"
|
||||||
@task={{this.signup}} @data-test-button="signup" @class="gh-btn gh-btn-black gh-btn-signup gh-btn-block gh-btn-icon" @tabindex="3" />
|
@task={{this.signup}} @data-test-button="signup" @class="gh-btn gh-btn-signup gh-btn-block gh-btn-icon" @tabindex="3" style="background: {{this.accentColor}};" />
|
||||||
</form>
|
</form>
|
||||||
{{#if this.flowErrors}}
|
{{#if this.flowErrors}}
|
||||||
<p class="main-error">{{this.flowErrors}} </p>
|
<p class="main-error">{{this.flowErrors}} </p>
|
||||||
|
Loading…
Reference in New Issue
Block a user