From c0d9d9ceb80b43c6e566666ad74173b0a42725f7 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 26 Jan 2019 11:17:02 +0000 Subject: [PATCH] Fully remove the Strengthify integration --- resources/assets/js/cachet.js | 3 -- resources/assets/sass/dashboard.scss | 1 - .../sass/plugins/_password-strength.scss | 46 ------------------- resources/views/dashboard/team/edit.blade.php | 3 +- resources/views/setup/index.blade.php | 3 +- 5 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 resources/assets/sass/plugins/_password-strength.scss diff --git a/resources/assets/js/cachet.js b/resources/assets/js/cachet.js index 98c4fab44..f17e0d226 100644 --- a/resources/assets/js/cachet.js +++ b/resources/assets/js/cachet.js @@ -327,9 +327,6 @@ $(function () { .addClass("active"); } - // Password strength - $('.password-strength').strengthify(); - // Check for updates. if ($('#update-alert').length > 0) { $.ajax({ diff --git a/resources/assets/sass/dashboard.scss b/resources/assets/sass/dashboard.scss index 41c0127a9..56ec6c516 100644 --- a/resources/assets/sass/dashboard.scss +++ b/resources/assets/sass/dashboard.scss @@ -22,6 +22,5 @@ @import "plugins/sweetalert"; @import "plugins/messenger"; @import "plugins/animate"; -@import "plugins/password-strength"; @import "plugins/sortable"; /*! purgecss end ignore */ diff --git a/resources/assets/sass/plugins/_password-strength.scss b/resources/assets/sass/plugins/_password-strength.scss deleted file mode 100644 index c0f18003d..000000000 --- a/resources/assets/sass/plugins/_password-strength.scss +++ /dev/null @@ -1,46 +0,0 @@ -.strengthify-wrapper > * { - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; - filter: alpha(opacity=0); - opacity: 0; - -webkit-transition:all .5s ease-in-out; - -moz-transition:all .5s ease-in-out; - transition:all .5s ease-in-out; -} - -.strengthify-wrapper { - position: relative; -} - -.strengthify-bg, .strengthify-container, .strengthify-wrapper, .strengthify-separator { - height: 8px; -} - -.strengthify-bg, .strengthify-container { - display: block; - position: absolute; - width: 100%; -} - -.strengthify-bg { - background-color: #eeeeee; -} - -.strengthify-separator { - display: inline-block; - position: absolute; - background-color: #ffffff; - width: 2px; - z-index: 10; -} - -.password-bad { - background-color: $cachet-red; -} - -.password-medium { - background-color: $cachet-yellow; -} - -.password-good { - background-color: $cachet-green; -} diff --git a/resources/views/dashboard/team/edit.blade.php b/resources/views/dashboard/team/edit.blade.php index 9f5ab70d7..4ddb33ddc 100644 --- a/resources/views/dashboard/team/edit.blade.php +++ b/resources/views/dashboard/team/edit.blade.php @@ -26,8 +26,7 @@
- isAdmin ? "disabled": "" }} placeholder="{{ trans('forms.user.password') }}"> -
+ isAdmin ? "disabled": "" }} placeholder="{{ trans('forms.user.password') }}">
@if($currentUser->isAdmin)
diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php index 0507d8a0d..09b06ccca 100644 --- a/resources/views/setup/index.blade.php +++ b/resources/views/setup/index.blade.php @@ -205,8 +205,7 @@
- -
+ @if($errors->has('user.password')) {{ $errors->first('user.password') }} @endif