dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Jerome Nadaud
2013-10-17 16:00:10 +02:00
parent 08525e5af4 c43a7093ac
commit f77fa3d7c6
2 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+37 -21
View File
@@ -9100,6 +9100,14 @@ textarea {
font-weight: 700; font-weight: 700;
background-color: #00a4e7; } background-color: #00a4e7; }
/* line 174, admin-theme/_admin-date-range-picker.sass */ /* line 174, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.end-selected.start-selected.range-compare {
background-color: #4ca0b1;
-webkit-border-radius: 0;
-moz-border-radius: 0;
-ms-border-radius: 0;
-o-border-radius: 0;
border-radius: 0; }
/* line 177, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.end-selected-compare.start-selected-compare { #datepicker .daterangepicker td.end-selected-compare.start-selected-compare {
color: white; color: white;
-webkit-border-radius: 15px; -webkit-border-radius: 15px;
@@ -9109,24 +9117,32 @@ textarea {
border-radius: 15px; border-radius: 15px;
font-weight: 700; font-weight: 700;
background-color: #ff8000; } background-color: #ff8000; }
/* line 179, admin-theme/_admin-date-range-picker.sass */ /* line 182, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.end-selected-compare.start-selected-compare.range {
background-color: #ba924c;
-webkit-border-radius: 0;
-moz-border-radius: 0;
-ms-border-radius: 0;
-o-border-radius: 0;
border-radius: 0; }
/* line 185, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.range { #datepicker .daterangepicker td.range {
color: #cef1ff; color: #cef1ff;
background-color: #1bbdff; } background-color: #1bbdff; }
/* line 182, admin-theme/_admin-date-range-picker.sass */ /* line 188, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.range.range-compare { #datepicker .daterangepicker td.range.range-compare {
background-color: #8dab99; } background-color: #8dab99; }
/* line 184, admin-theme/_admin-date-range-picker.sass */ /* line 190, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.range-compare { #datepicker .daterangepicker td.range-compare {
color: #fff2e5; color: #fff2e5;
background-color: #ff9933; } background-color: #ff9933; }
/* line 187, admin-theme/_admin-date-range-picker.sass */ /* line 193, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.range-compare.range { #datepicker .daterangepicker td.range-compare.range {
background-color: #8dab99; } background-color: #8dab99; }
/* line 189, admin-theme/_admin-date-range-picker.sass */ /* line 195, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td.today { #datepicker .daterangepicker td.today {
background-color: white; } background-color: white; }
/* line 191, admin-theme/_admin-date-range-picker.sass */ /* line 197, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td span { #datepicker .daterangepicker td span {
padding: 0; padding: 0;
display: block; display: block;
@@ -9137,31 +9153,31 @@ textarea {
float: left; float: left;
text-transform: uppercase; text-transform: uppercase;
cursor: pointer; } cursor: pointer; }
/* line 201, admin-theme/_admin-date-range-picker.sass */ /* line 207, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td span:hover { #datepicker .daterangepicker td span:hover {
background-color: #00a4e7; } background-color: #00a4e7; }
/* line 203, admin-theme/_admin-date-range-picker.sass */ /* line 209, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td span.active { #datepicker .daterangepicker td span.active {
background-color: #00a4e7; background-color: #00a4e7;
color: white; } color: white; }
/* line 206, admin-theme/_admin-date-range-picker.sass */ /* line 212, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker td span.old { #datepicker .daterangepicker td span.old {
color: #cccccc; } color: #cccccc; }
/* line 209, admin-theme/_admin-date-range-picker.sass */ /* line 215, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker th.switch { #datepicker .daterangepicker th.switch {
width: 145px; } width: 145px; }
/* line 211, admin-theme/_admin-date-range-picker.sass */ /* line 217, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker th.next, #datepicker .daterangepicker th.prev { #datepicker .daterangepicker th.next, #datepicker .daterangepicker th.prev {
font-size: 1.3em; } font-size: 1.3em; }
/* line 213, admin-theme/_admin-date-range-picker.sass */ /* line 219, admin-theme/_admin-date-range-picker.sass */
#datepicker .daterangepicker thead tr:first-child th { #datepicker .daterangepicker thead tr:first-child th {
cursor: pointer; } cursor: pointer; }
/* line 217, admin-theme/_admin-date-range-picker.sass */ /* line 223, admin-theme/_admin-date-range-picker.sass */
.chevron-left, .chevron-right { .chevron-left, .chevron-right {
position: relative; } position: relative; }
/* line 219, admin-theme/_admin-date-range-picker.sass */ /* line 225, admin-theme/_admin-date-range-picker.sass */
.chevron-left:before, .chevron-right:before { .chevron-left:before, .chevron-right:before {
display: block; display: block;
content: ""; content: "";
@@ -9170,7 +9186,7 @@ textarea {
border-style: solid; border-style: solid;
position: absolute; } position: absolute; }
/* line 226, admin-theme/_admin-date-range-picker.sass */ /* line 232, admin-theme/_admin-date-range-picker.sass */
.chevron-left:before { .chevron-left:before {
right: 0; right: 0;
top: 0; top: 0;
@@ -9178,7 +9194,7 @@ textarea {
border-color: transparent transparent transparent #00a4e7; border-color: transparent transparent transparent #00a4e7;
background-color: #1bbdff; } background-color: #1bbdff; }
/* line 232, admin-theme/_admin-date-range-picker.sass */ /* line 238, admin-theme/_admin-date-range-picker.sass */
.chevron-right:before { .chevron-right:before {
left: 0; left: 0;
top: 0; top: 0;
@@ -9186,7 +9202,7 @@ textarea {
border-color: transparent transparent transparent #1bbdff; border-color: transparent transparent transparent #1bbdff;
background-color: #00a4e7; } background-color: #00a4e7; }
/* line 238, admin-theme/_admin-date-range-picker.sass */ /* line 244, admin-theme/_admin-date-range-picker.sass */
.input-complete { .input-complete {
-webkit-animation: one 0.2s ease-in-out; -webkit-animation: one 0.2s ease-in-out;
-moz-animation: one 0.2s ease-in-out; -moz-animation: one 0.2s ease-in-out;
@@ -9195,21 +9211,21 @@ textarea {
animation: one 0.2s ease-in-out; } animation: one 0.2s ease-in-out; }
@-webkit-keyframes one { @-webkit-keyframes one {
/* line 246, admin-theme/_admin-date-range-picker.sass */ /* line 252, admin-theme/_admin-date-range-picker.sass */
0% { 0% {
background-color: #00a4e7; } background-color: #00a4e7; }
/* line 248, admin-theme/_admin-date-range-picker.sass */ /* line 254, admin-theme/_admin-date-range-picker.sass */
100% { 100% {
background-color: white; } } background-color: white; } }
@-webkit-keyframes two { @-webkit-keyframes two {
/* line 252, admin-theme/_admin-date-range-picker.sass */ /* line 258, admin-theme/_admin-date-range-picker.sass */
0% { 0% {
-webkit-box-shadow: #00a4e7 0 0 0 20px inset; -webkit-box-shadow: #00a4e7 0 0 0 20px inset;
box-shadow: #00a4e7 0 0 0 20px inset; } box-shadow: #00a4e7 0 0 0 20px inset; }
/* line 254, admin-theme/_admin-date-range-picker.sass */ /* line 260, admin-theme/_admin-date-range-picker.sass */
100% { 100% {
-webkit-box-shadow: #00a4e7 0 0 0 inset; -webkit-box-shadow: #00a4e7 0 0 0 inset;
box-shadow: #00a4e7 0 0 0 inset; } } box-shadow: #00a4e7 0 0 0 inset; } }
admin-dev/themes/default/css/admin-theme/_admin-date-range-picker.sass
+6
View File
@@ -171,11 +171,17 @@ $color-calendar-range-compare: lighten($color-calendar-compare,10%)
+border-radius(15px) +border-radius(15px)
font-weight: 700 font-weight: 700
background-color: $color-calendar-day-selected background-color: $color-calendar-day-selected
&.range-compare
background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%)
+border-radius(0)
&.end-selected-compare.start-selected-compare &.end-selected-compare.start-selected-compare
color: $color-bright color: $color-bright
+border-radius(15px) +border-radius(15px)
font-weight: 700 font-weight: 700
background-color: $color-calendar-day-selected-compare background-color: $color-calendar-day-selected-compare
&.range
background-color: mix($color-calendar-day-selected-compare,$color-calendar-range,70%)
+border-radius(0)
&.range &.range
color: lighten($color-calendar-range,35%) color: lighten($color-calendar-range,35%)
background-color: $color-calendar-range background-color: $color-calendar-range