From 561c036240a71ad6664fe7e5d8178bfd8d2e59e2 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Wed, 16 Oct 2013 19:03:02 +0200 Subject: [PATCH] // calendar --- admin-dev/themes/default/css/admin-theme.css | 488 ++++++++---------- admin-dev/themes/default/css/admin-theme.sass | 1 - .../admin-theme/_admin-date-range-picker.sass | 73 +-- .../default/css/admin-theme/_ladda.sass | 318 ++++++++++++ .../default/css/admin-theme/_ladda.scss | 471 ----------------- .../template/helpers/calendar/calendar.tpl | 5 +- .../default/template/helpers/form/form.tpl | 2 +- 7 files changed, 564 insertions(+), 794 deletions(-) create mode 100755 admin-dev/themes/default/css/admin-theme/_ladda.sass delete mode 100755 admin-dev/themes/default/css/admin-theme/_ladda.scss diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 07bb59a5c..ad8174e82 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -8888,31 +8888,31 @@ textarea { -webkit-font-smoothing: antialiased; *margin-right: 0.3em; } -/* line 18, admin-theme/_admin-date-range-picker.sass */ +/* line 17, admin-theme/_admin-date-range-picker.sass */ #datepicker { - padding: 6px; - background-color: #1585b8; } -/* line 21, admin-theme/_admin-date-range-picker.sass */ + padding: 6px; } +/* line 20, admin-theme/_admin-date-range-picker.sass */ #datepicker .input-selected { margin: 0; } -/* line 23, admin-theme/_admin-date-range-picker.sass */ -#datepicker #date-start.input-selected { - border: solid 3px #0d5373; } -/* line 25, admin-theme/_admin-date-range-picker.sass */ -#datepicker #date-end.input-selected { - border: solid 3px #0d5373; } -/* line 28, admin-theme/_admin-date-range-picker.sass */ +/* line 22, admin-theme/_admin-date-range-picker.sass */ +#datepicker #date-start.input-selected, #datepicker #date-end.input-selected { + border: solid 3px #004968; } +/* line 24, admin-theme/_admin-date-range-picker.sass */ +#datepicker #date-start-compare.input-selected, #datepicker #date-end-compare.input-selected { + border: solid 3px #004968; } +/* line 27, admin-theme/_admin-date-range-picker.sass */ #datepicker div#datepicker-form #date-range .form-date-heading { - background-color: #1896cf; } -/* line 30, admin-theme/_admin-date-range-picker.sass */ + background-color: #0092ce; } +/* line 29, admin-theme/_admin-date-range-picker.sass */ #datepicker div#datepicker-form #date-compare .form-date-heading { background-color: #dd7d5b; } -/* line 32, admin-theme/_admin-date-range-picker.sass */ +/* line 31, admin-theme/_admin-date-range-picker.sass */ #datepicker div#datepicker-form .form-date-heading { - padding: 6px; } -/* line 34, admin-theme/_admin-date-range-picker.sass */ + height: 30px; + line-height: 30px; + padding: 0 8px; } +/* line 35, admin-theme/_admin-date-range-picker.sass */ #datepicker div#datepicker-form .form-date-heading .title, #datepicker div#datepicker-form .form-date-heading .checkbox-title label { - font-family: "Josefin Sans", sans-serif; font-size: 1.15em; color: white; font-weight: 200; @@ -8931,72 +8931,72 @@ textarea { background-color: white; display: inline-block; } /* line 51, admin-theme/_admin-date-range-picker.sass */ +#datepicker div#datepicker-form .form-date-actions { + border: solid 1px black; } +/* line 53, admin-theme/_admin-date-range-picker.sass */ #datepicker div#datepicker-form .form-date-group { width: 100%; - margin: 0 auto; } -/* line 54, admin-theme/_admin-date-range-picker.sass */ + margin: 0 auto 6px auto; + border: solid 1px black; } +/* line 57, admin-theme/_admin-date-range-picker.sass */ #datepicker div#datepicker-form .form-date-group label { - font-family: "Josefin Sans", sans-serif; font-size: 0.8em; font-weight: 700; text-transform: uppercase; - color: #666666; - line-height: 3.2em; - margin-bottom: 0; } -/* line 62, admin-theme/_admin-date-range-picker.sass */ -#datepicker div#datepicker-form .form-date-group label, #datepicker div#datepicker-form .form-date-group input { - float: left; - margin-right: 6px; } + color: #666666; } +/* line 63, admin-theme/_admin-date-range-picker.sass */ +#datepicker div#datepicker-form .form-date-group input { + margin: 4px 4px 0 0; } /* line 65, admin-theme/_admin-date-range-picker.sass */ #datepicker div#datepicker-form .form-date-group input[type='text'] { width: 35%; } -/* line 68, admin-theme/_admin-date-range-picker.sass */ +/* line 67, admin-theme/_admin-date-range-picker.sass */ +#datepicker div#datepicker-form .form-date-group button { + margin: 5px 0 0 0; } +/* line 70, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker { position: relative; margin: 0 0 8px 0; width: 100%; - background-color: #1ba6e5; - font-family: "Josefin Sans", sans-serif; - font-size: 14px; - height: 16.8em; } -/* line 76, admin-theme/_admin-date-range-picker.sass */ + background-color: #00a4e7; + font-size: 13px; + border: solid 1px black; } +/* line 77, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker table { width: 100%; - margin: 0; } -/* line 80, admin-theme/_admin-date-range-picker.sass */ + margin: 0; + border-spacing: 1px; } +/* line 82, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker thead tr th:after { content: ""; - border-top: 1px solid #1585b8; + border-top: 1px solid #0080b4; width: 100%; display: block; } -/* line 85, admin-theme/_admin-date-range-picker.sass */ +/* line 87, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker thead tr th { - background-color: #1896cf; - color: #8dd3f2; + background-color: #0092ce; + color: #68d3ff; font-size: 0.7em; font-weight: 700; - border-bottom: solid 1px #3bb3e9; + border-bottom: solid 1px #0cb8ff; text-transform: uppercase; } -/* line 92, admin-theme/_admin-date-range-picker.sass */ +/* line 94, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker thead tr:first-child th { background-color: white; font-weight: 200; font-size: 1.4em; - color: #0d5373; } -/* line 97, admin-theme/_admin-date-range-picker.sass */ + color: #004968; } +/* line 99, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td, #datepicker .datepicker th { text-align: center; - height: 2em; - line-height: 2em; padding: 0; color: white; position: relative; } /* line 104, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td { - font-weight: 400; - padding: 0 10px; - border-bottom: solid 1px #1ba6e5; } -/* line 108, admin-theme/_admin-date-range-picker.sass */ + height: 2.4em; + padding: 0 10px; } +/* line 107, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td.day:after { content: ""; position: absolute; @@ -9004,31 +9004,42 @@ textarea { top: 0; left: 0; width: 100%; - height: 100%; z-index: 0; background-color: transparent; } -/* line 118, admin-theme/_admin-date-range-picker.sass */ +/* line 116, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td.day:hover { cursor: pointer; } -/* line 120, admin-theme/_admin-date-range-picker.sass */ +/* line 118, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td.day.disabled { - color: #1275a1; } -/* line 122, admin-theme/_admin-date-range-picker.sass */ + color: #006e9b; } +/* line 120, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td.old, #datepicker .datepicker td.new { - color: #1275a1; } -/* line 124, admin-theme/_admin-date-range-picker.sass */ + color: #006e9b; } +/* line 122, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td.start-selected:not(.old):not(.new):not(.end-selected) { font-weight: 700; - background-color: #0d5373; + background-color: #004968; border-bottom-left-radius: 15px; border-top-left-radius: 15px; } -/* line 129, admin-theme/_admin-date-range-picker.sass */ +/* line 127, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected) { font-weight: 700; - background-color: #0d5373; + background-color: #004968; border-bottom-right-radius: 15px; border-top-right-radius: 15px; } -/* line 134, admin-theme/_admin-date-range-picker.sass */ +/* line 132, admin-theme/_admin-date-range-picker.sass */ +#datepicker .datepicker td.start-selected-compare:not(.old):not(.new):not(.end-selected-compare) { + font-weight: 700; + background-color: #ad4924; + border-bottom-left-radius: 15px; + border-top-left-radius: 15px; } +/* line 137, admin-theme/_admin-date-range-picker.sass */ +#datepicker .datepicker td.end-selected-compare:not(.old):not(.new):not(.start-selected-compare) { + font-weight: 700; + background-color: #ad4924; + border-bottom-right-radius: 15px; + border-top-right-radius: 15px; } +/* line 142, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td.end-selected.start-selected { -webkit-border-radius: 15px; -moz-border-radius: 15px; @@ -9036,28 +9047,28 @@ textarea { -o-border-radius: 15px; border-radius: 15px; font-weight: 700; - background-color: #0d5373; } -/* line 138, admin-theme/_admin-date-range-picker.sass */ -#datepicker .datepicker td.start-selected-compare:not(.old):not(.new):not(.end-selected-compare) { - background-color: #ad4924; } -/* line 140, admin-theme/_admin-date-range-picker.sass */ -#datepicker .datepicker td.end-selected-compare:not(.old):not(.new):not(.start-selected-compare) { - background-color: #ad4924; } -/* line 142, admin-theme/_admin-date-range-picker.sass */ + background-color: #004968; } +/* line 146, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td.end-selected-compare.start-selected-compare { + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + -ms-border-radius: 15px; + -o-border-radius: 15px; + border-radius: 15px; + font-weight: 700; background-color: #ad4924; } -/* line 144, admin-theme/_admin-date-range-picker.sass */ +/* line 150, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td.range { - color: #77caef; - background-color: #1275a1; } -/* line 147, admin-theme/_admin-date-range-picker.sass */ + color: #4eccff; + background-color: #006e9b; } +/* line 153, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td.range-compare { color: #f3d1c4; background-color: #d45c31; } -/* line 150, admin-theme/_admin-date-range-picker.sass */ +/* line 156, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td.today { background-color: white; } -/* line 153, admin-theme/_admin-date-range-picker.sass */ +/* line 158, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td span { padding: 0; display: block; @@ -9068,61 +9079,61 @@ textarea { float: left; text-transform: uppercase; cursor: pointer; } -/* line 163, admin-theme/_admin-date-range-picker.sass */ -#datepicker .datepicker td span:hover { - background-color: #0d5373; } -/* line 165, admin-theme/_admin-date-range-picker.sass */ -#datepicker .datepicker td span.active { - background-color: #0d5373; - color: white; } /* line 168, admin-theme/_admin-date-range-picker.sass */ +#datepicker .datepicker td span:hover { + background-color: #004968; } +/* line 170, admin-theme/_admin-date-range-picker.sass */ +#datepicker .datepicker td span.active { + background-color: #004968; + color: white; } +/* line 173, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker td span.old { - color: #1275a1; } -/* line 171, admin-theme/_admin-date-range-picker.sass */ + color: #006e9b; } +/* line 176, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker th.switch { width: 145px; } -/* line 173, admin-theme/_admin-date-range-picker.sass */ +/* line 178, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker th.next, #datepicker .datepicker th.prev { font-size: 1.3em; } -/* line 175, admin-theme/_admin-date-range-picker.sass */ +/* line 180, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker thead tr:first-child th { cursor: pointer; } -/* line 178, admin-theme/_admin-date-range-picker.sass */ +/* line 183, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker.datepicker-compare { background-color: #e18e70; } -/* line 181, admin-theme/_admin-date-range-picker.sass */ +/* line 186, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker.datepicker-compare thead tr th:after { border-top: 1px solid #d86d46; } -/* line 183, admin-theme/_admin-date-range-picker.sass */ +/* line 188, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker.datepicker-compare thead tr th { background-color: #dd7d5b; color: #f7e1d9; border-bottom: solid 1px #e7a58e; } -/* line 187, admin-theme/_admin-date-range-picker.sass */ +/* line 192, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker.datepicker-compare thead tr:first-child th { color: #ad4924; } -/* line 189, admin-theme/_admin-date-range-picker.sass */ +/* line 194, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker.datepicker-compare td { border-bottom: solid 1px #e18e70; } -/* line 191, admin-theme/_admin-date-range-picker.sass */ +/* line 196, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker.datepicker-compare td.day.disabled { color: #d45c31; } -/* line 193, admin-theme/_admin-date-range-picker.sass */ +/* line 198, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker.datepicker-compare td.old, #datepicker .datepicker.datepicker-compare td.new { color: #d45c31; } -/* line 197, admin-theme/_admin-date-range-picker.sass */ +/* line 201, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker.datepicker-compare td span:hover, #datepicker .datepicker.datepicker-compare td span.active { background-color: #ad4924; } -/* line 199, admin-theme/_admin-date-range-picker.sass */ +/* line 203, admin-theme/_admin-date-range-picker.sass */ #datepicker .datepicker.datepicker-compare td span.old { color: #d45c31; } -/* line 202, admin-theme/_admin-date-range-picker.sass */ -.chevron-left, #datepicker .datepicker td.start-selected:not(.old):not(.new):not(.end-selected), .chevron-right, #datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected) { +/* line 206, admin-theme/_admin-date-range-picker.sass */ +.chevron-left, .chevron-right { position: relative; } -/* line 204, admin-theme/_admin-date-range-picker.sass */ -.chevron-left:before, #datepicker .datepicker td.start-selected:not(.end-selected):not(.new):not(.old):before, .chevron-right:before, #datepicker .datepicker td.end-selected:not(.start-selected):not(.new):not(.old):before { +/* line 208, admin-theme/_admin-date-range-picker.sass */ +.chevron-left:before, .chevron-right:before { display: block; content: ""; width: 0; @@ -9130,23 +9141,23 @@ textarea { border-style: solid; position: absolute; } -/* line 211, admin-theme/_admin-date-range-picker.sass */ -.chevron-left:before, #datepicker .datepicker td.start-selected:not(.end-selected):not(.new):not(.old):before { - right: 0px; +/* line 215, admin-theme/_admin-date-range-picker.sass */ +.chevron-left:before { + right: 0; top: 0; - border-width: 1em 0 1em 0.5em; - border-color: transparent transparent transparent #0d5373; - background-color: #1275a1; } + border-width: 1.2em 0 1.2em 0.5em; + border-color: transparent transparent transparent #004968; + background-color: #006e9b; } -/* line 217, admin-theme/_admin-date-range-picker.sass */ -.chevron-right:before, #datepicker .datepicker td.end-selected:not(.start-selected):not(.new):not(.old):before { - left: 0px; +/* line 221, admin-theme/_admin-date-range-picker.sass */ +.chevron-right:before { + left: 0; top: 0; - border-width: 1em 0 1em 0.5em; - border-color: transparent transparent transparent #1275a1; - background-color: #0d5373; } + border-width: 1.2em 0 1.2em 0.5em; + border-color: transparent transparent transparent #006e9b; + background-color: #004968; } -/* line 224, admin-theme/_admin-date-range-picker.sass */ +/* line 227, admin-theme/_admin-date-range-picker.sass */ .input-complete { -webkit-animation: one 0.2s ease-in-out; -moz-animation: one 0.2s ease-in-out; @@ -9155,24 +9166,24 @@ textarea { animation: one 0.2s ease-in-out; } @-webkit-keyframes one { - /* line 232, admin-theme/_admin-date-range-picker.sass */ + /* line 235, admin-theme/_admin-date-range-picker.sass */ 0% { - background-color: #1ba6e5; } + background-color: #00a4e7; } - /* line 234, admin-theme/_admin-date-range-picker.sass */ + /* line 237, admin-theme/_admin-date-range-picker.sass */ 100% { background-color: white; } } @-webkit-keyframes two { - /* line 238, admin-theme/_admin-date-range-picker.sass */ + /* line 241, admin-theme/_admin-date-range-picker.sass */ 0% { - -webkit-box-shadow: #1ba6e5 0 0 0 20px inset; - box-shadow: #1ba6e5 0 0 0 20px inset; } + -webkit-box-shadow: #00a4e7 0 0 0 20px inset; + box-shadow: #00a4e7 0 0 0 20px inset; } - /* line 240, admin-theme/_admin-date-range-picker.sass */ + /* line 243, admin-theme/_admin-date-range-picker.sass */ 100% { - -webkit-box-shadow: #1ba6e5 0 0 0 inset; - box-shadow: #1ba6e5 0 0 0 inset; } } + -webkit-box-shadow: #00a4e7 0 0 0 inset; + box-shadow: #00a4e7 0 0 0 inset; } } /*! * Ladda @@ -9181,21 +9192,10 @@ textarea { * * Copyright (C) 2013 Hakim El Hattab, http://hakim.se */ -/************************************* - * CONFIG - */ -/************************************* - * MIXINS - */ -/************************************* - * BUTTON BASE - */ -/* line 60, admin-theme/_ladda.scss */ +/* line 41, admin-theme/_ladda.sass */ .ladda-button { position: relative; } - -/* Spinner animation */ -/* line 66, admin-theme/_ladda.scss */ +/* line 43, admin-theme/_ladda.sass */ .ladda-button .ladda-spinner { position: absolute; z-index: 2; @@ -9206,15 +9206,11 @@ textarea { margin-top: -16px; opacity: 0; pointer-events: none; } - -/* Button label */ -/* line 79, admin-theme/_ladda.scss */ +/* line 54, admin-theme/_ladda.sass */ .ladda-button .ladda-label { position: relative; z-index: 3; } - -/* Progress bar */ -/* line 85, admin-theme/_ladda.scss */ +/* line 58, admin-theme/_ladda.sass */ .ladda-button .ladda-progress { position: absolute; width: 0; @@ -9229,16 +9225,12 @@ textarea { -ms-transition: 0.1s linear all !important; -o-transition: 0.1s linear all !important; transition: 0.1s linear all !important; } - -/* line 98, admin-theme/_ladda.scss */ -.ladda-button[data-loading] .ladda-progress { +/* line 68, admin-theme/_ladda.sass */ +.ladda-button .ladda-progress[data-loading] .ladda-progress { opacity: 1; visibility: visible; } -/************************************* - * EASING - */ -/* line 110, admin-theme/_ladda.scss */ +/* line 73, admin-theme/_ladda.sass */ .ladda-button, .ladda-button .ladda-spinner, .ladda-button .ladda-label { -webkit-transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important; -moz-transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important; @@ -9246,7 +9238,7 @@ textarea { -o-transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important; transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important; } -/* line 119, admin-theme/_ladda.scss */ +/* line 75, admin-theme/_ladda.sass */ .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 { -webkit-transition: 0.3s ease all !important; -moz-transition: 0.3s ease all !important; @@ -9254,192 +9246,143 @@ textarea { -o-transition: 0.3s ease all !important; transition: 0.3s ease all !important; } -/************************************* - * EXPAND LEFT - */ -/* line 129, admin-theme/_ladda.scss */ +/* line 85, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-right] .ladda-spinner { right: 14px; } -/* line 134, admin-theme/_ladda.scss */ +/* line 87, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-right][data-size="s"] .ladda-spinner, .ladda-button[data-style=expand-right][data-size="xs"] .ladda-spinner { right: 4px; } -/* line 138, admin-theme/_ladda.scss */ +/* line 90, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-right][data-loading] { padding-right: 56px; } -/* line 141, admin-theme/_ladda.scss */ +/* line 92, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-right][data-loading] .ladda-spinner { opacity: 1; } -/* line 146, admin-theme/_ladda.scss */ +/* line 94, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-right][data-loading][data-size="s"], .ladda-button[data-style=expand-right][data-loading][data-size="xs"] { padding-right: 40px; } -/************************************* - * EXPAND RIGHT - */ -/* line 158, admin-theme/_ladda.scss */ +/* line 100, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-left] .ladda-spinner { left: 14px; } -/* line 163, admin-theme/_ladda.scss */ +/* line 102, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-left][data-size="s"] .ladda-spinner, .ladda-button[data-style=expand-left][data-size="xs"] .ladda-spinner { left: 4px; } -/* line 167, admin-theme/_ladda.scss */ +/* line 105, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-left][data-loading] { padding-left: 56px; } -/* line 170, admin-theme/_ladda.scss */ +/* line 107, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-left][data-loading] .ladda-spinner { opacity: 1; } -/* line 175, admin-theme/_ladda.scss */ +/* line 109, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-left][data-loading][data-size="s"], .ladda-button[data-style=expand-left][data-loading][data-size="xs"] { padding-left: 40px; } -/************************************* - * EXPAND UP - */ -/* line 186, admin-theme/_ladda.scss */ +/* line 114, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-up] { overflow: hidden; } -/* line 189, admin-theme/_ladda.scss */ +/* line 116, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-up] .ladda-spinner { top: -32px; left: 50%; margin-left: -16px; } -/* line 195, admin-theme/_ladda.scss */ +/* line 120, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-up][data-loading] { padding-top: 54px; } -/* line 198, admin-theme/_ladda.scss */ +/* line 122, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-up][data-loading] .ladda-spinner { opacity: 1; top: 14px; margin-top: 0; } -/* line 205, admin-theme/_ladda.scss */ +/* line 126, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-up][data-loading][data-size="s"], .ladda-button[data-style=expand-up][data-loading][data-size="xs"] { padding-top: 32px; } -/* line 208, admin-theme/_ladda.scss */ +/* line 129, admin-theme/_ladda.sass */ .ladda-button[data-style=expand-up][data-loading][data-size="s"] .ladda-spinner, .ladda-button[data-style=expand-up][data-loading][data-size="xs"] .ladda-spinner { top: 4px; } -/************************************* - * EXPAND DOWN - */ -/* line 220, admin-theme/_ladda.scss */ -.ladda-button[data-style=expand-down] { - overflow: hidden; } -/* line 223, admin-theme/_ladda.scss */ -.ladda-button[data-style=expand-down] .ladda-spinner { - top: 62px; - left: 50%; - margin-left: -16px; } -/* line 230, admin-theme/_ladda.scss */ -.ladda-button[data-style=expand-down][data-size="s"] .ladda-spinner, .ladda-button[data-style=expand-down][data-size="xs"] .ladda-spinner { - top: 40px; } -/* line 234, admin-theme/_ladda.scss */ -.ladda-button[data-style=expand-down][data-loading] { - padding-bottom: 54px; } -/* line 237, admin-theme/_ladda.scss */ -.ladda-button[data-style=expand-down][data-loading] .ladda-spinner { - opacity: 1; } -/* line 242, admin-theme/_ladda.scss */ -.ladda-button[data-style=expand-down][data-loading][data-size="s"], .ladda-button[data-style=expand-down][data-loading][data-size="xs"] { - padding-bottom: 32px; } - -/************************************* - * SLIDE LEFT - */ -/* line 252, admin-theme/_ladda.scss */ +/* line 153, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-left] { overflow: hidden; } -/* line 255, admin-theme/_ladda.scss */ +/* line 155, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-left] .ladda-label { position: relative; } -/* line 258, admin-theme/_ladda.scss */ +/* line 157, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-left] .ladda-spinner { left: 100%; margin-left: -16px; } -/* line 264, admin-theme/_ladda.scss */ +/* line 161, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-left][data-loading] .ladda-label { opacity: 0; left: -100%; } -/* line 268, admin-theme/_ladda.scss */ +/* line 164, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-left][data-loading] .ladda-spinner { opacity: 1; left: 50%; } -/************************************* - * SLIDE RIGHT - */ -/* line 279, admin-theme/_ladda.scss */ +/* line 169, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-right] { overflow: hidden; } -/* line 282, admin-theme/_ladda.scss */ +/* line 171, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-right] .ladda-label { position: relative; } -/* line 285, admin-theme/_ladda.scss */ +/* line 173, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-right] .ladda-spinner { right: 100%; margin-left: -16px; } -/* line 291, admin-theme/_ladda.scss */ +/* line 177, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-right][data-loading] .ladda-label { opacity: 0; left: 100%; } -/* line 295, admin-theme/_ladda.scss */ +/* line 180, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-right][data-loading] .ladda-spinner { opacity: 1; left: 50%; } -/************************************* - * SLIDE UP - */ -/* line 306, admin-theme/_ladda.scss */ +/* line 186, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-up] { overflow: hidden; } -/* line 309, admin-theme/_ladda.scss */ +/* line 188, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-up] .ladda-label { position: relative; } -/* line 312, admin-theme/_ladda.scss */ +/* line 190, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-up] .ladda-spinner { left: 50%; margin-left: -16px; margin-top: 1em; } -/* line 319, admin-theme/_ladda.scss */ +/* line 195, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-up][data-loading] .ladda-label { opacity: 0; top: -1em; } -/* line 323, admin-theme/_ladda.scss */ +/* line 198, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-up][data-loading] .ladda-spinner { opacity: 1; margin-top: -16px; } -/************************************* - * SLIDE DOWN - */ -/* line 334, admin-theme/_ladda.scss */ +/* line 204, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-down] { overflow: hidden; } -/* line 337, admin-theme/_ladda.scss */ +/* line 206, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-down] .ladda-label { position: relative; } -/* line 340, admin-theme/_ladda.scss */ +/* line 208, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-down] .ladda-spinner { left: 50%; margin-left: -16px; margin-top: -2em; } -/* line 347, admin-theme/_ladda.scss */ +/* line 213, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-down][data-loading] .ladda-label { opacity: 0; top: 1em; } -/* line 351, admin-theme/_ladda.scss */ +/* line 216, admin-theme/_ladda.sass */ .ladda-button[data-style=slide-down][data-loading] .ladda-spinner { opacity: 1; margin-top: -16px; } -/************************************* - * ZOOM-OUT - */ -/* line 363, admin-theme/_ladda.scss */ +/* line 221, admin-theme/_ladda.sass */ .ladda-button[data-style=zoom-out] { overflow: hidden; } - -/* line 366, admin-theme/_ladda.scss */ +/* line 223, admin-theme/_ladda.sass */ .ladda-button[data-style=zoom-out] .ladda-spinner { left: 50%; margin-left: -16px; @@ -9448,13 +9391,11 @@ textarea { -ms-transform: scale(2.5); -o-transform: scale(2.5); transform: scale(2.5); } - -/* line 372, admin-theme/_ladda.scss */ +/* line 227, admin-theme/_ladda.sass */ .ladda-button[data-style=zoom-out] .ladda-label { position: relative; display: inline-block; } - -/* line 377, admin-theme/_ladda.scss */ +/* line 230, admin-theme/_ladda.sass */ .ladda-button[data-style=zoom-out][data-loading] .ladda-label { opacity: 0; -webkit-transform: scale(0.5); @@ -9462,8 +9403,7 @@ textarea { -ms-transform: scale(0.5); -o-transform: scale(0.5); transform: scale(0.5); } - -/* line 382, admin-theme/_ladda.scss */ +/* line 233, admin-theme/_ladda.sass */ .ladda-button[data-style=zoom-out][data-loading] .ladda-spinner { opacity: 1; -webkit-transform: none; @@ -9472,14 +9412,10 @@ textarea { -o-transform: none; transform: none; } -/************************************* - * ZOOM-IN - */ -/* line 393, admin-theme/_ladda.scss */ +/* line 239, admin-theme/_ladda.sass */ .ladda-button[data-style=zoom-in] { overflow: hidden; } - -/* line 396, admin-theme/_ladda.scss */ +/* line 241, admin-theme/_ladda.sass */ .ladda-button[data-style=zoom-in] .ladda-spinner { left: 50%; margin-left: -16px; @@ -9488,13 +9424,11 @@ textarea { -ms-transform: scale(0.2); -o-transform: scale(0.2); transform: scale(0.2); } - -/* line 402, admin-theme/_ladda.scss */ +/* line 245, admin-theme/_ladda.sass */ .ladda-button[data-style=zoom-in] .ladda-label { position: relative; display: inline-block; } - -/* line 407, admin-theme/_ladda.scss */ +/* line 248, admin-theme/_ladda.sass */ .ladda-button[data-style=zoom-in][data-loading] .ladda-label { opacity: 0; -webkit-transform: scale(2.2); @@ -9502,8 +9436,7 @@ textarea { -ms-transform: scale(2.2); -o-transform: scale(2.2); transform: scale(2.2); } - -/* line 412, admin-theme/_ladda.scss */ +/* line 251, admin-theme/_ladda.sass */ .ladda-button[data-style=zoom-in][data-loading] .ladda-spinner { opacity: 1; -webkit-transform: none; @@ -9512,86 +9445,73 @@ textarea { -o-transform: none; transform: none; } -/************************************* - * CONTRACT - */ -/* line 423, admin-theme/_ladda.scss */ +/* line 257, admin-theme/_ladda.sass */ .ladda-button[data-style=contract] { overflow: hidden; width: 100px; } - -/* line 427, admin-theme/_ladda.scss */ +/* line 260, admin-theme/_ladda.sass */ .ladda-button[data-style=contract] .ladda-spinner { left: 50%; margin-left: -16px; } -/* line 432, admin-theme/_ladda.scss */ +/* line 264, admin-theme/_ladda.sass */ .ladda-button[data-style=contract][data-loading] { border-radius: 50%; width: 52px; } - -/* line 436, admin-theme/_ladda.scss */ +/* line 267, admin-theme/_ladda.sass */ .ladda-button[data-style=contract][data-loading] .ladda-label { opacity: 0; } - -/* line 439, admin-theme/_ladda.scss */ +/* line 269, admin-theme/_ladda.sass */ .ladda-button[data-style=contract][data-loading] .ladda-spinner { opacity: 1; } -/************************************* - * OVERLAY - */ -/* line 449, admin-theme/_ladda.scss */ +/* line 274, admin-theme/_ladda.sass */ .ladda-button[data-style=contract-overlay] { overflow: hidden; width: 100px; box-shadow: 0px 0px 0px 3000px rgba(0, 0, 0, 0); } - -/* line 454, admin-theme/_ladda.scss */ +/* line 278, admin-theme/_ladda.sass */ .ladda-button[data-style=contract-overlay] .ladda-spinner { left: 50%; margin-left: -16px; } - -/* line 459, admin-theme/_ladda.scss */ +/* line 281, admin-theme/_ladda.sass */ .ladda-button[data-style=contract-overlay][data-loading] { border-radius: 50%; width: 52px; - /*outline: 10000px solid rgba( 0, 0, 0, 0.5 );*/ + /*outline: 10000px solid rgba( 0, 0, 0, 0.5 ); */ box-shadow: 0px 0px 0px 3000px rgba(0, 0, 0, 0.8); } - -/* line 466, admin-theme/_ladda.scss */ +/* line 286, admin-theme/_ladda.sass */ .ladda-button[data-style=contract-overlay][data-loading] .ladda-label { opacity: 0; } - -/* line 469, admin-theme/_ladda.scss */ +/* line 288, admin-theme/_ladda.sass */ .ladda-button[data-style=contract-overlay][data-loading] .ladda-spinner { opacity: 1; } -/* line 8, admin-theme/_ladda-theme.sass */ +/* line 299, admin-theme/_ladda.sass */ .ladda-button[disabled], .ladda-button[data-loading] { border-color: rgba(0, 0, 0, 0.07); cursor: default; background-color: #999999; } -/* line 13, admin-theme/_ladda-theme.sass */ +/* line 304, admin-theme/_ladda.sass */ .ladda-button[disabled]:hover, .ladda-button[data-loading]:hover { cursor: default; background-color: #999999; } -/* line 16, admin-theme/_ladda-theme.sass */ +/* line 307, admin-theme/_ladda.sass */ .ladda-button[data-size=xs] { padding: 4px 8px; } -/* line 18, admin-theme/_ladda-theme.sass */ +/* line 309, admin-theme/_ladda.sass */ .ladda-button[data-size=xs] .ladda-label { font-size: 0.7em; } -/* line 20, admin-theme/_ladda-theme.sass */ +/* line 311, admin-theme/_ladda.sass */ .ladda-button[data-size=s] { padding: 6px 10px; } -/* line 22, admin-theme/_ladda-theme.sass */ +/* line 313, admin-theme/_ladda.sass */ .ladda-button[data-size=s] .ladda-label { font-size: 0.9em; } -/* line 24, admin-theme/_ladda-theme.sass */ +/* line 315, admin-theme/_ladda.sass */ .ladda-button[data-size=l] .ladda-label { font-size: 1.2em; } -/* line 26, admin-theme/_ladda-theme.sass */ +/* line 317, admin-theme/_ladda.sass */ .ladda-button[data-size=xl] .ladda-label { font-size: 1.5em; } diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index 1866afa82..6af67eabc 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -104,7 +104,6 @@ fieldset > .row @import "admin-theme/admin-date-range-picker" @import "admin-theme/ladda" -@import "admin-theme/ladda-theme" //page specific @import "admin-theme/admin-login" diff --git a/admin-dev/themes/default/css/admin-theme/_admin-date-range-picker.sass b/admin-dev/themes/default/css/admin-theme/_admin-date-range-picker.sass index 5122b8395..50cef4ec9 100644 --- a/admin-dev/themes/default/css/admin-theme/_admin-date-range-picker.sass +++ b/admin-dev/themes/default/css/admin-theme/_admin-date-range-picker.sass @@ -1,7 +1,6 @@ $color-bright: white -$font-family: 'Josefin Sans', sans-serif -$color-calendar: $brand-primary +$color-calendar: #00A4E7 $color-calendar-compare: #E18E70 $color-calendar-day: $color-bright @@ -17,12 +16,12 @@ $color-calendar-range-compare: darken($color-calendar-compare,15%) #datepicker padding: 6px - background-color: darken($color-calendar,10%) + //background-color: darken($color-calendar,10%) .input-selected margin: 0 - #date-start.input-selected + #date-start.input-selected, #date-end.input-selected, border: solid 3px $color-calendar-day-selected - #date-end.input-selected + #date-start-compare.input-selected, #date-end-compare.input-selected, border: solid 3px $color-calendar-day-selected div#datepicker-form #date-range .form-date-heading @@ -30,9 +29,10 @@ $color-calendar-range-compare: darken($color-calendar-compare,15%) #date-compare .form-date-heading background-color: darken($color-calendar-compare,5%) .form-date-heading - padding: 6px + height: 30px + line-height: 30px + padding: 0 8px .title, .checkbox-title label - font-family: $font-family font-size: 1.15em color: $color-bright font-weight: 200 @@ -48,34 +48,36 @@ $color-calendar-range-compare: darken($color-calendar-compare,15%) padding: 10px background-color: white display: inline-block + .form-date-actions + border: solid 1px black .form-date-group width: 100% - margin: 0 auto + margin: 0 auto 6px auto + border: solid 1px black label - font-family: $font-family font-size: 0.8em font-weight: 700 text-transform: uppercase color: #666 - line-height: 3.2em - margin-bottom: 0 - label, input - float: left - margin-right: 6px + //line-height: 3.2em + input + margin: 4px 4px 0 0 input[type='text'] width: 35% + button + margin: 5px 0 0 0 .datepicker position: relative margin: 0 0 8px 0 width: 100% background-color: $color-calendar - font-family: $font-family - font-size: 14px - height: 16.8em + font-size: 13px + border: solid 1px black table width: 100% margin: 0 + border-spacing: 1px thead tr th:after content: "" @@ -96,15 +98,12 @@ $color-calendar-range-compare: darken($color-calendar-compare,15%) color: $color-calendar-day-selected td, th text-align: center - height: 2em - line-height: 2em padding: 0 color: $color-calendar-day position: relative td - font-weight: 400 + height: 2.4em padding: 0 10px - border-bottom: solid 1px $color-calendar &.day:after content: "" position: absolute @@ -112,7 +111,6 @@ $color-calendar-range-compare: darken($color-calendar-compare,15%) top: 0 left: 0 width: 100% - height: 100% z-index: 0 background-color: transparent &.day:hover @@ -125,21 +123,29 @@ $color-calendar-range-compare: darken($color-calendar-compare,15%) font-weight: 700 background-color: $color-calendar-day-selected +border-left-radius(15px) - @extend .chevron-left + //@extend .chevron-left &.end-selected:not(.old):not(.new):not(.start-selected) font-weight: 700 background-color: $color-calendar-day-selected - @extend .chevron-right + //@extend .chevron-right + +border-right-radius(15px) + &.start-selected-compare:not(.old):not(.new):not(.end-selected-compare) + font-weight: 700 + background-color: $color-calendar-day-selected-compare + +border-left-radius(15px) + //@extend .chevron-left + &.end-selected-compare:not(.old):not(.new):not(.start-selected-compare) + font-weight: 700 + background-color: $color-calendar-day-selected-compare + //@extend .chevron-right +border-right-radius(15px) &.end-selected.start-selected +border-radius(15px) font-weight: 700 background-color: $color-calendar-day-selected - &.start-selected-compare:not(.old):not(.new):not(.end-selected-compare) - background-color: $color-calendar-day-selected-compare - &.end-selected-compare:not(.old):not(.new):not(.start-selected-compare) - background-color: $color-calendar-day-selected-compare &.end-selected-compare.start-selected-compare + +border-radius(15px) + font-weight: 700 background-color: $color-calendar-day-selected-compare &.range color: lighten($color-calendar-range,35%) @@ -149,7 +155,6 @@ $color-calendar-range-compare: darken($color-calendar-compare,15%) background-color: $color-calendar-range-compare &.today background-color: $color-bright - span padding: 0 display: block @@ -192,7 +197,6 @@ $color-calendar-range-compare: darken($color-calendar-compare,15%) color: $color-calendar-outrange-compare &.old, &.new color: $color-calendar-outrange-compare - span &:hover, &.active background-color: $color-calendar-day-selected-compare @@ -209,18 +213,17 @@ $color-calendar-range-compare: darken($color-calendar-compare,15%) border-style: solid position: absolute .chevron-left:before - right: 0px + right: 0 top: 0 - border-width: 1em 0 1em 0.5em + border-width: 1.2em 0 1.2em 0.5em border-color: transparent transparent transparent $color-calendar-day-selected background-color: $color-calendar-range .chevron-right:before - left: 0px + left: 0 top: 0 - border-width: 1em 0 1em 0.5em + border-width: 1.2em 0 1.2em 0.5em border-color: transparent transparent transparent $color-calendar-range background-color: $color-calendar-day-selected - .input-complete -webkit-animation: one 0.2s ease-in-out -moz-animation: one 0.2s ease-in-out diff --git a/admin-dev/themes/default/css/admin-theme/_ladda.sass b/admin-dev/themes/default/css/admin-theme/_ladda.sass new file mode 100755 index 000000000..04e2aeba9 --- /dev/null +++ b/admin-dev/themes/default/css/admin-theme/_ladda.sass @@ -0,0 +1,318 @@ +/*! + * Ladda + * http://lab.hakim.se/ladda + * MIT licensed + * + * Copyright (C) 2013 Hakim El Hattab, http://hakim.se + */ + + +// CONFIG +$spinnerSize: 32px + +// MIXINS +@mixin prefix ( $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 + +@mixin vendor-transform( $value ) + @include prefix( transform, $value ) + +@mixin transform-origin( $value ) + @include prefix( transform-origin, $value ) + +@mixin buttonColor( $name, $color ) + &[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 + + .ladda-label + position: relative + z-index: 3 + + .ladda-progress + position: absolute + width: 0 + height: 100% + left: 0 + top: 0 + background: rgba( 0, 0, 0, 0.2 ) + visibility: hidden + opacity: 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) all ) +.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 ) + +// EXPAND LEFT +.ladda-button[data-style=expand-right] + .ladda-spinner + right: 14px + &[data-size="s"] .ladda-spinner, + &[data-size="xs"] .ladda-spinner + right: 4px + &[data-loading] + padding-right: 56px + .ladda-spinner + opacity: 1 + &[data-size="s"], + &[data-size="xs"] + padding-right: 40px + +// EXPAND RIGHT +.ladda-button[data-style=expand-left] + .ladda-spinner + left: 14px + &[data-size="s"] .ladda-spinner, + &[data-size="xs"] .ladda-spinner + left: 4px + &[data-loading] + padding-left: 56px + .ladda-spinner + opacity: 1 + &[data-size="s"], + &[data-size="xs"] + padding-left: 40px + +// EXPAND UP +.ladda-button[data-style=expand-up] + overflow: hidden + .ladda-spinner + top: -$spinnerSize + left: 50% + margin-left: -$spinnerSize/2 + &[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 + 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 + left: 100% + margin-left: -$spinnerSize/2 + &[data-loading] + .ladda-label + opacity: 0 + left: -100% + .ladda-spinner + opacity: 1 + left: 50% + +// SLIDE RIGHT +.ladda-button[data-style=slide-right] + overflow: hidden + .ladda-label + position: relative + .ladda-spinner + right: 100% + margin-left: -$spinnerSize/2 + &[data-loading] + .ladda-label + opacity: 0 + left: 100% + .ladda-spinner + opacity: 1 + left: 50% + + +// SLIDE UP +.ladda-button[data-style=slide-up] + overflow: hidden + .ladda-label + position: relative + .ladda-spinner + left: 50% + margin-left: -$spinnerSize/2 + margin-top: 1em + &[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 + left: 50% + margin-left: -$spinnerSize/2 + margin-top: -2em + &[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 + left: 50% + 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 + left: 50% + margin-left: -$spinnerSize/2 + @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 + left: 50% + margin-left: -16px + +.ladda-button[data-style=contract][data-loading] + border-radius: 50% + width: 52px + .ladda-label + opacity: 0 + .ladda-spinner + opacity: 1 + + +// OVERLAY +.ladda-button[data-style=contract-overlay] + overflow: hidden + width: 100px + box-shadow: 0px 0px 0px 3000px rgba(0,0,0,0) + .ladda-spinner + left: 50% + margin-left: -16px + &[data-loading] + border-radius: 50% + width: 52px + /*outline: 10000px solid rgba( 0, 0, 0, 0.5 );*/ + box-shadow: 0px 0px 0px 3000px rgba(0,0,0,0.8) + .ladda-label + opacity: 0 + .ladda-spinner + opacity: 1 + +// THEME +$red: #ea8557 +$purple: #9973C2 +$mint: #16a085 +$green: #2aca76 +$blue: #53b5e6 + +.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 diff --git a/admin-dev/themes/default/css/admin-theme/_ladda.scss b/admin-dev/themes/default/css/admin-theme/_ladda.scss deleted file mode 100755 index c9e24d36f..000000000 --- a/admin-dev/themes/default/css/admin-theme/_ladda.scss +++ /dev/null @@ -1,471 +0,0 @@ -/*! - * Ladda - * http://lab.hakim.se/ladda - * MIT licensed - * - * Copyright (C) 2013 Hakim El Hattab, http://hakim.se - */ - - -/************************************* - * CONFIG - */ - -$spinnerSize: 32px; - - -/************************************* - * MIXINS - */ - -@mixin prefix ( $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; -} - -@mixin vendor-transform( $value ) { - @include prefix( transform, $value ); -} - -@mixin transform-origin( $value ) { - @include prefix( transform-origin, $value ); -} - -@mixin buttonColor( $name, $color ) { - &[data-color=#{$name}] { - background: $color; - - &:hover { - background-color: lighten( $color, 5% ); - } - } -} - - -/************************************* - * BUTTON BASE - */ - -.ladda-button { - position: relative; -} - - -/* Spinner animation */ -.ladda-button .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; -} - -/* Button label */ -.ladda-button .ladda-label { - position: relative; - z-index: 3; -} - -/* Progress bar */ -.ladda-button .ladda-progress { - position: absolute; - width: 0; - height: 100%; - left: 0; - top: 0; - background: rgba( 0, 0, 0, 0.2 ); - - visibility: hidden; - opacity: 0; - - @include transition( 0.1s linear all ); -} - .ladda-button[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) all ); -} - -.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 ); -} - - -/************************************* - * EXPAND LEFT - */ - -.ladda-button[data-style=expand-right] { - .ladda-spinner { - right: 14px; - } - - &[data-size="s"] .ladda-spinner, - &[data-size="xs"] .ladda-spinner { - right: 4px; - } - - &[data-loading] { - padding-right: 56px; - - .ladda-spinner { - opacity: 1; - } - - &[data-size="s"], - &[data-size="xs"] { - padding-right: 40px; - } - } -} - - -/************************************* - * EXPAND RIGHT - */ - -.ladda-button[data-style=expand-left] { - .ladda-spinner { - left: 14px; - } - - &[data-size="s"] .ladda-spinner, - &[data-size="xs"] .ladda-spinner { - left: 4px; - } - - &[data-loading] { - padding-left: 56px; - - .ladda-spinner { - opacity: 1; - } - - &[data-size="s"], - &[data-size="xs"] { - padding-left: 40px; - } - } -} - - -/************************************* - * EXPAND UP - */ - -.ladda-button[data-style=expand-up] { - overflow: hidden; - - .ladda-spinner { - top: -$spinnerSize; - left: 50%; - margin-left: -$spinnerSize/2; - } - - &[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; - 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 { - left: 100%; - margin-left: -$spinnerSize/2; - } - - &[data-loading] { - .ladda-label { - opacity: 0; - left: -100%; - } - .ladda-spinner { - opacity: 1; - left: 50%; - } - } -} - - -/************************************* - * SLIDE RIGHT - */ -.ladda-button[data-style=slide-right] { - overflow: hidden; - - .ladda-label { - position: relative; - } - .ladda-spinner { - right: 100%; - margin-left: -$spinnerSize/2; - } - - &[data-loading] { - .ladda-label { - opacity: 0; - left: 100%; - } - .ladda-spinner { - opacity: 1; - left: 50%; - } - } -} - - -/************************************* - * SLIDE UP - */ -.ladda-button[data-style=slide-up] { - overflow: hidden; - - .ladda-label { - position: relative; - } - .ladda-spinner { - left: 50%; - margin-left: -$spinnerSize/2; - margin-top: 1em; - } - - &[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 { - left: 50%; - margin-left: -$spinnerSize/2; - margin-top: -2em; - } - - &[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-button[data-style=zoom-out] .ladda-spinner { - left: 50%; - margin-left: -$spinnerSize/2; - - @include vendor-transform( scale( 2.5 ) ); - } - .ladda-button[data-style=zoom-out] .ladda-label { - position: relative; - display: inline-block; - } - -.ladda-button[data-style=zoom-out][data-loading] .ladda-label { - opacity: 0; - - @include vendor-transform( scale( 0.5 ) ); -} -.ladda-button[data-style=zoom-out][data-loading] .ladda-spinner { - opacity: 1; - - @include vendor-transform( none ); -} - - -/************************************* - * ZOOM-IN - */ - -.ladda-button[data-style=zoom-in] { - overflow: hidden; -} - .ladda-button[data-style=zoom-in] .ladda-spinner { - left: 50%; - margin-left: -$spinnerSize/2; - - @include vendor-transform( scale( 0.2 ) ); - } - .ladda-button[data-style=zoom-in] .ladda-label { - position: relative; - display: inline-block; - } - -.ladda-button[data-style=zoom-in][data-loading] .ladda-label { - opacity: 0; - - @include vendor-transform( scale( 2.2 ) ); -} -.ladda-button[data-style=zoom-in][data-loading] .ladda-spinner { - opacity: 1; - - @include vendor-transform( none ); -} - - -/************************************* - * CONTRACT - */ - -.ladda-button[data-style=contract] { - overflow: hidden; - width: 100px; -} - .ladda-button[data-style=contract] .ladda-spinner { - left: 50%; - margin-left: -16px; - } - -.ladda-button[data-style=contract][data-loading] { - border-radius: 50%; - width: 52px; -} - .ladda-button[data-style=contract][data-loading] .ladda-label { - opacity: 0; - } - .ladda-button[data-style=contract][data-loading] .ladda-spinner { - opacity: 1; - } - - - -/************************************* - * OVERLAY - */ - -.ladda-button[data-style=contract-overlay] { - overflow: hidden; - width: 100px; - box-shadow: 0px 0px 0px 3000px rgba(0,0,0,0); -} - .ladda-button[data-style=contract-overlay] .ladda-spinner { - left: 50%; - margin-left: -16px; - } - -.ladda-button[data-style=contract-overlay][data-loading] { - border-radius: 50%; - width: 52px; - - /*outline: 10000px solid rgba( 0, 0, 0, 0.5 );*/ - box-shadow: 0px 0px 0px 3000px rgba(0,0,0,0.8); -} - .ladda-button[data-style=contract-overlay][data-loading] .ladda-label { - opacity: 0; - } - .ladda-button[data-style=contract-overlay][data-loading] .ladda-spinner { - opacity: 1; - } diff --git a/admin-dev/themes/default/template/helpers/calendar/calendar.tpl b/admin-dev/themes/default/template/helpers/calendar/calendar.tpl index 786a17df4..2f791f7cf 100644 --- a/admin-dev/themes/default/template/helpers/calendar/calendar.tpl +++ b/admin-dev/themes/default/template/helpers/calendar/calendar.tpl @@ -17,6 +17,7 @@ {/if}
+
{l s='Date range'} @@ -43,8 +44,9 @@
+
-
+