diff --git a/bower.json b/bower.json index be70ff2..552a4a1 100644 --- a/bower.json +++ b/bower.json @@ -11,7 +11,6 @@ "Sortable": "~1.6.0", "simplemde": "~1.11.2", "SpinKit": "~1.2.5", - "bootstrap-sass": "^3.3.7", "list.js": "^1.5.0", "pickadate": "^3.5.6" } diff --git a/gulpfile.js b/gulpfile.js index 00b8c12..7bda56e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -58,7 +58,7 @@ const jsDashboard = [ // Javascript libraries for the dashboard const jsDashboardLibs = [ "bower_components/jquery/dist/jquery.js", - "bower_components/bootstrap-sass/assets/javascripts/bootstrap.js", + "node_modules/bootstrap/dist/js/bootstrap.js", "bower_components/Sortable/Sortable.js", "bower_components/pickadate/lib/picker.js", "bower_components/pickadate/lib/picker.date.js", diff --git a/public/img/dashboard/checkmark.svg b/public/img/dashboard/checkmark.svg new file mode 100644 index 0000000..313dac3 --- /dev/null +++ b/public/img/dashboard/checkmark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/arrows-alt.svg b/public/img/dashboard/fa/arrows-alt.svg new file mode 100644 index 0000000..d885a5a --- /dev/null +++ b/public/img/dashboard/fa/arrows-alt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/bold.svg b/public/img/dashboard/fa/bold.svg new file mode 100644 index 0000000..045e7fb --- /dev/null +++ b/public/img/dashboard/fa/bold.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/code.svg b/public/img/dashboard/fa/code.svg new file mode 100644 index 0000000..ea8da70 --- /dev/null +++ b/public/img/dashboard/fa/code.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/columns.svg b/public/img/dashboard/fa/columns.svg new file mode 100644 index 0000000..84ec2a0 --- /dev/null +++ b/public/img/dashboard/fa/columns.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/eraser.svg b/public/img/dashboard/fa/eraser.svg new file mode 100644 index 0000000..1ba581e --- /dev/null +++ b/public/img/dashboard/fa/eraser.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/eye.svg b/public/img/dashboard/fa/eye.svg new file mode 100644 index 0000000..6a0a503 --- /dev/null +++ b/public/img/dashboard/fa/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/header.svg b/public/img/dashboard/fa/header.svg new file mode 100644 index 0000000..a482da1 --- /dev/null +++ b/public/img/dashboard/fa/header.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/italic.svg b/public/img/dashboard/fa/italic.svg new file mode 100644 index 0000000..d63a32b --- /dev/null +++ b/public/img/dashboard/fa/italic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/link.svg b/public/img/dashboard/fa/link.svg new file mode 100644 index 0000000..57caa9f --- /dev/null +++ b/public/img/dashboard/fa/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/list-ol.svg b/public/img/dashboard/fa/list-ol.svg new file mode 100644 index 0000000..693439b --- /dev/null +++ b/public/img/dashboard/fa/list-ol.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/list-ul.svg b/public/img/dashboard/fa/list-ul.svg new file mode 100644 index 0000000..a585166 --- /dev/null +++ b/public/img/dashboard/fa/list-ul.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/minus.svg b/public/img/dashboard/fa/minus.svg new file mode 100644 index 0000000..b82cfd8 --- /dev/null +++ b/public/img/dashboard/fa/minus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/picture-o.svg b/public/img/dashboard/fa/picture-o.svg new file mode 100644 index 0000000..4f7dd8d --- /dev/null +++ b/public/img/dashboard/fa/picture-o.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/question-circle.svg b/public/img/dashboard/fa/question-circle.svg new file mode 100644 index 0000000..9a30b85 --- /dev/null +++ b/public/img/dashboard/fa/question-circle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/quote-left.svg b/public/img/dashboard/fa/quote-left.svg new file mode 100644 index 0000000..d73aa5e --- /dev/null +++ b/public/img/dashboard/fa/quote-left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/repeat.svg b/public/img/dashboard/fa/repeat.svg new file mode 100644 index 0000000..c536b37 --- /dev/null +++ b/public/img/dashboard/fa/repeat.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/star.svg b/public/img/dashboard/fa/star.svg new file mode 100644 index 0000000..7cfd13b --- /dev/null +++ b/public/img/dashboard/fa/star.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/strikethrough.svg b/public/img/dashboard/fa/strikethrough.svg new file mode 100644 index 0000000..07f78c1 --- /dev/null +++ b/public/img/dashboard/fa/strikethrough.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/table.svg b/public/img/dashboard/fa/table.svg new file mode 100644 index 0000000..5690c5c --- /dev/null +++ b/public/img/dashboard/fa/table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/dashboard/fa/undo.svg b/public/img/dashboard/fa/undo.svg new file mode 100644 index 0000000..44b3904 --- /dev/null +++ b/public/img/dashboard/fa/undo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/assets/fonts/OpenSans-SemiBold.eot b/resources/assets/fonts/OpenSans-SemiBold.eot new file mode 100644 index 0000000..06b8dbf Binary files /dev/null and b/resources/assets/fonts/OpenSans-SemiBold.eot differ diff --git a/resources/assets/fonts/OpenSans-SemiBold.otf b/resources/assets/fonts/OpenSans-SemiBold.otf new file mode 100644 index 0000000..4f31d32 Binary files /dev/null and b/resources/assets/fonts/OpenSans-SemiBold.otf differ diff --git a/resources/assets/fonts/OpenSans-SemiBold.ttf b/resources/assets/fonts/OpenSans-SemiBold.ttf new file mode 100644 index 0000000..99db86a Binary files /dev/null and b/resources/assets/fonts/OpenSans-SemiBold.ttf differ diff --git a/resources/assets/fonts/OpenSans-SemiBold.woff b/resources/assets/fonts/OpenSans-SemiBold.woff new file mode 100644 index 0000000..71478b7 Binary files /dev/null and b/resources/assets/fonts/OpenSans-SemiBold.woff differ diff --git a/resources/assets/fonts/OpenSans-SemiBold.woff2 b/resources/assets/fonts/OpenSans-SemiBold.woff2 new file mode 100644 index 0000000..a5ca0bb Binary files /dev/null and b/resources/assets/fonts/OpenSans-SemiBold.woff2 differ diff --git a/resources/assets/js/dashboard.js b/resources/assets/js/dashboard.js index eccb35b..64ad163 100644 --- a/resources/assets/js/dashboard.js +++ b/resources/assets/js/dashboard.js @@ -4,7 +4,7 @@ jQuery.fn.reverse = [].reverse; // show the confirmation modal and run the supplied command if confirm is pressed function askConfirmation(message, command, cancelCommand) { const $confirmationModal = $("#confirmation-modal"), - $heading = $confirmationModal.find(".panel-heading"), + $heading = $confirmationModal.find(".card-header"), $cancelButton = $confirmationModal.find(".btn.cancel-button"), $confirmButton = $confirmationModal.find(".btn.confirm-button"), fadeTime = 250; @@ -452,7 +452,7 @@ function editItemInit() { const contentChanged = function() { changes = true; - $submit.removeClass("disabled"); + $submit.removeClass("no-input"); }; $(".edit-button.delete.image").on("click", function(e) { diff --git a/resources/assets/sass/_fonts.scss b/resources/assets/sass/_fonts.scss index 5ca33ed..b0fbd7a 100644 --- a/resources/assets/sass/_fonts.scss +++ b/resources/assets/sass/_fonts.scss @@ -10,6 +10,18 @@ font-style: normal; } +@font-face { + font-family: "OpenSans-SemiBold"; + src: url("/fonts/OpenSans-SemiBold.eot"); + src: url("/fonts/OpenSans-SemiBold.eot?#iefix") format("embedded-opentype"), + url("/fonts/OpenSans-SemiBold.woff") format("woff"), + url("/fonts/OpenSans-SemiBold.woff2") format("woff2"), + url("/fonts/OpenSans-SemiBold.ttf") format("truetype"), + url("/fonts/OpenSans-SemiBold.otf") format("opentype"); + font-weight: normal; + font-style: normal; +} + @font-face { font-family: "OpenSans-Bold"; src: url("/fonts/OpenSans-Bold.eot"); @@ -32,6 +44,11 @@ font-family: "OpenSans-Regular", Arial, Helvetica, sans-serif; } +@mixin font-sans-semibold { + @include normalize-font; + font-family: "OpenSans-SemiBold", Arial, Helvetica, sans-serif; +} + @mixin font-sans-bold { @include normalize-font; font-family: "OpenSans-Bold", Arial, Helvetica, sans-serif; diff --git a/resources/assets/sass/dashboard.scss b/resources/assets/sass/dashboard.scss index 2571123..0817791 100644 --- a/resources/assets/sass/dashboard.scss +++ b/resources/assets/sass/dashboard.scss @@ -1,5 +1,5 @@ // Libraries -@import "bootstrap-sass/assets/stylesheets/_bootstrap.scss"; +@import "bootstrap/scss/bootstrap.scss"; @import "pickadate/lib/themes/default"; @import "pickadate/lib/themes/default.date"; @import "simplemde/dist/simplemde.min"; @@ -12,11 +12,15 @@ $c-text: #111; // text $c-text-light: #fff; // light text $c-input-bg: #fff; // white +$c-dashboard-error: #a80000; $c-dashboard-dark: #3e6087; $c-dashboard-light: #f1f1f1; $c-dashboard-edit: #87823e; $c-dashboard-delete: #87483e; +// Sizes +$navbar-height: 50px; + // // Main Dashboard Styles // @@ -36,7 +40,7 @@ body { border: 0; background-color: $c-dashboard-dark; - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { margin-bottom: 0px; } @@ -50,7 +54,7 @@ body { font-weight: bold; white-space: nowrap; - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { font-size: 12px; } } @@ -117,15 +121,16 @@ body { } } -.panel-default { +.card { margin-top: 20px; margin-bottom: 20px; - .panel-body { + .card-body { + padding: 15px; background-color: lighten($c-dashboard-light, 1%); &.dashboard { - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { padding: 0px; } } @@ -134,7 +139,7 @@ body { margin-bottom: 10px; width: 100%; - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { margin: 3px 3px 0px 3px; width: calc(100% - 6px); } @@ -151,13 +156,15 @@ body { } } - > .panel-heading { + > .card-header { position: relative; + padding: 9px 15px; border-top: 1px solid darken($c-dashboard-dark, 5%); border-right: 1px solid darken($c-dashboard-dark, 5%); border-left: 1px solid darken($c-dashboard-dark, 5%); background-color: $c-dashboard-dark; color: $c-dashboard-light; + font-size: 14px; font-weight: bold; .dashboard-heading { @@ -181,69 +188,98 @@ body { } } -.form-control:focus { - border-color: $c-dashboard-dark; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px fade-out($c-dashboard-dark, 0.4); -} +.card-body .form-group { + margin-bottom: 15px; -.panel-body .form-group .checkbox { - position: relative; - display: inline-block; - min-height: 0px; - padding-top: 0px; - padding-left: 22px; - user-select: none; + label { + @include font-sans-semibold; + font-size: 14px; - span, input { - position: absolute; - top: 50%; - left: 0px; - transform: translateY(-50%); - display: block; - width: 16px; - height: 16px; + @include media-breakpoint-up(md) { + text-align: right; + } } - span { - border: 1px solid lighten($c-text, 50%); - border-radius: 4px; - background-color: $c-input-bg; - pointer-events: none; + .form-control { + font-size: 14px; + transition: border-color 150ms, box-shadow 150ms; - &:after { - content: ""; + &:focus { + border-color: $c-dashboard-dark; + box-shadow: inset 0 1px 1px fade-out(#000, 0.925), 0 0 8px fade-out($c-dashboard-dark, 0.4); + } + } + + &.has-error .form-control { + border-color: $c-dashboard-error; + } + + .checkbox { + position: relative; + display: inline-block; + min-height: 0px; + padding-top: 0px; + padding-left: 22px; + user-select: none; + + span, input { position: absolute; - top: 0px; + top: 50%; left: 0px; - transform: scale(0); + transform: translateY(-50%); display: block; - width: 100%; - height: 100%; - background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyOC4zOTUgMjUuNDczIj48ZyB0cmFuc2Zvcm09InJvdGF0ZSgzMy44NzYgODIuNzY0IC0xNy40NDYpIiBmaWxsPSIjMDAwMDAxIiBzdHJva2U9IiMwMDAiIHN0cm9rZS1saW5lY2FwPSJzcXVhcmUiPjxyZWN0IHJ5PSIwIiB5PSI1MS4xMDgiIHg9IjMyLjk5NyIgaGVpZ2h0PSI1LjY1NSIgd2lkdGg9IjE2LjA4NSIgc3Ryb2tlLXdpZHRoPSIuMTE4Ii8+PHJlY3QgdHJhbnNmb3JtPSJyb3RhdGUoOTApIiByeT0iMCIgeT0iLTQ5LjA3NyIgeD0iMzAuMDg2IiBoZWlnaHQ9IjUuNjQ2IiB3aWR0aD0iMjAuOTQ3IiBzdHJva2Utd2lkdGg9Ii4xMzQiLz48L2c+PC9zdmc+"); - background-position: center center; - background-size: 65% auto; - background-repeat: no-repeat; + width: 16px; + height: 16px; + } + + span { + border: 1px solid lighten($c-text, 50%); + border-radius: 4px; + background-color: $c-input-bg; + pointer-events: none; + + &:after { + content: ""; + position: absolute; + top: 0px; + left: 0px; + transform: scale(0); + display: block; + width: 100%; + height: 100%; + background-image: url("/img/dashboard/checkmark.svg"); + background-position: center center; + background-size: 65% auto; + background-repeat: no-repeat; + opacity: 0; + transition: transform 150ms, opacity 150ms; + } + } + + input { + margin: 0px; + padding: 0px; opacity: 0; - transition: transform 150ms, opacity 150ms; + cursor: pointer; + + &:checked + span:after { + transform: scale(1); + opacity: 1; + } } } - input { - margin: 0px; - padding: 0px; - opacity: 0; - cursor: pointer; - - &:checked + span:after { - transform: scale(1); - opacity: 1; - } + .text-muted { + font-size: 10px; + text-transform: uppercase; } } .btn { border-color: darken($c-dashboard-dark, 5%); background-color: $c-dashboard-dark; + color: $c-text-light; + font-size: 14px; transition: background-color 100ms; &:hover { background-color: darken($c-dashboard-dark, 5%); } &:focus { background-color: lighten($c-dashboard-dark, 5%); } @@ -253,6 +289,10 @@ body { margin-bottom: 3px; } + &.btn-warning, &.btn-danger { + &:hover, &:focus, &:active { color: $c-text-light !important; } + } + &.btn-warning { border-color: darken($c-dashboard-edit, 10%); background-color: $c-dashboard-edit; @@ -267,7 +307,7 @@ body { &:focus { background-color: lighten($c-dashboard-delete, 5%); } } - &.btn-default { + &.btn-secondary { border-color: darken($c-dashboard-light, 10%); background-color: $c-dashboard-light; color: $c-text; @@ -280,7 +320,7 @@ body { } .view-table-container { - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { padding: 10px 5px; } @@ -291,7 +331,7 @@ body { border-bottom: 1px solid #666; } - @media (max-width: $screen-md-max) { + @include media-breakpoint-down(lg) { tr { &.heading-row { display: none; @@ -326,7 +366,7 @@ body { } } - @media (min-width: $screen-lg-min) { + @include media-breakpoint-up(xl) { > tbody > tr > td { padding: 20px 8px; } > tbody > tr:last-child > td { padding-bottom: 0px; } .mobile-heading { display: none; } @@ -364,16 +404,16 @@ body { padding-top: 4px; padding-bottom: 4px; - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { margin: 3px; } - @media (min-width: $screen-sm-min) { + @include media-breakpoint-up(md) { display: flex; } &.sortable { - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { padding-left: 50px; } } @@ -384,11 +424,11 @@ body { padding-left: 0px; font-family: "Lucida Console", Monaco, monospace; - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { text-align: center; } - @media (min-width: $screen-sm-min) { + @include media-breakpoint-up(md) { overflow: hidden; flex-grow: 1; white-space: nowrap; @@ -401,7 +441,7 @@ body { transition: opacity 100ms; cursor: grab; - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { position: absolute; top: 50%; left: 20px; @@ -443,12 +483,12 @@ body { } .spacer { - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { display: block; font-size: 0; } - @media (min-width: $screen-sm-min) { + @include media-breakpoint-up(md) { display: inline-block; } } @@ -457,26 +497,26 @@ body { .button-column { padding-right: 0px; - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { padding-bottom: 5px; padding-left: 0px; text-align: center; } - @media (min-width: $screen-sm-min) { + @include media-breakpoint-up(md) { padding-left: 5px; flex-shrink: 0; text-align: right; } .btn { - margin: 3px; + margin: 5px 3px; min-width: 70px; height: 26px; padding-top: 1px; padding-bottom: 2px; - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { min-width: 33%; } } @@ -510,7 +550,7 @@ body { } .picker__select--year, .picker__select--month, .picker__month, .picker__day, .picker__weekday, .picker__footer { - @media (max-width: $screen-xs-max) { + @include media-breakpoint-down(sm) { font-size: 16px; } } @@ -591,8 +631,10 @@ body { .submit-button { float: right; + transition: opacity 150ms; - &.disabled { + &.no-input { + opacity: 0.65; pointer-events: none; } } @@ -600,7 +642,7 @@ body { .back-button, .submit-button { margin: 25px 15px 15px 15px; - @media (max-width: ($screen-sm - 1)) { + @include media-breakpoint-down(sm) { float: none; width: calc(100% - 30px); &:first-child { margin: 25px 15px 5px 15px; } @@ -646,21 +688,30 @@ body { display: table-cell; vertical-align: middle; text-align: center; - .panel { margin: 0px; } + + .card { + margin: 0px; + } .btn { margin: 20px 15px; display: inline-block; + + &:not(:last-child) { + margin-bottom: 0px; + } } } &#alert-modal { .modal-container { - .panel { position: relative; } + .card { + position: relative; + } .message { min-height: 50px; - padding: 15px 106px 10px 20px; + padding: 15px 75px 15px 20px; text-align: left; } @@ -673,3 +724,101 @@ body { } } } + +.fa { + position: relative; + vertical-align: bottom; + + &:after { + content: ""; + position: absolute; + top: 0px; + left: 0px; + display: block; + width: 100%; + height: 100%; + background-position: center center; + background-size: 10px auto; + background-repeat: no-repeat; + } + + &.fa-arrows-alt:after { + background-image: url("/img/dashboard/fa/arrows-alt.svg"); + } + + &.fa-bold:after { + background-image: url("/img/dashboard/fa/bold.svg"); + } + + &.fa-code:after { + background-image: url("/img/dashboard/fa/code.svg"); + } + + &.fa-columns:after { + background-image: url("/img/dashboard/fa/columns.svg"); + } + + &.fa-eraser:after { + background-image: url("/img/dashboard/fa/eraser.svg"); + } + + &.fa-eye:after { + background-image: url("/img/dashboard/fa/eye.svg"); + } + + &.fa-header:after { + background-image: url("/img/dashboard/fa/header.svg"); + } + + &.fa-italic:after { + background-image: url("/img/dashboard/fa/italic.svg"); + } + + &.fa-link:after { + background-image: url("/img/dashboard/fa/link.svg"); + } + + &.fa-list-ol:after { + background-image: url("/img/dashboard/fa/list-ol.svg"); + } + + &.fa-list-ul:after { + background-image: url("/img/dashboard/fa/list-ul.svg"); + } + + &.fa-minus:after { + background-image: url("/img/dashboard/fa/minus.svg"); + } + + &.fa-picture-o:after { + background-image: url("/img/dashboard/fa/picture-o.svg"); + } + + &.fa-question-circle:after { + background-image: url("/img/dashboard/fa/question-circle.svg"); + } + + &.fa-quote-left:after { + background-image: url("/img/dashboard/fa/quote-left.svg"); + } + + &.fa-repeat:after { + background-image: url("/img/dashboard/fa/repeat.svg"); + } + + &.fa-star:after { + background-image: url("/img/dashboard/fa/star.svg"); + } + + &.fa-strikethrough:after { + background-image: url("/img/dashboard/fa/strikethrough.svg"); + } + + &.fa-table:after { + background-image: url("/img/dashboard/fa/table.svg"); + } + + &.fa-undo:after { + background-image: url("/img/dashboard/fa/undo.svg"); + } +} diff --git a/resources/components/pages/contact.vue b/resources/components/pages/contact.vue index db4b447..c71856d 100644 --- a/resources/components/pages/contact.vue +++ b/resources/components/pages/contact.vue @@ -2,13 +2,13 @@
-
+

Contact

-
+
diff --git a/resources/views/auth/emails/password.blade.php b/resources/views/auth/emails/password.blade.php index c4a5834..4ef0419 100644 --- a/resources/views/auth/emails/password.blade.php +++ b/resources/views/auth/emails/password.blade.php @@ -1 +1 @@ -Click here to reset your password: {{ url('password/reset', $token).'?email='.urlencode($user->getEmailForPasswordReset()) }} +Click here to reset your password: {{ url('password/reset', $token) . '?email=' . urlencode($user->getEmailForPasswordReset()) }} diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 0dc0add..104f0e8 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -3,44 +3,44 @@ @section('page-content')
-
-
-
Login
+
+
+
Login
-
- +
+ {!! csrf_field() !!} -
- +
+ -
- +
+ @if ($errors->has('email')) - + {{ $errors->first('email') }} @endif
-
- +
+ -
- +
+ @if ($errors->has('password')) - + {{ $errors->first('password') }} @endif
-
-
+
+
-
-
+
+
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 0569748..8aecc6d 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -3,36 +3,36 @@ @section('page-content')
-
-
-
Reset Password
+
+
+
Reset Password
-
+
@if (session('status'))
{{ session('status') }}
@endif - + {!! csrf_field() !!} -
- +
+ -
- +
+ @if ($errors->has('email')) - + {{ $errors->first('email') }} @endif
-
-
+
+
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index 3953ce4..91da9b3 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -3,59 +3,60 @@ @section('page-content')
-
-
-
Reset Password
+
+
+
Reset Password
-
- +
+ {!! csrf_field() !!} -
- +
+ -
- +
+ @if ($errors->has('email')) - + {{ $errors->first('email') }} @endif
-
- +
+ -
- +
+ @if ($errors->has('password')) - + {{ $errors->first('password') }} @endif
-
- -
- +
+ + +
+ @if ($errors->has('password_confirmation')) - + {{ $errors->first('password_confirmation') }} @endif
-
-
+
+
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 92bc77f..006a066 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -3,72 +3,72 @@ @section('page-content')
-
-
-
Register
+
+
+
Register
-
- +
+ {!! csrf_field() !!} -
- +
+ -
- +
+ @if ($errors->has('name')) - + {{ $errors->first('name') }} @endif
-
- +
+ -
- +
+ @if ($errors->has('email')) - + {{ $errors->first('email') }} @endif
-
- +
+ -
- +
+ @if ($errors->has('password')) - + {{ $errors->first('password') }} @endif
-
- +
+ -
- +
+ @if ($errors->has('password_confirmation')) - + {{ $errors->first('password_confirmation') }} @endif
-
-
+
+
diff --git a/resources/views/dashboard/core.blade.php b/resources/views/dashboard/core.blade.php index b9e42a8..bdaebfc 100644 --- a/resources/views/dashboard/core.blade.php +++ b/resources/views/dashboard/core.blade.php @@ -3,9 +3,9 @@ @section('page-content')
-
-
-
+
+
+
{{ $heading }}
@@ -13,7 +13,7 @@
-
+
@yield('dashboard-body')
@@ -25,9 +25,9 @@
-
-
-
+
+
+
@@ -41,9 +41,9 @@
-
-
-
ALERT
+
+
+
ALERT
diff --git a/resources/views/dashboard/edit-item.blade.php b/resources/views/dashboard/edit-item.blade.php index d50445c..c373fc9 100644 --- a/resources/views/dashboard/edit-item.blade.php +++ b/resources/views/dashboard/edit-item.blade.php @@ -4,7 +4,7 @@ @if(!empty($help_text))
-
+
{!! $help_text !!}
@@ -24,11 +24,11 @@ @if($column['type'] == 'hidden') @elseif($column['type'] != 'display' || $id != 'new') -
+
-
+
@if($column['type'] == 'text') @elseif($column['type'] == 'date') @@ -86,8 +86,8 @@ @endforeach
- - + +
diff --git a/resources/views/dashboard/edit-list.blade.php b/resources/views/dashboard/edit-list.blade.php index 26adef9..f9553e7 100644 --- a/resources/views/dashboard/edit-list.blade.php +++ b/resources/views/dashboard/edit-list.blade.php @@ -2,11 +2,11 @@ @section('dashboard-heading') @if($export && count($rows) > 0) - + @endif @if($create) - + @endif @endsection @@ -49,7 +49,7 @@
@if(isset($button) && is_array($button)) - + @endif diff --git a/resources/views/dashboard/view.blade.php b/resources/views/dashboard/view.blade.php index 1918283..6ee2964 100644 --- a/resources/views/dashboard/view.blade.php +++ b/resources/views/dashboard/view.blade.php @@ -2,7 +2,7 @@ @section('dashboard-heading') @if(count($rows) > 0) - + @endif @endsection