diff --git a/gui/app/components/document/document-meta.js b/gui/app/components/document/document-meta.js index 7ac9e252..b0df5b62 100644 --- a/gui/app/components/document/document-meta.js +++ b/gui/app/components/document/document-meta.js @@ -207,11 +207,9 @@ export default Component.extend(Modals, Tooltips, { }, onEditLifecycle() { - //no op }, onEditProtection() { - //no op }, onEditCategory() { diff --git a/gui/app/pods/auth/forgot/route.js b/gui/app/pods/auth/forgot/route.js index 09537371..0657f548 100644 --- a/gui/app/pods/auth/forgot/route.js +++ b/gui/app/pods/auth/forgot/route.js @@ -31,10 +31,10 @@ export default Route.extend({ activate() { this.get('browser').setTitleAsPhrase('Forgot Password'); - $('body').addClass('background-color-theme-light'); + $('body').addClass('background-color-theme-light d-flex justify-content-center align-items-center'); }, deactivate() { - $('body').removeClass('background-color-theme-light'); + $('body').removeClass('background-color-theme-light d-flex justify-content-center align-items-center'); } }); diff --git a/gui/app/pods/auth/forgot/template.hbs b/gui/app/pods/auth/forgot/template.hbs index 603bff0e..4ede3219 100644 --- a/gui/app/pods/auth/forgot/template.hbs +++ b/gui/app/pods/auth/forgot/template.hbs @@ -1,8 +1,10 @@ -
- -
- {{forgot-password forgot=(action 'forgot')}} -
+
+
+ + +
diff --git a/gui/app/pods/auth/login/route.js b/gui/app/pods/auth/login/route.js index a7815e1c..f5475f82 100644 --- a/gui/app/pods/auth/login/route.js +++ b/gui/app/pods/auth/login/route.js @@ -62,10 +62,10 @@ export default Route.extend({ activate() { this.get('browser').setTitleAsPhrase('Login'); - $('body').addClass('background-color-theme-light'); + $('body').addClass('background-color-theme-light d-flex justify-content-center align-items-center'); }, deactivate() { - $('body').removeClass('background-color-theme-light'); + $('body').removeClass('background-color-theme-light d-flex justify-content-center align-items-center'); } }); diff --git a/gui/app/pods/auth/login/template.hbs b/gui/app/pods/auth/login/template.hbs index ed771d85..b6c90426 100644 --- a/gui/app/pods/auth/login/template.hbs +++ b/gui/app/pods/auth/login/template.hbs @@ -1,24 +1,26 @@ -{{#if model.showLogin}} -
- -
-
- - {{focus-input type="email" value=email id="authEmail" class="form-control mousetrap" placeholder=""}} +
+ {{#if model.showLogin}} +
+ -
- - {{input type="password" value=password id="authPassword" class="form-control"}} -
- -
Invalid credentials
- {{#if isAuthProviderDocumize}} -
- {{#link-to 'auth.forgot'}}Forgot your password?{{/link-to}} + +
+ + {{focus-input type="email" value=email id="authEmail" class="form-control mousetrap" placeholder="" autocomplete="username email"}}
- {{/if}} - -
-{{/if}} \ No newline at end of file +
+ + {{input type="password" value=password id="authPassword" class="form-control" autocomplete="current-password"}} +
+ +
Invalid credentials
+ {{#if isAuthProviderDocumize}} +
+ {{#link-to 'auth.forgot'}}Forgot your password?{{/link-to}} +
+ {{/if}} + +
+ {{/if}} +
diff --git a/gui/app/pods/auth/reset/route.js b/gui/app/pods/auth/reset/route.js index fca11afd..de103902 100644 --- a/gui/app/pods/auth/reset/route.js +++ b/gui/app/pods/auth/reset/route.js @@ -19,10 +19,10 @@ export default Route.extend({ activate() { this.get('browser').setTitleAsPhrase('Reset Password'); - $('body').addClass('background-color-theme-light'); + $('body').addClass('background-color-theme-light d-flex justify-content-center align-items-center'); }, deactivate() { - $('body').removeClass('background-color-theme-light'); + $('body').removeClass('background-color-theme-light d-flex justify-content-center align-items-center'); } }); diff --git a/gui/app/pods/auth/reset/template.hbs b/gui/app/pods/auth/reset/template.hbs index f3a0c8c5..5b87d3d2 100644 --- a/gui/app/pods/auth/reset/template.hbs +++ b/gui/app/pods/auth/reset/template.hbs @@ -1,6 +1,8 @@ -
- - {{password-reset reset=(action 'reset')}} +
+
+ + {{password-reset reset=(action 'reset')}} +
diff --git a/gui/app/styles/layout/layout-master.scss b/gui/app/styles/layout/layout-master.scss index 390d1f94..f360bb13 100644 --- a/gui/app/styles/layout/layout-master.scss +++ b/gui/app/styles/layout/layout-master.scss @@ -132,3 +132,22 @@ footer { bottom: auto; } } + +/** + * Conditional CSS for Edge 12+. + * @link: https://jeffclayton.wordpress.com/2015/04/07/css-hacks-for-windows-10-and-spartan-browser-preview/ + */ + @supports (-ms-ime-align:auto) { + // For IE/Edge footer must be at bottom as sticky/flex is not quite supported. + .layout-footer, footer { + position: relative !important; + } +} + +/** + * Conditional CSS for IE 8+ (and old Firefox 1.x). + * @link: https://jeffclayton.wordpress.com/2015/04/07/css-hacks-for-windows-10-and-spartan-browser-preview/ + */ +@media screen\0 { + /* Conditional IE styles */ +} diff --git a/gui/app/templates/components/forgot-password.hbs b/gui/app/templates/components/forgot-password.hbs index 659dc6ab..e9ba745a 100644 --- a/gui/app/templates/components/forgot-password.hbs +++ b/gui/app/templates/components/forgot-password.hbs @@ -4,10 +4,10 @@ {{else}}
- {{focus-input type="email" value=email id="email" class="form-control {{if hasEmptyEmailError 'is-invalid')}}"}} + {{focus-input type="email" value=email id="email" class=(if hasEmptyEmailError 'form-control is-invalid' 'form-control')}}
- +
{{/if}}
diff --git a/gui/app/templates/components/password-reset.hbs b/gui/app/templates/components/password-reset.hbs index 75c7b375..1a89db5c 100644 --- a/gui/app/templates/components/password-reset.hbs +++ b/gui/app/templates/components/password-reset.hbs @@ -2,16 +2,16 @@
- {{focus-input type="password" value=password id="newPassword" class=(if hasPasswordError 'form-control is-invalid' 'form-control')}} + {{focus-input type="password" value=password id="newPassword" autocomplete="new-password" class=(if hasPasswordError 'form-control is-invalid' 'form-control')}} Choose a strong password
- {{input type="password" value=passwordConfirm id="passwordConfirm" class=(if hasConfirmError 'form-control is-invalid' 'form-control')}} + {{input type="password" value=passwordConfirm id="passwordConfirm" autocomplete="new-password" class=(if hasConfirmError 'form-control is-invalid' 'form-control')}} Please type your new password again
- + Passwords must match