diff --git a/admin/themes/default/sass/partials/_date-picker.sass b/admin/themes/default/sass/partials/_date-picker.sass
index e864cf8e9..dd235e7ad 100644
--- a/admin/themes/default/sass/partials/_date-picker.sass
+++ b/admin/themes/default/sass/partials/_date-picker.sass
@@ -30,324 +30,330 @@ $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
+ 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
+ #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: 12px !important
- margin-top: 1px
- @include border-radius(4px)
- .ui-datepicker-header
- background: none
- border: none
- color: gray
- font-weight: normal
- .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
+ margin: 5px auto 0
+ width: auto !important
+ z-index: 111111 !important
+ top: 0
+ left: 0
+ padding: 12px !important
+ margin-top: 1px
+ @include border-radius(4px)
+ .ui-datepicker-header
+ background: none
+ border: none
+ color: gray
+ font-weight: normal
+ .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
+ 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
+ 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
+ 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
+ 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, &.ui-datepicker-next-hover
+ top: 5px !important
+ right: 2px !important
+
+.ui-datepicker-rtl
+ .ui-datepicker-next
+ &:hover, &.ui-datepicker-next-hover
+ left: 2px !important
+ right: auto !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
+ 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)
+ 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
+ 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%
+ 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
+ border: none !important
+ background: transparent !important
+ font-size: 14px
+ color: #333
.ui-widget-content
- .ui-icon
- background-image: none !important
+ .ui-icon
+ background-image: none !important
.ui-datepicker td span, .ui-datepicker td a
- text-align: center !important
- padding: 4px 9px !important
+ 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
+ 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
+ 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
+ top: unset !important
diff --git a/admin/themes/default/sass/partials/_date-range-picker.sass b/admin/themes/default/sass/partials/_date-range-picker.sass
index 812aadf72..b63956a92 100644
--- a/admin/themes/default/sass/partials/_date-range-picker.sass
+++ b/admin/themes/default/sass/partials/_date-range-picker.sass
@@ -16,9 +16,9 @@ $color-calendar-range-compare: lighten($color-calendar-compare,10%)
#datepicker
.input-selected
margin: 0
- #date-start.input-selected, #date-end.input-selected,
+ #date-start.input-selected, #date-end.input-selected
border: solid 3px $color-calendar-day-selected
- #date-start-compare.input-selected, #date-end-compare.input-selected,
+ #date-start-compare.input-selected, #date-end-compare.input-selected
border: solid 3px $color-calendar-day-selected-compare
div#datepicker-form
#date-range
diff --git a/admin/themes/default/sass/partials/_growl.sass b/admin/themes/default/sass/partials/_growl.sass
index 37884b1bc..900f51ac3 100644
--- a/admin/themes/default/sass/partials/_growl.sass
+++ b/admin/themes/default/sass/partials/_growl.sass
@@ -8,72 +8,72 @@ $namespace: "growl"
$duration: 0.4s
#growls
- z-index: 50000
- position: fixed
-
- &.default
- top: 100px
- @include right(10px)
- &.tl
- top: 10px
- @include left(10px)
- &.tr
- top: 10px
- @include right(10px)
- &.bl
- bottom: 10px
- @include left(10px)
- &.br
- bottom: 10px
- @include right(10px)
+ z-index: 50000
+ position: fixed
+
+ &.default
+ top: 100px
+ @include right(10px)
+ &.tl
+ top: 10px
+ @include left(10px)
+ &.tr
+ top: 10px
+ @include right(10px)
+ &.bl
+ bottom: 10px
+ @include left(10px)
+ &.br
+ bottom: 10px
+ @include right(10px)
.growl
- opacity: 1
- position: relative
- @include border-radius(4px)
- @include transition(all $duration ease-in-out)
+ opacity: 1
+ position: relative
+ @include border-radius(4px)
+ @include transition(all $duration ease-in-out)
- &.#{$namespace}-incoming
- opacity: 0.0
+ &.#{$namespace}-incoming
+ opacity: 0.0
- &.#{$namespace}-outgoing
- opacity: 0.0
+ &.#{$namespace}-outgoing
+ opacity: 0.0
- &.#{$namespace}-small
- width: 200px
- padding: 5px
- margin: 5px
- &.#{$namespace}-medium
- width: 250px
- padding: 10px
- margin: 10px
- &.#{$namespace}-large
- width: 300px
- padding: 15px
- margin: 15px
+ &.#{$namespace}-small
+ width: 200px
+ padding: 5px
+ margin: 5px
+ &.#{$namespace}-medium
+ width: 250px
+ padding: 10px
+ margin: 10px
+ &.#{$namespace}-large
+ width: 300px
+ padding: 15px
+ margin: 15px
- &.#{$namespace}-default
- color: #FFF
- background: gray
- &.#{$namespace}-error
- color: white
- background: rgba($brand-danger,0.8)
- &.#{$namespace}-notice
- color: white
- background: rgba($brand-success,0.8)
- &.#{$namespace}-warning
- color: white
- background: rgba($brand-warning,0.8)
- .#{$namespace}-close
- cursor: pointer
- font-size: 14px
- line-height: 18px
- font-weight: normal
- font-family: helvetica, verdana, sans-serif
- @include float(right)
- .#{$namespace}-title
- font-size: 18px
- line-height: 24px
- .#{$namespace}-message
- font-size: 14px
- line-height: 18px
\ No newline at end of file
+ &.#{$namespace}-default
+ color: #FFF
+ background: gray
+ &.#{$namespace}-error
+ color: white
+ background: rgba($brand-danger,0.8)
+ &.#{$namespace}-notice
+ color: white
+ background: rgba($brand-success,0.8)
+ &.#{$namespace}-warning
+ color: white
+ background: rgba($brand-warning,0.8)
+ .#{$namespace}-close
+ cursor: pointer
+ font-size: 14px
+ line-height: 18px
+ font-weight: normal
+ font-family: helvetica, verdana, sans-serif
+ @include float(right)
+ .#{$namespace}-title
+ font-size: 18px
+ line-height: 24px
+ .#{$namespace}-message
+ font-size: 14px
+ line-height: 18px
\ No newline at end of file
diff --git a/admin/themes/default/sass/partials/_ladda.sass b/admin/themes/default/sass/partials/_ladda.sass
index 0a8427917..b6a12eb24 100644
--- a/admin/themes/default/sass/partials/_ladda.sass
+++ b/admin/themes/default/sass/partials/_ladda.sass
@@ -12,302 +12,302 @@ $spinnerSize: 32px
// MIXINS
@mixin prefix ( $property, $value )
- -webkit-#{$property}: $value
- -moz-#{$property}: $value
- -ms-#{$property}: $value
- -o-#{$property}: $value
- #{$property}: $value
+ -webkit-#{$property}: $value
+ -moz-#{$property}: $value
+ -ms-#{$property}: $value
+ -o-#{$property}: $value
+ #{$property}: $value
@mixin transition( $value )
- -webkit-transition: $value !important // important to override bootstrap
- -moz-transition: $value !important
- -ms-transition: $value !important
- -o-transition: $value !important
- transition: $value !important
+ -webkit-transition: $value !important // important to override bootstrap
+ -moz-transition: $value !important
+ -ms-transition: $value !important
+ -o-transition: $value !important
+ transition: $value !important
@mixin vendor-transform( $value )
- @include prefix( transform, $value )
+ @include prefix( transform, $value )
@mixin transform-origin( $value )
- @include prefix( transform-origin, $value )
+ @include prefix( transform-origin, $value )
@mixin buttonColor( $name, $color )
- &[data-color=#{$name}]
- background: $color
- &:hover
- background-color: lighten( $color, 5% )
+ &[data-color=#{$name}]
+ background: $color
+ &:hover
+ background-color: lighten( $color, 5% )
// BUTTON BASE
.ladda-button
- position: relative
- .ladda-spinner
- position: absolute
- z-index: 2
- display: inline-block
- width: $spinnerSize
- height: $spinnerSize
- top: 50%
- margin-top: -$spinnerSize/2
- opacity: 0
- pointer-events: none
+ position: relative
+ .ladda-spinner
+ position: absolute
+ z-index: 2
+ display: inline-block
+ width: $spinnerSize
+ height: $spinnerSize
+ top: 50%
+ margin-top: -$spinnerSize/2
+ opacity: 0
+ pointer-events: none
- .ladda-label
- position: relative
- z-index: 3
+ .ladda-label
+ position: relative
+ z-index: 3
- .ladda-progress
- position: absolute
- width: 0
- height: 100%
- top: 0
- background: rgba( 0, 0, 0, 0.2 )
- visibility: hidden
- opacity: 0
- @include left(0)
- @include transition( 0.1s linear all )
- &[data-loading] .ladda-progress
- opacity: 1
- visibility: visible
+ .ladda-progress
+ position: absolute
+ width: 0
+ height: 100%
+ top: 0
+ background: rgba( 0, 0, 0, 0.2 )
+ visibility: hidden
+ opacity: 0
+ @include left(0)
+ @include transition( 0.1s linear all )
+ &[data-loading] .ladda-progress
+ opacity: 1
+ visibility: visible
// EASING
.ladda-button, .ladda-button .ladda-spinner, .ladda-button .ladda-label
- @include transition( 0.3s cubic-bezier(0.175, 0.885, 0.320, 1.275) background-color )
+ @include transition( 0.3s cubic-bezier(0.175, 0.885, 0.320, 1.275) background-color )
.ladda-button[data-style=zoom-in],
.ladda-button[data-style=zoom-in] .ladda-spinner,
.ladda-button[data-style=zoom-in] .ladda-label,
.ladda-button[data-style=zoom-out],
.ladda-button[data-style=zoom-out] .ladda-spinner,
.ladda-button[data-style=zoom-out] .ladda-label
- @include transition( 0.3s ease all )
+ @include transition( 0.3s ease all )
// EXPAND LEFT
.ladda-button[data-style=expand-right]
- .ladda-spinner
- @include right(14px)
- &[data-size="s"] .ladda-spinner,
- &[data-size="xs"] .ladda-spinner
- @include right(4px)
- &[data-loading]
- @include padding-right(56px)
- .ladda-spinner
- opacity: 1
- &[data-size="s"],
- &[data-size="xs"]
- @include padding-right(40px)
+ .ladda-spinner
+ @include right(14px)
+ &[data-size="s"] .ladda-spinner,
+ &[data-size="xs"] .ladda-spinner
+ @include right(4px)
+ &[data-loading]
+ @include padding-right(56px)
+ .ladda-spinner
+ opacity: 1
+ &[data-size="s"],
+ &[data-size="xs"]
+ @include padding-right(40px)
// EXPAND RIGHT
.ladda-button[data-style=expand-left]
- .ladda-spinner
- @include left(14px)
- &[data-size="s"] .ladda-spinner,
- &[data-size="xs"] .ladda-spinner
- @include left(4px)
- &[data-loading]
- @include padding-left(56px)
- .ladda-spinner
- opacity: 1
- &[data-size="s"],
- &[data-size="xs"]
- @include padding-left(40px)
+ .ladda-spinner
+ @include left(14px)
+ &[data-size="s"] .ladda-spinner,
+ &[data-size="xs"] .ladda-spinner
+ @include left(4px)
+ &[data-loading]
+ @include padding-left(56px)
+ .ladda-spinner
+ opacity: 1
+ &[data-size="s"],
+ &[data-size="xs"]
+ @include padding-left(40px)
// EXPAND UP
.ladda-button[data-style=expand-up]
- overflow: hidden
- .ladda-spinner
- top: -$spinnerSize
- @include margin-left(-$spinnerSize/2)
- @include left(50%)
- &[data-loading]
- padding-top: 54px
- .ladda-spinner
- opacity: 1
- top: 14px
- margin-top: 0
- &[data-size="s"],
- &[data-size="xs"]
- padding-top: 32px
- .ladda-spinner
- top: 4px
+ overflow: hidden
+ .ladda-spinner
+ top: -$spinnerSize
+ @include margin-left(-$spinnerSize/2)
+ @include left(50%)
+ &[data-loading]
+ padding-top: 54px
+ .ladda-spinner
+ opacity: 1
+ top: 14px
+ margin-top: 0
+ &[data-size="s"],
+ &[data-size="xs"]
+ padding-top: 32px
+ .ladda-spinner
+ top: 4px
// EXPAND DOWN
.ladda-button[data-style=expand-down]
- overflow: hidden
- .ladda-spinner
- top: 62px
- @include left(50%)
- margin-left: -$spinnerSize/2
- &[data-size="s"] .ladda-spinner,
- &[data-size="xs"] .ladda-spinner
- top: 40px
- &[data-loading]
- padding-bottom: 54px
- .ladda-spinner
- opacity: 1
- &[data-size="s"]
- &[data-size="xs"]
- padding-bottom: 32px
+ overflow: hidden
+ .ladda-spinner
+ top: 62px
+ @include left(50%)
+ margin-left: -$spinnerSize/2
+ &[data-size="s"] .ladda-spinner,
+ &[data-size="xs"] .ladda-spinner
+ top: 40px
+ &[data-loading]
+ padding-bottom: 54px
+ .ladda-spinner
+ opacity: 1
+ &[data-size="s"]
+ &[data-size="xs"]
+ padding-bottom: 32px
// SLIDE LEFT
.ladda-button[data-style=slide-left]
- overflow: hidden
- .ladda-label
- position: relative
- .ladda-spinner
- @include left(100%)
- @include margin-left(-$spinnerSize/2)
- &[data-loading]
- .ladda-label
- opacity: 0
- @include left(-100%)
- .ladda-spinner
- opacity: 1
- @include left(50%)
+ overflow: hidden
+ .ladda-label
+ position: relative
+ .ladda-spinner
+ @include left(100%)
+ @include margin-left(-$spinnerSize/2)
+ &[data-loading]
+ .ladda-label
+ opacity: 0
+ @include left(-100%)
+ .ladda-spinner
+ opacity: 1
+ @include left(50%)
// SLIDE RIGHT
.ladda-button[data-style=slide-right]
- overflow: hidden
- .ladda-label
- position: relative
- .ladda-spinner
- @include right(100%)
- @include margin-left(-$spinnerSize/2)
- &[data-loading]
- .ladda-label
- opacity: 0
- @include left(100%)
- .ladda-spinner
- opacity: 1
- @include left(50%)
+ overflow: hidden
+ .ladda-label
+ position: relative
+ .ladda-spinner
+ @include right(100%)
+ @include margin-left(-$spinnerSize/2)
+ &[data-loading]
+ .ladda-label
+ opacity: 0
+ @include left(100%)
+ .ladda-spinner
+ opacity: 1
+ @include left(50%)
// SLIDE UP
.ladda-button[data-style=slide-up]
- overflow: hidden
- .ladda-label
- position: relative
- .ladda-spinner
- margin-top: 1em
- @include left(50%)
- @include margin-left(-$spinnerSize/2)
- &[data-loading]
- .ladda-label
- opacity: 0
- top: -1em
- .ladda-spinner
- opacity: 1
- margin-top: -$spinnerSize/2
+ overflow: hidden
+ .ladda-label
+ position: relative
+ .ladda-spinner
+ margin-top: 1em
+ @include left(50%)
+ @include margin-left(-$spinnerSize/2)
+ &[data-loading]
+ .ladda-label
+ opacity: 0
+ top: -1em
+ .ladda-spinner
+ opacity: 1
+ margin-top: -$spinnerSize/2
// SLIDE DOWN
.ladda-button[data-style=slide-down]
- overflow: hidden
- .ladda-label
- position: relative
- .ladda-spinner
- margin-top: -2em
- @include margin-left(-$spinnerSize/2)
- @include left(50%)
- &[data-loading]
- .ladda-label
- opacity: 0
- top: 1em
- .ladda-spinner
- opacity: 1
- margin-top: -$spinnerSize/2
+ overflow: hidden
+ .ladda-label
+ position: relative
+ .ladda-spinner
+ margin-top: -2em
+ @include margin-left(-$spinnerSize/2)
+ @include left(50%)
+ &[data-loading]
+ .ladda-label
+ opacity: 0
+ top: 1em
+ .ladda-spinner
+ opacity: 1
+ margin-top: -$spinnerSize/2
// ZOOM-OUT
.ladda-button[data-style=zoom-out]
- overflow: hidden
- .ladda-spinner
- @include left(50%)
- @include margin-left(-$spinnerSize/2)
- @include vendor-transform( scale( 2.5 ) )
- .ladda-label
- position: relative
- display: inline-block
- &[data-loading] .ladda-label
- opacity: 0
- @include vendor-transform( scale( 0.5 ) )
- &[data-loading] .ladda-spinner
- opacity: 1
- @include vendor-transform( none )
+ overflow: hidden
+ .ladda-spinner
+ @include left(50%)
+ @include margin-left(-$spinnerSize/2)
+ @include vendor-transform( scale( 2.5 ) )
+ .ladda-label
+ position: relative
+ display: inline-block
+ &[data-loading] .ladda-label
+ opacity: 0
+ @include vendor-transform( scale( 0.5 ) )
+ &[data-loading] .ladda-spinner
+ opacity: 1
+ @include vendor-transform( none )
// ZOOM-IN
.ladda-button[data-style=zoom-in]
- overflow: hidden
- .ladda-spinner
- @include margin-left(-$spinnerSize/2)
- @include left(50%)
- @include vendor-transform( scale( 0.2 ) )
- .ladda-label
- position: relative
- display: inline-block
- &[data-loading] .ladda-label
- opacity: 0
- @include vendor-transform( scale( 2.2 ) )
- &[data-loading] .ladda-spinner
- opacity: 1
- @include vendor-transform( none )
+ overflow: hidden
+ .ladda-spinner
+ @include margin-left(-$spinnerSize/2)
+ @include left(50%)
+ @include vendor-transform( scale( 0.2 ) )
+ .ladda-label
+ position: relative
+ display: inline-block
+ &[data-loading] .ladda-label
+ opacity: 0
+ @include vendor-transform( scale( 2.2 ) )
+ &[data-loading] .ladda-spinner
+ opacity: 1
+ @include vendor-transform( none )
// CONTRACT
.ladda-button[data-style=contract]
- overflow: hidden
- width: 100px
- .ladda-spinner
- @include left(50%)
- @include margin-left(-16px)
+ overflow: hidden
+ width: 100px
+ .ladda-spinner
+ @include left(50%)
+ @include margin-left(-16px)
.ladda-button[data-style=contract][data-loading]
- border-radius: 50%
- width: 52px
- .ladda-label
- opacity: 0
- .ladda-spinner
- opacity: 1
+ border-radius: 50%
+ width: 52px
+ .ladda-label
+ opacity: 0
+ .ladda-spinner
+ opacity: 1
// OVERLAY
.ladda-button[data-style=contract-overlay]
- overflow: hidden
- width: 100px
- @include ltr
- box-shadow: 0px 0px 0px 3000px rgba(0,0,0,0)
- @include rtl
- box-shadow: 0px 3000px 0px 0px rgba(0,0,0,0)
- .ladda-spinner
- @include left(50%)
- @include margin-left(-16px)
- &[data-loading]
- border-radius: 50%
- width: 52px
- @include ltr
- box-shadow: 0px 0px 0px 3000px rgba(0,0,0,0.8)
- @include rtl
- box-shadow: 0px 3000px 0px 0px rgba(0,0,0,0.8)
- .ladda-label
- opacity: 0
- .ladda-spinner
- opacity: 1
+ overflow: hidden
+ width: 100px
+ @include ltr
+ box-shadow: 0px 0px 0px 3000px rgba(0,0,0,0)
+ @include rtl
+ box-shadow: 0px 3000px 0px 0px rgba(0,0,0,0)
+ .ladda-spinner
+ @include left(50%)
+ @include margin-left(-16px)
+ &[data-loading]
+ border-radius: 50%
+ width: 52px
+ @include ltr
+ box-shadow: 0px 0px 0px 3000px rgba(0,0,0,0.8)
+ @include rtl
+ box-shadow: 0px 3000px 0px 0px rgba(0,0,0,0.8)
+ .ladda-label
+ opacity: 0
+ .ladda-spinner
+ opacity: 1
.ladda-button
- &[disabled],
- &[data-loading]
- border-color: rgba( 0, 0, 0, 0.07 )
- cursor: default
- background-color: #999
- &:hover
- cursor: default
- background-color: #999
- &[data-size=xs]
- padding: 4px 8px
- .ladda-label
- font-size: 0.7em
- &[data-size=s]
- padding: 6px 10px
- .ladda-label
- font-size: 0.9em
- &[data-size=l] .ladda-label
- font-size: 1.2em
- &[data-size=xl] .ladda-label
- font-size: 1.5em
+ &[disabled],
+ &[data-loading]
+ border-color: rgba( 0, 0, 0, 0.07 )
+ cursor: default
+ background-color: #999
+ &:hover
+ cursor: default
+ background-color: #999
+ &[data-size=xs]
+ padding: 4px 8px
+ .ladda-label
+ font-size: 0.7em
+ &[data-size=s]
+ padding: 6px 10px
+ .ladda-label
+ font-size: 0.9em
+ &[data-size=l] .ladda-label
+ font-size: 1.2em
+ &[data-size=xl] .ladda-label
+ font-size: 1.5em
diff --git a/admin/themes/default/sass/partials/_tables.sass b/admin/themes/default/sass/partials/_tables.sass
index 7382ff13a..12f61e76c 100644
--- a/admin/themes/default/sass/partials/_tables.sass
+++ b/admin/themes/default/sass/partials/_tables.sass
@@ -90,7 +90,7 @@
td.actions
@include text-align(right)
@include padding-right(5px)
- th.actions .btn,
+ th.actions .btn
margin-bottom: 4px !important
tr.myDragClass
diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
index c0c841758..7ef5a85b2 100644
--- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -148,7 +148,7 @@
{if isset($refundReqBookings) && $refundReqBookings && $data.id|in_array:$refundReqBookings && $data.is_refunded}
{if $data.is_cancelled}{l s='Cancelled'}{else}{l s='Refunded'}{/if}
{elseif $can_edit}
-
+
{l s='Edit'}
{/if}
@@ -1346,4 +1346,4 @@
{addJsDefL name=txt_booking_document_delete_success}{l s='Document deleted successfully.' js=1}{/addJsDefL}
{addJsDefL name='error_found_txt'}{l s='Errors found' js=1}{/addJsDefL}
{/strip}
-{/block}
+{/block}
\ No newline at end of file
diff --git a/admin/themes/default/template/controllers/orders/modals/_room_status_form.tpl b/admin/themes/default/template/controllers/orders/modals/_room_status_form.tpl
index a01e59732..204395b1a 100644
--- a/admin/themes/default/template/controllers/orders/modals/_room_status_form.tpl
+++ b/admin/themes/default/template/controllers/orders/modals/_room_status_form.tpl
@@ -30,7 +30,7 @@
{/foreach}
-
\ No newline at end of file
diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl
index 148be94a4..bb6f6f97f 100644
--- a/admin/themes/default/template/header.tpl
+++ b/admin/themes/default/template/header.tpl
@@ -298,6 +298,18 @@
{/if}
