Browse Source

Merge branch 'develop' of git.digitaltelepresence.com:digital-telepresence/dtp-base into develop

develop
Rob Colbert 1 year ago
parent
commit
c5066d9ba5
  1. 2
      app/views/components/library.pug
  2. 17
      app/views/welcome/index.pug
  3. 2
      app/views/welcome/login.pug
  4. 2
      app/views/welcome/signup.pug
  5. 33
      client/less/site/button.less

2
app/views/components/library.pug

@ -52,7 +52,7 @@ mixin renderCell (label, value, className)
mixin renderBackButton (options)
- options = Object.assign({ includeLabel: true, label: 'Back' }, options)
button(type="button", onclick="window.history.back();").uk-button.uk-button-default
button(type="button", onclick="window.history.back();").uk-button.uk-button-default.uk-border-rounded
span
i.fas.fa-chevron-left
if options.includeLabel

17
app/views/welcome/index.pug

@ -13,13 +13,24 @@ block content
div(uk-grid).uk-flex-center
div(class="uk-width-1-1 uk-width-1-3@m")
.uk-margin-small
a(href="/auth/core").uk-button.uk-button-primary.uk-border-rounded DTP Connect
a(href="/auth/core").uk-button.uk-button-primary.uk-border-rounded
span
i.fas.fa-plug
span.uk-margin-small-left DTP Connect
.uk-text-small Connect using DTP Core
div(class="uk-width-1-1 uk-width-1-3@m")
.uk-margin-small
a(href="/welcome/signup").uk-button.uk-button-secondary.uk-border-rounded Create Account
a(href="/welcome/signup").uk-button.uk-button-secondary.uk-border-rounded
span
i.fas.fa-user-plus
span.uk-margin-small-left Create Account
.uk-text-small Create a local account
div(class="uk-width-1-1 uk-width-1-3@m")
.uk-margin-small
a(href="/welcome/login").uk-button.uk-button-default.uk-border-rounded Sign In
a(href="/welcome/login").uk-button.uk-button-default.uk-border-rounded
span
i.fas.fa-door-open
span.uk-margin-small-left Sign In
.uk-text-small Log in with your local account

2
app/views/welcome/login.pug

@ -32,4 +32,4 @@ block content
.uk-width-auto
a(href="/").uk-text-muted Forgot password
.uk-width-auto
button(type="submit").uk-button.dtp-button-primary Login
button(type="submit").uk-button.dtp-button-primary.uk-border-rounded Login

2
app/views/welcome/signup.pug

@ -51,4 +51,4 @@ block content
.uk-width-expand
+renderBackButton()
.uk-width-auto
button(type="submit").uk-button.uk-button-primary Create Account
button(type="submit").uk-button.uk-button-primary.uk-border-rounded Create Account

33
client/less/site/button.less

@ -97,7 +97,9 @@ button.uk-button.dtp-button-subscribe {
}
a.uk-button.dtp-button-default,
button.uk-button.dtp-button-default {
a.uk-button.uk-button-default,
button.uk-button.dtp-button-default,
button.uk-button.uk-button-default {
background: none;
outline: none;
border: solid 2px rgb(75, 75, 75);
@ -107,47 +109,54 @@ button.uk-button.dtp-button-default {
&:hover {
background-color: rgb(75, 75, 75);
color: #e8e8e8;
}
}
a.uk-button.dtp-button-primary,
button.uk-button.dtp-button-primary {
a.uk-button.uk-button-primary,
button.uk-button.dtp-button-primary,
button.uk-button.uk-button-primary {
background: none;
outline: none;
border: solid 2px #1e87f0;
color: #c8c8c8;
color: @button-label-color;
transition: background-color 0.2s;
&:hover {
background-color: #1e87f0;
color: #e8e8e8;
}
}
a.uk-button.dtp-button-secondary,
button.uk-button.dtp-button-secondary {
a.uk-button.uk-button-secondary,
button.uk-button.dtp-button-secondary,
button.uk-button.uk-button-secondary {
background: none;
outline: none;
border: solid 2px rgb(75, 75, 75);
color: #c8c8c8;
border: solid 2px rgb(160,160,160);
color: @button-label-color;
&:hover {
background-color: rgb(75, 75, 75);
background-color: rgb(160,160,160);
color: #e8e8e8;
}
}
a.uk-button.dtp-button-danger,
button.uk-button.dtp-button-danger {
a.uk-button.uk-button-danger,
button.uk-button.dtp-button-danger,
button.uk-button.uk-button-danger {
background: none;
outline: none;
border: solid 2px rgb(255, 0, 0);
color: @global-color;
color: @button-label-color;
&:hover {
background-color: rgb(255, 0, 0);
color: #ffffff;
color: #e8e8e8;
}
}

Loading…
Cancel
Save