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 committed 2013-10-17 11:41:10 +02:00
2 parents cee6c2b2d6 193d3921fa
commit 983b4dd617
2 files changed
+65 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/css/admin-theme.css
+57 -35
View File
@@ -9029,44 +9029,66 @@ textarea {
border-top-left-radius: 15px; } border-top-left-radius: 15px; }
/* line 133, admin-theme/_admin-date-range-picker.sass */ /* line 133, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.start-selected:not(.old):not(.new):not(.end-selected).range-compare { #datepicker .datepicker td.start-selected:not(.old):not(.new):not(.end-selected).range-compare {
background-color: #4ca0b1; } background-color: #4ca0b1;
/* line 135, admin-theme/_admin-date-range-picker.sass */ border-bottom-left-radius: 0;
border-top-left-radius: 0; }
/* line 136, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.start-selected:not(.old):not(.new):not(.end-selected).end-selected-compare, #datepicker .datepicker td.start-selected:not(.old):not(.new):not(.end-selected).start-selected-compare { #datepicker .datepicker td.start-selected:not(.old):not(.new):not(.end-selected).end-selected-compare, #datepicker .datepicker td.start-selected:not(.old):not(.new):not(.end-selected).start-selected-compare {
background-color: #4c99a1; } background-color: #4c99a1; }
/* line 137, admin-theme/_admin-date-range-picker.sass */ /* line 138, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.start-selected:not(.old):not(.new):not(.end-selected).end-selected-compare {
-webkit-border-radius: 0;
-moz-border-radius: 0;
-ms-border-radius: 0;
-o-border-radius: 0;
border-radius: 0; }
/* line 140, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected) { #datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected) {
color: white; color: white;
font-weight: 700; font-weight: 700;
background-color: #00a4e7; background-color: #00a4e7;
border-bottom-right-radius: 15px; border-bottom-right-radius: 15px;
border-top-right-radius: 15px; } border-top-right-radius: 15px; }
/* line 143, admin-theme/_admin-date-range-picker.sass */ /* line 146, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected).range-compare { #datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected).range-compare {
background-color: #4ca0b1; } background-color: #4ca0b1;
/* line 145, admin-theme/_admin-date-range-picker.sass */ border-bottom-right-radius: 0;
border-top-right-radius: 0; }
/* line 149, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected).end-selected-compare, #datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected).start-selected-compare { #datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected).end-selected-compare, #datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected).start-selected-compare {
background-color: #4c99a1; } background-color: #4c99a1; }
/* line 147, admin-theme/_admin-date-range-picker.sass */ /* line 151, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.end-selected:not(.old):not(.new):not(.start-selected).start-selected-compare {
-webkit-border-radius: 0;
-moz-border-radius: 0;
-ms-border-radius: 0;
-o-border-radius: 0;
border-radius: 0; }
/* line 153, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.start-selected-compare:not(.old):not(.new):not(.end-selected-compare) { #datepicker .datepicker td.start-selected-compare:not(.old):not(.new):not(.end-selected-compare) {
color: white; color: white;
font-weight: 700; font-weight: 700;
background-color: #ff8000; background-color: #ff8000;
border-bottom-left-radius: 15px; border-bottom-left-radius: 15px;
border-top-left-radius: 15px; } border-top-left-radius: 15px; }
/* line 153, admin-theme/_admin-date-range-picker.sass */ /* line 159, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.start-selected-compare:not(.old):not(.new):not(.end-selected-compare).range { #datepicker .datepicker td.start-selected-compare:not(.old):not(.new):not(.end-selected-compare).range {
background-color: #ba924c; } background-color: #ba924c;
/* line 155, admin-theme/_admin-date-range-picker.sass */ border-bottom-left-radius: 0;
border-top-left-radius: 0; }
/* line 162, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.end-selected-compare:not(.old):not(.new):not(.start-selected-compare) { #datepicker .datepicker td.end-selected-compare:not(.old):not(.new):not(.start-selected-compare) {
color: white; color: white;
font-weight: 700; font-weight: 700;
background-color: #ff8000; background-color: #ff8000;
border-bottom-right-radius: 15px; border-bottom-right-radius: 15px;
border-top-right-radius: 15px; } border-top-right-radius: 15px; }
/* line 161, admin-theme/_admin-date-range-picker.sass */ /* line 168, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.end-selected-compare:not(.old):not(.new):not(.start-selected-compare).range { #datepicker .datepicker td.end-selected-compare:not(.old):not(.new):not(.start-selected-compare).range {
background-color: #ba924c; } background-color: #ba924c;
/* line 163, admin-theme/_admin-date-range-picker.sass */ border-bottom-right-radius: 0;
border-top-right-radius: 0; }
/* line 171, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.end-selected.start-selected { #datepicker .datepicker td.end-selected.start-selected {
color: white; color: white;
-webkit-border-radius: 15px; -webkit-border-radius: 15px;
@@ -9076,7 +9098,7 @@ textarea {
border-radius: 15px; border-radius: 15px;
font-weight: 700; font-weight: 700;
background-color: #00a4e7; } background-color: #00a4e7; }
/* line 168, admin-theme/_admin-date-range-picker.sass */ /* line 176, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.end-selected-compare.start-selected-compare { #datepicker .datepicker td.end-selected-compare.start-selected-compare {
color: white; color: white;
-webkit-border-radius: 15px; -webkit-border-radius: 15px;
@@ -9086,24 +9108,24 @@ textarea {
border-radius: 15px; border-radius: 15px;
font-weight: 700; font-weight: 700;
background-color: #ff8000; } background-color: #ff8000; }
/* line 175, admin-theme/_admin-date-range-picker.sass */ /* line 183, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.range { #datepicker .datepicker td.range {
color: #cef1ff; color: #cef1ff;
background-color: #1bbdff; } background-color: #1bbdff; }
/* line 178, admin-theme/_admin-date-range-picker.sass */ /* line 186, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.range.range-compare { #datepicker .datepicker td.range.range-compare {
background-color: #8dab99; } background-color: #8dab99; }
/* line 180, admin-theme/_admin-date-range-picker.sass */ /* line 188, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.range-compare { #datepicker .datepicker td.range-compare {
color: #fff2e5; color: #fff2e5;
background-color: #ff9933; } background-color: #ff9933; }
/* line 183, admin-theme/_admin-date-range-picker.sass */ /* line 191, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.range-compare.range { #datepicker .datepicker td.range-compare.range {
background-color: #8dab99; } background-color: #8dab99; }
/* line 185, admin-theme/_admin-date-range-picker.sass */ /* line 193, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td.today { #datepicker .datepicker td.today {
background-color: white; } background-color: white; }
/* line 187, admin-theme/_admin-date-range-picker.sass */ /* line 195, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td span { #datepicker .datepicker td span {
padding: 0; padding: 0;
display: block; display: block;
@@ -9114,31 +9136,31 @@ textarea {
float: left; float: left;
text-transform: uppercase; text-transform: uppercase;
cursor: pointer; } cursor: pointer; }
/* line 197, admin-theme/_admin-date-range-picker.sass */ /* line 205, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td span:hover { #datepicker .datepicker td span:hover {
background-color: #00a4e7; } background-color: #00a4e7; }
/* line 199, admin-theme/_admin-date-range-picker.sass */ /* line 207, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td span.active { #datepicker .datepicker td span.active {
background-color: #00a4e7; background-color: #00a4e7;
color: white; } color: white; }
/* line 202, admin-theme/_admin-date-range-picker.sass */ /* line 210, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker td span.old { #datepicker .datepicker td span.old {
color: #cccccc; } color: #cccccc; }
/* line 205, admin-theme/_admin-date-range-picker.sass */ /* line 213, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker th.switch { #datepicker .datepicker th.switch {
width: 145px; } width: 145px; }
/* line 207, admin-theme/_admin-date-range-picker.sass */ /* line 215, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker th.next, #datepicker .datepicker th.prev { #datepicker .datepicker th.next, #datepicker .datepicker th.prev {
font-size: 1.3em; } font-size: 1.3em; }
/* line 209, admin-theme/_admin-date-range-picker.sass */ /* line 217, admin-theme/_admin-date-range-picker.sass */
#datepicker .datepicker thead tr:first-child th { #datepicker .datepicker thead tr:first-child th {
cursor: pointer; } cursor: pointer; }
/* line 212, admin-theme/_admin-date-range-picker.sass */ /* line 220, admin-theme/_admin-date-range-picker.sass */
.chevron-left, .chevron-right { .chevron-left, .chevron-right {
position: relative; } position: relative; }
/* line 214, admin-theme/_admin-date-range-picker.sass */ /* line 222, 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: "";
@@ -9147,7 +9169,7 @@ textarea {
border-style: solid; border-style: solid;
position: absolute; } position: absolute; }
/* line 221, admin-theme/_admin-date-range-picker.sass */ /* line 229, admin-theme/_admin-date-range-picker.sass */
.chevron-left:before { .chevron-left:before {
right: 0; right: 0;
top: 0; top: 0;
@@ -9155,7 +9177,7 @@ textarea {
border-color: transparent transparent transparent #00a4e7; border-color: transparent transparent transparent #00a4e7;
background-color: #1bbdff; } background-color: #1bbdff; }
/* line 227, admin-theme/_admin-date-range-picker.sass */ /* line 235, admin-theme/_admin-date-range-picker.sass */
.chevron-right:before { .chevron-right:before {
left: 0; left: 0;
top: 0; top: 0;
@@ -9163,7 +9185,7 @@ textarea {
border-color: transparent transparent transparent #1bbdff; border-color: transparent transparent transparent #1bbdff;
background-color: #00a4e7; } background-color: #00a4e7; }
/* line 233, admin-theme/_admin-date-range-picker.sass */ /* line 241, 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;
@@ -9172,21 +9194,21 @@ textarea {
animation: one 0.2s ease-in-out; } animation: one 0.2s ease-in-out; }
@-webkit-keyframes one { @-webkit-keyframes one {
/* line 241, admin-theme/_admin-date-range-picker.sass */ /* line 249, admin-theme/_admin-date-range-picker.sass */
0% { 0% {
background-color: #00a4e7; } background-color: #00a4e7; }
/* line 243, admin-theme/_admin-date-range-picker.sass */ /* line 251, admin-theme/_admin-date-range-picker.sass */
100% { 100% {
background-color: white; } } background-color: white; } }
@-webkit-keyframes two { @-webkit-keyframes two {
/* line 247, admin-theme/_admin-date-range-picker.sass */ /* line 255, 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 249, admin-theme/_admin-date-range-picker.sass */ /* line 257, 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
+8
View File
@@ -132,8 +132,11 @@ $color-calendar-range-compare: lighten($color-calendar-compare,10%)
//@extend .chevron-left //@extend .chevron-left
&.range-compare &.range-compare
background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%) background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%)
+border-left-radius(0)
&.end-selected-compare, &.start-selected-compare &.end-selected-compare, &.start-selected-compare
background-color: mix($color-calendar-day-selected,$color-calendar-day-selected-compare,70%) background-color: mix($color-calendar-day-selected,$color-calendar-day-selected-compare,70%)
&.end-selected-compare
+border-radius(0)
&.end-selected:not(.old):not(.new):not(.start-selected) &.end-selected:not(.old):not(.new):not(.start-selected)
color: $color-bright color: $color-bright
font-weight: 700 font-weight: 700
@@ -142,8 +145,11 @@ $color-calendar-range-compare: lighten($color-calendar-compare,10%)
+border-right-radius(15px) +border-right-radius(15px)
&.range-compare &.range-compare
background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%) background-color: mix($color-calendar-day-selected,$color-calendar-range-compare,70%)
+border-right-radius(0)
&.end-selected-compare, &.start-selected-compare &.end-selected-compare, &.start-selected-compare
background-color: mix($color-calendar-day-selected,$color-calendar-day-selected-compare,70%) background-color: mix($color-calendar-day-selected,$color-calendar-day-selected-compare,70%)
&.start-selected-compare
+border-radius(0)
&.start-selected-compare:not(.old):not(.new):not(.end-selected-compare) &.start-selected-compare:not(.old):not(.new):not(.end-selected-compare)
color: $color-bright color: $color-bright
font-weight: 700 font-weight: 700
@@ -152,6 +158,7 @@ $color-calendar-range-compare: lighten($color-calendar-compare,10%)
//@extend .chevron-left //@extend .chevron-left
&.range &.range
background-color: mix($color-calendar-day-selected-compare,$color-calendar-range,70%) background-color: mix($color-calendar-day-selected-compare,$color-calendar-range,70%)
+border-left-radius(0)
&.end-selected-compare:not(.old):not(.new):not(.start-selected-compare) &.end-selected-compare:not(.old):not(.new):not(.start-selected-compare)
color: $color-bright color: $color-bright
font-weight: 700 font-weight: 700
@@ -160,6 +167,7 @@ $color-calendar-range-compare: lighten($color-calendar-compare,10%)
+border-right-radius(15px) +border-right-radius(15px)
&.range &.range
background-color: mix($color-calendar-day-selected-compare,$color-calendar-range,70%) background-color: mix($color-calendar-day-selected-compare,$color-calendar-range,70%)
+border-right-radius(0)
&.end-selected.start-selected &.end-selected.start-selected
color: $color-bright color: $color-bright
+border-radius(15px) +border-radius(15px)