From 28151d888ff97df7ce92d88f03dc900de9c22dd4 Mon Sep 17 00:00:00 2001 From: rob Date: Fri, 4 Nov 2022 20:54:10 -0400 Subject: [PATCH 1/2] button formatting touch-ups --- app/views/components/library.pug | 2 +- app/views/welcome/index.pug | 17 +++++++++++++--- app/views/welcome/login.pug | 2 +- app/views/welcome/signup.pug | 2 +- client/less/site/button.less | 33 ++++++++++++++++++++------------ 5 files changed, 38 insertions(+), 18 deletions(-) diff --git a/app/views/components/library.pug b/app/views/components/library.pug index ac1c65c..b9ef8b9 100644 --- a/app/views/components/library.pug +++ b/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 diff --git a/app/views/welcome/index.pug b/app/views/welcome/index.pug index 5dc3183..0db601a 100644 --- a/app/views/welcome/index.pug +++ b/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 \ No newline at end of file diff --git a/app/views/welcome/login.pug b/app/views/welcome/login.pug index 40b2a25..49b4cfa 100644 --- a/app/views/welcome/login.pug +++ b/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 \ No newline at end of file + button(type="submit").uk-button.dtp-button-primary.uk-border-rounded Login \ No newline at end of file diff --git a/app/views/welcome/signup.pug b/app/views/welcome/signup.pug index d0bcda0..04d7b60 100644 --- a/app/views/welcome/signup.pug +++ b/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 diff --git a/client/less/site/button.less b/client/less/site/button.less index 27bbe18..f63fcaf 100644 --- a/client/less/site/button.less +++ b/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; } } From 876e918c2eb985e4943ae0e4a555fa4ebebd97fb Mon Sep 17 00:00:00 2001 From: rob Date: Fri, 4 Nov 2022 20:54:16 -0400 Subject: [PATCH 2/2] v0.6.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c5fe57..dd45802 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dtp-base", - "version": "0.6.1", + "version": "0.6.2", "description": "Open source web app engine for the Digital Telepresence Platform.", "main": "dtp-webapp.js", "author": "DTP Technologies, LLC",