diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..020d46645 --- /dev/null +++ b/.gitignore @@ -0,0 +1,255 @@ + +# Editors, tools and OS's + +.buildpath +/.htaccess +.project +.settings +.idea +.svn +.DS_Store +.sass-cache +config.codekit +*.sublime-project +*.sublime-workspace +nbproject +bower_components +composer.lock + +# Cache, temp and personal files + +/cache/** +!/cache/cacert.pem +!/cache/index.php + +!/cache/cachefs/ +!/cache/cachefs/index.php + +!/cache/purifier/ +!/cache/purifier/index.php + +!/cache/push/ +!/cache/push/activity +!/cache/push/index.php +!/cache/push/trends + +!/cache/sandbox/ +!/cache/sandbox/index.php +!/cache/smarty/ + +!/cache/smarty/cache/ +!/cache/smarty/cache/index.php +!/cache/smarty/compile/ +!/cache/smarty/compile/index.php +!/cache/smarty/index.php + +!/cache/tcpdf/ +!/cache/tcpdf/index.php + + +/download/* +!/download/.htaccess +!/download/index.php + +img/** +!/img/404.gif +!/img/admin/ +!/img/admin/*.gif +!/img/admin/*.png +!/img/admin/*.jpg +!/img/admin/index.php +!/img/bg_500.png +!/img/bg_loader.png +!/img/c/ +!/img/c/index.php +!/img/cms/ +!/img/cms/.htaccess +!/img/cms/cms-img.jpg +!/img/cms/index.php +!/img/co/ +!/img/co/index.php +!/img/favicon.ico +!/img/genders/ +!/img/genders/Unknown.jpg +!/img/genders/index.php +!/img/hotel_header_image.jpg +!/img/index.php +!/img/jquery-ui/ +!/img/jquery-ui/*.png +!/img/jquery-ui/index.php +!/img/l/ +!/img/l/index.php +!/img/l/none.jpg +!/img/loader.gif +!/img/loadingAnimation.gif +!/img/logo.jpg +!/img/logo_invoice.jpg +!/img/logo_mail.jpg +!/img/logo_stores.gif +!/img/logo_stores.png +!/img/m/ +!/img/m/index.php +!/img/macFFBgHack.png +!/img/os/ +!/img/os/index.php +!/img/p/ +!/img/p/index.php +!/img/prestashop-avatar.png +!/img/qloapps@2x.png +!/img/qloapps-login@2x.png +!/img/qloapps-login-wink@2x.png +!/img/questionmark.png +!/img/rf/ +!/img/rf/index.php +!/img/s/ +!/img/s/index.php +!/img/scenes/ +!/img/scenes/index.php +!/img/scenes/thumbs/ +!/img/scenes/thumbs/index.php +!/img/st/ +!/img/st/index.php +!/img/su/ +!/img/su/index.php +!/img/t/ +!/img/t/*.gif +!/img/t/index.php +!/img/tmp/ +!/img/tmp/index.php + +/log/* +!/log/.htaccess +!/log/index.php + +/upload/* +!/upload/.htaccess +!/upload/index.php + +/admin/backups/* +!/admin/backups/.htaccess +!/admin/backups/index.php + +/admin/import/* +!/admin/import/.htaccess +!/admin/import/index.php + +/themes/*/cache/* +!/themes/*/cache/index.php + +/admin/themes/*/cache/* +!/admin/themes/*/cache/index.php + +# Config + +/config/settings.inc.php +/config/settings.old.php + +/config/xml/** +!/config/xml/.htaccess +!/config/xml/index.php +!/config/xml/qlo_mod_list.xml +!config/xml/themes/ +!config/xml/themes/default.xml +!config/xml/themes/index.php + +# Themes, modules and overrides + +# modules/* +/modules/*/config.xml +/modules/*/translations/* + +/override/* +!/override/.htaccess +!/override/index.php +!/override/readme_override.txt + +!/override/classes/ +!/override/classes/index.php +!/override/classes/cache/ +!/override/classes/cache/index.php +!/override/classes/controller/ +!/override/classes/controller/index.php +!/override/classes/db/ +!/override/classes/db/index.php +!/override/classes/exception/ +!/override/classes/exception/index.php +!/override/classes/helper/ +!/override/classes/helper/index.php +!/override/classes/log/ +!/override/classes/log/index.php +!/override/classes/module/ +!/override/classes/module/index.php +!/override/classes/order/ +!/override/classes/order/index.php +!/override/classes/pdf/ +!/override/classes/pdf/index.php +!/override/classes/range/ +!/override/classes/range/index.php +!/override/classes/shop/ +!/override/classes/shop/index.php +!/override/classes/stock/ +!/override/classes/stock/index.php +!/override/classes/tax/ +!/override/classes/tax/index.php +!/override/classes/tree/ +!/override/classes/tree/index.php +!/override/classes/webservice/ +!/override/classes/webservice/index.php + +!/override/controllers/ +!/override/controllers/index.php +!/override/controllers/admin/ +!/override/controllers/admin/index.php +!/override/controllers/admin/templates/ +!/override/controllers/admin/templates/index.php +!/override/controllers/front + +!/override/modules/ +!/override/modules/index.php + + +admin/themes/default/sass/ie.sass +admin/themes/default/sass/print.sass +admin/themes/default/sass/screen.sass + +admin/themes/default/css/ie.css +admin/themes/default/css/print.css +admin/themes/default/css/screen.css + +# Translations and emails templates + +/translations/** +!/translations/index.php +!/translations/en.gzip + +!/translations/export/ +!/translations/export/index.php + +/mails/* +!/mails/.htaccess +!/mails/index.php +!/mails/en/ + +/themes/hotel-reservation-theme/cache/* +!/themes/hotel-reservation-theme/cache/ +!/themes/hotel-reservation-theme/cache/index.php + +/themes/hotel-reservation-theme/lang/* +!/themes/hotel-reservation-theme/lang/index.php +!/themes/hotel-reservation-theme/lang/en.php + +/themes/hotel-reservation-theme/modules/*/translations/*.php +!/themes/hotel-reservation-theme/modules/*/translations/index.php + +/themes/hotel-reservation-theme/mails/* +!/themes/hotel-reservation-theme/mails/index.php +!/themes/hotel-reservation-theme/mails/en/ + +/themes/hotel-reservation-theme/modules/*/mails/* +!/themes/hotel-reservation-theme/modules/*/mails/index.php +!/themes/hotel-reservation-theme/modules/*/mails/en + +# MISC + +**sitemap.xml +robots.txt \ No newline at end of file diff --git a/admin/themes/default/js/admin-theme.js b/admin/themes/default/js/admin-theme.js index 922168b95..fc7d85e69 100644 --- a/admin/themes/default/js/admin-theme.js +++ b/admin/themes/default/js/admin-theme.js @@ -86,9 +86,8 @@ function error_modal(heading, msg) { } //move to hash after clicking on anchored links -function scroll_if_anchor(href) { +function scroll_if_anchor(href, fromTop = 120) { href = typeof(href) === "string" ? href : $(this).attr("href"); - var fromTop = 120; if(href.indexOf("#") === 0) { var $target = $(href); if($target.length) { diff --git a/admin/themes/default/sass/admin-theme.sass b/admin/themes/default/sass/admin-theme.sass index fea142b9f..b1ccd1005 100644 --- a/admin/themes/default/sass/admin-theme.sass +++ b/admin/themes/default/sass/admin-theme.sass @@ -84,6 +84,7 @@ @import "partials/date-range-picker" @import "partials/multistore" @import "partials/product" + @import "partials/skeleton-loading" //Controllers @import "controllers/carrier-wizard" @@ -110,6 +111,3 @@ //Print support @import "partials/print" - -//Add css -@import "partials/css" diff --git a/admin/themes/default/sass/controllers/_customer-thread.sass b/admin/themes/default/sass/controllers/_customer-thread.sass index c4cc6b3c8..a3678333d 100644 --- a/admin/themes/default/sass/controllers/_customer-thread.sass +++ b/admin/themes/default/sass/controllers/_customer-thread.sass @@ -1,18 +1,5 @@ //Avatar -.employee_avatar_small - @extend .avatar-sm - vertical-align: middle - img - padding: 0 - border: none - -.employee_avatar - @extend .avatar-lg - display: block!important - margin: 10px auto!important - text-align: center - .avatar-xs @include avatar(16px, 16px) .avatar-sm diff --git a/admin/themes/default/sass/controllers/_login.sass b/admin/themes/default/sass/controllers/_login.sass index 4cb8eb5b7..40e4e8406 100644 --- a/admin/themes/default/sass/controllers/_login.sass +++ b/admin/themes/default/sass/controllers/_login.sass @@ -10,7 +10,7 @@ z-index: 1 position: absolute margin: 0 auto - width: 69.5px + text-align: center left: 0 right: 0 @@ -70,6 +70,8 @@ display: none z-index: 1 @include rotateY(180deg) + .login-actions + position: relative #shop_name text-align: center diff --git a/admin/themes/default/sass/partials/_css.sass b/admin/themes/default/sass/partials/_css.sass deleted file mode 100644 index 8f9ef9ba4..000000000 --- a/admin/themes/default/sass/partials/_css.sass +++ /dev/null @@ -1,155 +0,0 @@ -.datepicker2 - background: #fff - position: absolute - z-index: 599 - right: -10rem - .daterangepicker - border-radius: 5px 5px 0 0 !important -.bootstrap - #datepicker - .daterangepicker - thead - tr - th - padding: 0.7em 0.3em - text-align: center - font-weight: bold - border: 0 - background-color: #fff !important - color: #555555 !important - font-size: 14px - text-transform: capitalize - &:first-child - th - font-size: unset - font-weight: bold - background-color: #00AFF0 !important - border: unset !important - color: #fff !important - padding: unset !important - text-transform: capitalize - .icon-angle-left - font-weight: bold - padding: 10px - .icon-angle-right - font-weight: bold - padding: 10px - th - &.prev - border-top-left-radius: 8px !important - border-bottom-left-radius: 8px !important - left: 2px - top: 3px - &.next - border-top-right-radius: 8px !important - border-bottom-right-radius: 8px !important - right: 2px - top: 3px - &.month-switch - top: 3px - td - padding: 5px 10px - color: #555 -.ui-datepicker - width: auto !important - margin: 5px auto 0 - width: auto !important - z-index: 1032 !important - .ui-datepicker-header - background-color: #00AFF0 !important - .ui-datepicker-title - color: #fff - font-style: normal - font-weight: bold - font-size: unset - thead - background-color: #f7f7f7 - th - font-style: normal - font-size: 15px - line-height: 23px - color: #555555 - tbody - td - &:last-child - border-right: 0px - tr - border-bottom: 1px solid #bbb - border: none - &:last-child - border-bottom: 0px - a - text-decoration: none -.form-date-actions .btn:hover, .form-date-actions .btn:focus, .form-date-actions .btn:active - outline: unset !important - text-decoration: none -.form-date-actions - bottom: -24px - position: absolute - width: 100% - z-index: 599 - background-color: #fff - border: solid 1px #ccc - border-radius: 0 0 5px 5px -.ui-datepicker-prev - float: left - cursor: pointer - left: 15px !important - &::before - background-position: center -30px - font-weight: bold - font-size: 16px - color: #fff - content: "\f104" - font-family: FontAwesome -.ui-datepicker-next - float: right - cursor: pointer - &::before - background-position: center -30px - font-weight: bold - font-size: 16px - color: #fff - content: "\f105" - font-family: FontAwesome - &:hover - top: 5px !important - right: 2px !important -.ui-state-hover, -.ui-widget-content .ui-state-hover, -.ui-widget-header .ui-state-hover, -.ui-state-focus, -.ui-widget-content .ui-state-focus, -.ui-widget-header .ui-state-focus - border: unset - background: none - font-weight: none - color: none -.ui-datepicker td span, -.ui-datepicker td a - display: inline-block - text-align: center - line-height: 25px - color: #ffffff -.ui-datepicker .ui-datepicker-prev, -.ui-datepicker .ui-datepicker-next - top: 5px !important -.ui-state-default, -.ui-widget-content .ui-state-default, -.ui-widget-header .ui-state-default - border: none !important -.ui-widget-content - .ui-icon - background-image: none !important -.ui-datepicker td span, .ui-datepicker td a - text-align: center !important - padding: 4px 9px !important -.ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus - background: unset !important - border: unset !important -.ui-widget-content .ui-slider-handle, .ui-datepicker-current .ui-slider-handle - border: 1px solid #d3d3d3 !important - color: #555555 !important - background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) !important -.ui-datepicker-prev-hover - top: unset !important diff --git a/admin/themes/default/sass/partials/_date-picker.sass b/admin/themes/default/sass/partials/_date-picker.sass index cbcaed2df..e864cf8e9 100644 --- a/admin/themes/default/sass/partials/_date-picker.sass +++ b/admin/themes/default/sass/partials/_date-picker.sass @@ -14,42 +14,340 @@ // ui-datepicker-buttonpane: The buttonpane that is used when the showButtonPanel option is set. // ui-datepicker-current: The button used to select today's date. +$color-bright: white + +$color-calendar: #00A4E7 +$color-calendar-compare: #FF8000 + +$color-calendar-day: $color-bright + +$color-calendar-outrange: #ccc + +$color-calendar-day-selected: $color-calendar +$color-calendar-day-selected-compare: $color-calendar-compare + +$color-calendar-range: lighten($color-calendar,10%) +$color-calendar-range-compare: lighten($color-calendar-compare,10%) + +.datepicker2 + background: #fff + position: absolute + z-index: 599 + right: -10rem + .daterangepicker + border-radius: 5px 5px 0 0 !important +.bootstrap + #datepicker + .daterangepicker + position: relative + width: 100% + font-family: Verdana, Arial, sans-serif + font-size: 13px + box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.26) + margin-bottom: 8px + padding: 12px + border-bottom-left-radius: 0 + border-bottom-right-radius: 0 + table + width: 100% + margin: 0 + border-spacing: 1px + thead + tr th + text-transform: uppercase + text-align: center + font-weight: bold + border: 0 + background-color: #fff !important + color: #777 !important + font-size: 14px + tr:first-child th + padding-bottom: 10px + text-transform: capitalize + .icon-angle-left + font-weight: bold + padding-left: 6px + &:after + content: '' + position: absolute + top: -5px + left: -2px + width: 24px + height: 24px + background-color: #f0f0f0 + z-index: -1 + border-radius: 50% + .icon-angle-right + font-weight: bold + padding-right: 6px + &:after + content: '' + position: absolute + top: -5px + right: -2px + width: 24px + height: 24px + background-color: #f0f0f0 + z-index: -1 + border-radius: 50% + td, th + text-align: center + padding: 0 + position: relative + tr + border-bottom: solid 1px white + td + color: #555 + font-size: 14px + line-height: 25px + padding: 5px 10px + &.day:after + content: "" + position: absolute + display: block + top: 0 + width: 100% + z-index: 0 + background-color: transparent + @include left(0) + &.day:hover + cursor: pointer + color: #212121 + &.day.disabled + color: $color-calendar-outrange + &.old, &.new + color: $color-calendar-outrange + &.start-selected:not(.old):not(.new):not(.end-selected) + color: $color-bright + background-color: #1292ff + //@extend .chevron-left + &.range-compare + background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%) + @include border-left-radius(0) + &.end-selected-compare, &.start-selected-compare + background-color: mix($color-calendar-day-selected,$color-calendar-day-selected-compare,70%) + &.end-selected-compare + @include border-radius(0) + &.end-selected:not(.old):not(.new):not(.start-selected) + color: $color-bright + background-color: #1292ff + //@extend .chevron-right + &.range-compare + background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%) + @include border-right-radius(0) + &.end-selected-compare, &.start-selected-compare + background-color: mix($color-calendar-day-selected,$color-calendar-day-selected-compare,70%) + &.start-selected-compare + @include border-radius(0) + &.start-selected-compare:not(.old):not(.new):not(.end-selected-compare) + color: $color-bright + font-weight: 700 + background-color: $color-calendar-day-selected-compare + @include border-left-radius(15px) + &.range + background-color: #f2f2f2 + @include border-left-radius(0) + &.end-selected-compare:not(.old):not(.new):not(.start-selected-compare) + color: $color-bright + font-weight: 700 + background-color: $color-calendar-day-selected-compare + @include border-right-radius(15px) + &.range + background-color: #f2f2f2 + @include border-right-radius(0) + &.end-selected.start-selected + color: $color-bright + font-weight: 700 + background-color: $color-calendar-day-selected + &.range-compare + background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%) + @include border-radius(0) + &.end-selected-compare.start-selected-compare + color: $color-bright + @include border-radius(15px) + font-weight: 700 + background-color: $color-calendar-day-selected-compare + &.range + background-color: mix($color-calendar-day-selected-compare,$color-calendar-range,70%) + @include border-radius(0) + &.range + color: #333 + background-color: #f2f2f2 + &.range-compare + background-color: mix($color-calendar-range,$color-calendar-range-compare,50%) + &.range-compare + color: lighten($color-calendar-range-compare,35%) + background-color: $color-calendar-range-compare + &.range + background-color: mix($color-calendar-range,$color-calendar-range-compare,50%) + &.today + background-color: $color-bright + span + padding: 0 + display: block + width: 33.333% + height: 3em + line-height: 3em + font-weight: 400 + float: left + text-transform: uppercase + cursor: pointer + &:hover + color: white + background-color: $color-calendar-day-selected + &.active + background-color: $color-calendar-day-selected + color: #fff + &.old + color: $color-calendar-outrange + th + &.next + @include text-align(right) + &.prev + @include text-align(left) + &.next, &.prev, &.month-switch + font-size: 16px !important + font-weight: normal + color: #333 !important + &:hover + opacity: 0.8 + thead tr:first-child th + cursor: pointer .ui-datepicker + margin: 5px auto 0 + width: auto !important + z-index: 111111 !important top: 0 left: 0 - padding: 4px + padding: 12px !important margin-top: 1px @include border-radius(4px) - &:before - content: '' - display: inline-block!important - border-left: 7px solid transparent - border-right: 7px solid transparent - border-bottom: 7px solid #ccc - border-bottom-color: rgba(black,.2) - position: absolute - top: -7px - left: 6px - &:after - content: '' - display: inline-block!important - border-left: 6px solid transparent - border-right: 6px solid transparent - border-bottom: 6px solid white - position: absolute - top: -6px - left: 7px .ui-datepicker-header - background: transparent !important + background: none + border: none color: gray font-weight: normal - .ui-state-default - background: transparent !important + .ui-datepicker-title + color: #333 + font-size: 16px + font-style: normal + th + font-size: 12px + font-weight: 600 + color: #777 + text-transform: uppercase + tbody + td + &:last-child + border-right: 0px + tr + border-bottom: 1px solid #bbb + border: none + &:last-child + border-bottom: 0px + a + text-decoration: none .ui-state-highlight border: solid 1px darken(#FEFBE2 ,50%) !important background: #FEFBE2 !important + .ui-datepicker-today + background: #e7f4ff !important + .ui-state-highlight + color: #1292ff !important + .ui-datepicker-current-day, .ui-datepicker-today.ui-datepicker-current-day + background-color: #1292ff !important + .ui-datepicker-current-day, .ui-datepicker-today.ui-datepicker-current-day .ui-state-highlight + color: #fff !important .ui-state-active color: white !important background: $primary-color !important border: solid 1px darken($primary-color,10%) !important - + .ui-datepicker-prev-hover + left: 2px !important +.form-date-actions .btn:hover, .form-date-actions .btn:focus, .form-date-actions .btn:active + outline: unset !important + text-decoration: none +.form-date-actions + bottom: -27px + position: absolute + width: 100% + z-index: 599 + background-color: #fff + box-shadow: 0 7px 10px 0 rgba(0,0,0,0.26) + padding: 2px + border-bottom-left-radius: 4px + border-bottom-right-radius: 4px +.ui-datepicker-prev + float: left + cursor: pointer + &::before + background-position: center -30px + font-weight: bold + font-size: 16px + color: #333 + content: "\f104" + font-family: FontAwesome + position: absolute + left: 8px +.ui-datepicker-next + float: right + cursor: pointer + &::before + background-position: center -30px + font-weight: bold + font-size: 16px + color: #333 + content: "\f105" + font-family: FontAwesome + position: absolute + right: 8px + &:hover + top: 5px !important + right: 2px !important +.ui-state-hover, +.ui-widget-content .ui-state-hover, +.ui-widget-header .ui-state-hover, +.ui-state-focus, +.ui-widget-content .ui-state-focus, +.ui-widget-header .ui-state-focus + border: unset + background: none + font-weight: none + color: none +.ui-widget-content.ui-datepicker + border: none + box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.26) +.ui-datepicker td span, +.ui-datepicker td a + display: inline-block + text-align: center + line-height: 25px + color: #ffffff +.ui-datepicker .ui-datepicker-prev, +.ui-datepicker .ui-datepicker-next + top: 5px !important + background-color: #f0f0f0 + border: none + border-radius: 50% +.ui-state-default, +.ui-widget-content .ui-state-default, +.ui-widget-header .ui-state-default + border: none !important + background: transparent !important + font-size: 14px + color: #333 +.ui-widget-content + .ui-icon + background-image: none !important +.ui-datepicker td span, .ui-datepicker td a + text-align: center !important + padding: 4px 9px !important +.ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus + background: unset !important + border: unset !important +.ui-widget-content .ui-slider-handle, .ui-datepicker-current .ui-slider-handle + border: 1px solid #d3d3d3 !important + color: #555555 !important + background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) !important +.ui-datepicker-prev-hover + top: unset !important \ No newline at end of file diff --git a/admin/themes/default/sass/partials/_date-range-picker.sass b/admin/themes/default/sass/partials/_date-range-picker.sass index 6f402765f..812aadf72 100644 --- a/admin/themes/default/sass/partials/_date-range-picker.sass +++ b/admin/themes/default/sass/partials/_date-range-picker.sass @@ -68,162 +68,19 @@ $color-calendar-range-compare: lighten($color-calendar-compare,10%) width: 35% button @include margin(5px, 0, 0, 0) - - .daterangepicker - position: relative - width: 100% - font-size: 13px - border: solid 1px #ccc - @include margin(0, 0, 8px, 0) - table - width: 100% - margin: 0 - border-spacing: 1px - thead - tr th - background-color: darken($color-calendar,5%) - color: white - font-size: 0.7em - height: 1.5em - text-transform: uppercase - tr:first-child th - background-color: $color-bright - border-bottom: 1px solid darken($color-calendar,5%) - font-weight: 200 - font-size: 1.4em - color: $color-calendar-day-selected - td, th - text-align: center - padding: 0 - position: relative - tr - border-bottom: solid 1px white - td - color: $color-calendar-day-selected - height: 2.4em - padding: 0 8px - @include transition-property(all) - @include transition-duration(0.2s) - @include transition-timing-function(ease-out) - &.day:after - content: "" - position: absolute - display: block - top: 0 - width: 100% - z-index: 0 - background-color: transparent - @include left(0) - &.day:hover - cursor: pointer - &.day.disabled - color: $color-calendar-outrange - &.old, &.new - color: $color-calendar-outrange - &.start-selected:not(.old):not(.new):not(.end-selected) - color: $color-bright - font-weight: 700 - background-color: $color-calendar-day-selected - @include border-left-radius(15px) - //@extend .chevron-left - &.range-compare - background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%) - @include border-left-radius(0) - &.end-selected-compare, &.start-selected-compare - background-color: mix($color-calendar-day-selected,$color-calendar-day-selected-compare,70%) - &.end-selected-compare - @include border-radius(0) - &.end-selected:not(.old):not(.new):not(.start-selected) - color: $color-bright - font-weight: 700 - background-color: $color-calendar-day-selected - //@extend .chevron-right - @include border-right-radius(15px) - &.range-compare - background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%) - @include border-right-radius(0) - &.end-selected-compare, &.start-selected-compare - background-color: mix($color-calendar-day-selected,$color-calendar-day-selected-compare,70%) - &.start-selected-compare - @include border-radius(0) - &.start-selected-compare:not(.old):not(.new):not(.end-selected-compare) - color: $color-bright - font-weight: 700 - background-color: $color-calendar-day-selected-compare - @include border-left-radius(15px) - &.range - background-color: mix($color-calendar-day-selected-compare,$color-calendar-range,70%) - @include border-left-radius(0) - &.end-selected-compare:not(.old):not(.new):not(.start-selected-compare) - color: $color-bright - font-weight: 700 - background-color: $color-calendar-day-selected-compare - @include border-right-radius(15px) - &.range - background-color: mix($color-calendar-day-selected-compare,$color-calendar-range,70%) - @include border-right-radius(0) - &.end-selected.start-selected - color: $color-bright - @include border-radius(15px) - font-weight: 700 - background-color: $color-calendar-day-selected - &.range-compare - background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%) - @include border-radius(0) - &.end-selected-compare.start-selected-compare - color: $color-bright - @include border-radius(15px) - font-weight: 700 - background-color: $color-calendar-day-selected-compare - &.range - background-color: mix($color-calendar-day-selected-compare,$color-calendar-range,70%) - @include border-radius(0) - &.range - color: lighten($color-calendar-range,35%) - background-color: $color-calendar-range - &.range-compare - background-color: mix($color-calendar-range,$color-calendar-range-compare,50%) - &.range-compare - color: lighten($color-calendar-range-compare,35%) - background-color: $color-calendar-range-compare - &.range - background-color: mix($color-calendar-range,$color-calendar-range-compare,50%) - &.today - background-color: $color-bright - span - padding: 0 - display: block - width: 33.333% - height: 3em - line-height: 3em - font-weight: 400 - float: left - text-transform: uppercase - cursor: pointer - &:hover - color: white - background-color: $color-calendar-day-selected - &.active - background-color: $color-calendar-day-selected - color: #fff - &.old - color: $color-calendar-outrange - th - &.next - @include text-align(right) - @include padding(0, 10px, 0, 0) - &.prev - @include text-align(left) - @include padding(0, 0, 0, 10px) - &.next, &.prev, &.month-switch - font-size: 1.3em - line-height: 2em - height: 2em - &:hover - background-color: darken($color-calendar,5%) - color: white - thead tr:first-child th - cursor: pointer +.form-date-actions .btn:hover, .form-date-actions .btn:focus, .form-date-actions .btn:active + outline: unset !important + text-decoration: none +.form-date-actions + bottom: -27px + position: absolute + width: 100% + z-index: 599 + background-color: #fff + box-shadow: 0 7px 10px 0 rgba(0,0,0,0.26) + padding: 2px + border-bottom-left-radius: 4px + border-bottom-right-radius: 4px //chevrons are disabled time to figure out the firefox incompatibility.. .chevron-left, .chevron-right @@ -253,7 +110,7 @@ $color-calendar-range-compare: lighten($color-calendar-compare,10%) -ms-animation: one 0.2s ease-in-out -o-animation: one 0.2s ease-in-out animation: one 0.2s ease-in-out - + @-webkit-keyframes one 0% background-color: $color-calendar diff --git a/admin/themes/default/sass/partials/_header.sass b/admin/themes/default/sass/partials/_header.sass index f336a838a..f58be6050 100644 --- a/admin/themes/default/sass/partials/_header.sass +++ b/admin/themes/default/sass/partials/_header.sass @@ -117,19 +117,6 @@ padding: 9px 0 color: $brand-warning #employee_infos - .employee_name - position: relative - @include ltr - padding-right: 40px !important - @include rtl - padding-left: 40px !important - .employee_avatar_small - .img-thumbnail - @include border-radius(0) - @include avatar(36px, 0px) - position: absolute - top: 0px - @include right(0) img border: none padding: 0 diff --git a/admin/themes/default/sass/partials/_kpi.sass b/admin/themes/default/sass/partials/_kpi.sass index c64906581..3d2605967 100644 --- a/admin/themes/default/sass/partials/_kpi.sass +++ b/admin/themes/default/sass/partials/_kpi.sass @@ -43,6 +43,9 @@ white-space: nowrap text-overflow: ellipsis overflow: hidden + &.loading + height: 1.2em + width: 200px &:hover text-decoration: none .color1 diff --git a/admin/themes/default/sass/partials/_skeleton-loading.sass b/admin/themes/default/sass/partials/_skeleton-loading.sass new file mode 100644 index 000000000..b1b456d4a --- /dev/null +++ b/admin/themes/default/sass/partials/_skeleton-loading.sass @@ -0,0 +1,80 @@ +@-webkit-keyframes wave + 0% + background-position: -786px 0 + 100% + background-position: 786px 0 +@keyframes wave + 0% + background-position: -786px 0 + 100% + background-position: 786px 0 + +@-webkit-keyframes pulse + 0% + background-color: #dddddd + 25% + background-color: #f5f5f5 + 50% + background-color: #e5e5e5 + 75% + background-color: #f5f5f5 + 100% + background-color: #dddddd +@keyframes pulse + 0% + background-color: #dddddd + 25% + background-color: #f5f5f5 + 50% + background-color: #e5e5e5 + 75% + background-color: #f5f5f5 + 100% + background-color: #dddddd + +.skeleton-loading-wave + animation-duration: 1.3s + animation-fill-mode: forwards + animation-iteration-count: infinite + animation-name: wave + animation-timing-function: linear + -webkit-animation-duration: 1.3s + -webkit-animation-fill-mode: forwards + -webkit-animation-iteration-count: infinite + -webkit-animation-name: wave + -webkit-animation-timing-function: linear + -moz-animation-duration: 1.3s + -moz-animation-fill-mode: forwards + -moz-animation-iteration-count: infinite + -moz-animation-name: wave + -moz-animation-timing-function: linear + background: #dddddd + background-image: -webkit-gradient(linear, left center, right center, from(#dddddd), color-stop(.2, #f5f5f5), color-stop(.4, #e5e5e5), to(#dddddd)) + background-image: -webkit-linear-gradient(left, #dddddd 0%, #f5f5f5 20%, #e5e5e5 40%, #dddddd 100%) + background-image: -moz-gradient(linear, left center, right center, from(#dddddd), color-stop(.2, #f5f5f5), color-stop(.4, #e5e5e5), to(#dddddd)) + background-image: -moz-linear-gradient(left, #dddddd 0%, #f5f5f5 20%, #e5e5e5 40%, #dddddd 100%) + background-repeat: no-repeat + background-size: 800px 104px + height: 104px + position: relative + +.skeleton-loading-pulse + background: #dddddd + background-color: #dddddd + animation-name: pulse + animation-duration: 3s + animation-iteration-count: infinite + -webkit-animation-name: pulse + -webkit-animation-duration: 3s + -webkit-animation-iteration-count: infinite + -moz-animation-name: pulse + -moz-animation-duration: 3s + -moz-animation-iteration-count: infinite + +.loading-container-box + width: 100% + height: 40px + +.loading-container-bar + width: 100% + height: 10px \ No newline at end of file diff --git a/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl index 420c44ca4..d416d2a07 100644 --- a/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl +++ b/admin/themes/default/template/controllers/addresses/helpers/form/form.tpl @@ -26,10 +26,6 @@ {extends file="helpers/form/form.tpl"} {block name="label"} - {if $input.name == 'vat_number'} -
| - | {l s='Product'} | -{l s='Unit price'} | -{l s='Quantity'} | -{l s='Stock'} | -{l s='Total'} | -|||
|---|---|---|---|---|---|---|---|---|
| {$product.image} | -
- {$product.name}{if isset($product.attributes)} {$product.attributes}{/if} - {if $product.reference}{l s='Ref:'} {$product.reference}{/if} - {if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if} - - |
- {displayWtPriceWithCurrency price=$product.price_wt currency=$currency} | -{$product.customizationQuantityTotal} | -{$product.qty_in_stock} | -{displayWtPriceWithCurrency price=$product.total_customization_wt currency=$currency} | -|||
- {foreach from=$customization.datas key='type' item='datas'}
- {if $type == constant('Product::CUSTOMIZE_FILE')}
-
- {foreach from=$datas key='index' item='data'}
-
- {/if}
- {/foreach}
-
- {if $data.name}{$data.name}{else}{l s='Text #'}{$index}{/if}
-
- {/foreach}
-
-
- {$data.value} - |
- - | {$customization.quantity} | -- | - | ||||
| {$product.image} | -
-
- {$product.name}{if isset($product.attributes)} {$product.attributes}{/if} - {if $product.reference}{l s='Ref:'} {$product.reference}{/if} - {if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if} - - |
- {displayWtPriceWithCurrency price=$product.product_price currency=$currency} | -{if isset($product.customizationQuantityTotal)}{math equation='x - y' x=$product.cart_quantity y=$product.customizationQuantityTotal|intval}{else}{math equation='x - y' x=$product.cart_quantity y=$product.customization_quantity|intval}{/if} | -{$product.qty_in_stock} | -{displayWtPriceWithCurrency price=$product.product_total currency=$currency} | -|||
| {l s='Total cost of products:'} | +{l s='Image'} | +{l s='Room Type'} | +{l s='Unit Price'} | +{l s='Total'} | +||||
|---|---|---|---|---|---|---|---|---|
| {$product.image} | +
+
+ {$product.name}{if isset($product.attributes)} {$product.attributes}{/if} + {if $product.reference}{l s='Ref:'} {$product.reference}{/if} + {if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if} + + |
+ {displayWtPriceWithCurrency price=$product.product_price currency=$currency} | +{displayWtPriceWithCurrency price=$product.product_total currency=$currency} | +|||||
| {l s='Total cost of room types:'} | {displayWtPriceWithCurrency price=$total_products currency=$currency} | |||||||
| {l s='Total value of vouchers:'} | +{l s='Total value of vouchers:'} | {displayWtPriceWithCurrency price=$total_discounts currency=$currency} | ||||||
| {l s='Total cost of gift wrapping:'} | +{l s='Total cost of gift wrapping:'} | {displayWtPriceWithCurrency price=$total_wrapping currency=$currency} | ||||||
| {l s='Total cost of shipping:'} | +{l s='Total cost of shipping:'} | {displayWtPriceWithCurrency price=$total_shipping currency=$currency} | ||||||
| {l s='Total:'} | +{l s='Total:'} | {displayWtPriceWithCurrency price=$total_price currency=$currency} | ||||||