diff --git a/application/views/appointments/book.php b/application/views/appointments/book.php index 0db795ef..86e8d2a8 100755 --- a/application/views/appointments/book.php +++ b/application/views/appointments/book.php @@ -185,10 +185,10 @@
-
@@ -219,15 +219,15 @@
- -
@@ -242,21 +242,21 @@
- +
- +
- +
@@ -278,10 +278,16 @@
- +
+ + @@ -312,22 +318,16 @@ -
- - - -
-
- -
@@ -357,14 +357,14 @@
-
diff --git a/assets/css/error404.css b/assets/css/error404.css index 520ccc0b..4393da36 100644 --- a/assets/css/error404.css +++ b/assets/css/error404.css @@ -3,7 +3,7 @@ body { height: 100vh; display: table-cell; vertical-align: middle; - background-color: #F2F2F2; + background-color: #f5f8fa; } #message-frame { diff --git a/assets/css/forgot_password.css b/assets/css/forgot_password.css index 438a7e03..03282d95 100644 --- a/assets/css/forgot_password.css +++ b/assets/css/forgot_password.css @@ -3,7 +3,7 @@ body { height: 100vh; display: table-cell; vertical-align: middle; - background-color: #F2F2F2; + background-color: #f5f8fa; } #forgot-password-frame { diff --git a/assets/css/frontend.css b/assets/css/frontend.css index 294003d4..7a2f5ffb 100644 --- a/assets/css/frontend.css +++ b/assets/css/frontend.css @@ -19,7 +19,7 @@ body { } body { - background-color: #F2F2F2; + background-color: #f5f8fa; } #main { @@ -39,7 +39,7 @@ body { #book-appointment-wizard #header { overflow: auto; height: auto; - padding: 15px; + padding: 20px 15px; background: #429a82; } @@ -58,7 +58,7 @@ body { display: block; overflow: auto; margin: 15px auto; - width: 186px; + width: 190px; } #book-appointment-wizard #book-appointment-form #book-appointment-submit { @@ -126,7 +126,7 @@ body { #book-appointment-wizard .wizard-frame .command-buttons #button-next-1 { width: 100%; - max-width: 200px; + max-width: 150px; margin: auto; } @@ -139,7 +139,8 @@ body { padding: 8px; margin-right: 12px; margin-top: 6px; - border-radius: 8px; + border-radius: .25rem; + transition: all .3s linear; } #book-appointment-wizard .book-step:last-child { @@ -151,6 +152,7 @@ body { display: block; text-align: center; color: #0bb98d; + transition: all .3s linear; } #book-appointment-wizard .active-step { @@ -160,20 +162,19 @@ body { float: left; background: #FFF; padding: 7px; - margin-right: 12px; + margin-right: 13px; margin-top: 0; } #book-appointment-wizard .active-step strong { color: #429a82; - font-size: 20px; + font-size: 21px; } #book-appointment-wizard #frame-footer { padding: 15px; text-align: center; - border-top: 1px solid #EEE; - background: #FAFAFA; + border-top: 1px solid #ebeef1; } #book-appointment-wizard #steps .custom-qtip { @@ -261,7 +262,7 @@ body { #book-appointment-wizard #select-language, #book-appointment-wizard .backend-link { display: block; - width: 150px; + min-width: 120px; margin: 15px auto; padding: 5px; } @@ -279,6 +280,12 @@ body { min-height: 100vh; } + #book-appointment-wizard { + border-radius: .25rem; + overflow: hidden; + box-shadow: rgba(45, 62, 80, 0.12) 0 1px 5px 0; + } + #book-appointment-wizard #company-name { display: inline-block; float: left; @@ -297,7 +304,7 @@ body { #book-appointment-wizard .wizard-frame .command-buttons { display: flex; - justify-content: center; + justify-content: space-between; } #book-appointment-wizard .captcha-title { @@ -340,7 +347,7 @@ body { #book-appointment-wizard .backend-link { display: inline-block; - width: 100px; + min-width: 120px; padding: 5px; margin: 5px auto; } diff --git a/assets/css/login.css b/assets/css/login.css index 33da3045..6620c353 100644 --- a/assets/css/login.css +++ b/assets/css/login.css @@ -3,7 +3,7 @@ body { height: 100vh; display: table-cell; vertical-align: middle; - background-color: #F2F2F2; + background-color: #f5f8fa; } #login-frame { diff --git a/assets/css/logout.css b/assets/css/logout.css index e37dcf31..0b5c9a03 100644 --- a/assets/css/logout.css +++ b/assets/css/logout.css @@ -3,7 +3,7 @@ body { height: 100vh; display: table-cell; vertical-align: middle; - background-color: #F2F2F2; + background-color: #f5f8fa; } #logout-frame { diff --git a/assets/css/no_privileges.php.css b/assets/css/no_privileges.php.css index 6eccdc12..895826ec 100644 --- a/assets/css/no_privileges.php.css +++ b/assets/css/no_privileges.php.css @@ -3,7 +3,7 @@ body { height: 100vh; display: table-cell; vertical-align: middle; - background-color: #F2F2F2; + background-color: #f5f8fa; } #no-priv-frame { diff --git a/assets/js/frontend_book.js b/assets/js/frontend_book.js index 9e0d8640..1e4bd02a 100644 --- a/assets/js/frontend_book.js +++ b/assets/js/frontend_book.js @@ -536,27 +536,32 @@ window.FrontendBook = window.FrontendBook || {}; $('
', { 'html': [ $('

', { - 'text': $('#select-service option:selected').text() + 'text': EALang.appointment }), $('

', { 'html': [ - $('', { - 'class': 'text-info', - 'html': [ - $('', { - 'text': $('#select-provider option:selected').text() - }), - $('
'), - $('', { - 'text': selectedDate + ' ' + $('.selected-hour').text() - }), - $('
'), - $('', { - 'text': $('#select-timezone option:selected').text() - + (servicePrice ? ' - ' + servicePrice + ' ' + serviceCurrency : '') - }) - ] - }) + $('', { + 'text': EALang.service + ': ' + $('#select-service option:selected').text() + }), + $('
'), + $('', { + 'text': EALang.provider + ': ' + $('#select-provider option:selected').text() + }), + $('
'), + $('', { + 'text': EALang.start + ': ' + selectedDate + ' ' + $('.selected-hour').text() + }), + $('
'), + $('', { + 'text': EALang.timezone + ': ' + $('#select-timezone option:selected').text() + }), + $('
'), + $('', { + 'text': EALang.price + ': ' + servicePrice + ' ' + serviceCurrency, + 'prop': { + 'hidden': !servicePrice + } + }), ] }) ] @@ -577,10 +582,14 @@ window.FrontendBook = window.FrontendBook || {}; $('

', { 'html': [ $('

)', { - 'text': firstName + ' ' + lastName + 'text': EALang.customer }), $('

', { 'html': [ + $('', { + 'text': EALang.customer + ': ' + firstName + ' ' + lastName + }), + $('
'), $('', { 'text': EALang.phone_number + ': ' + phoneNumber }), diff --git a/assets/js/frontend_book_api.js b/assets/js/frontend_book_api.js index d3093f96..09b0537b 100755 --- a/assets/js/frontend_book_api.js +++ b/assets/js/frontend_book_api.js @@ -97,7 +97,7 @@ window.FrontendBookApi = window.FrontendBookApi || {}; $('#available-hours').append( $('