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:
Kevin Granger
2013-10-21 19:00:18 +02:00
parent c89f6c1adb f336cc599b
commit fadbc4c250
32 changed files with 87 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+30 -23
View File
@@ -10286,34 +10286,41 @@ li.sortable-placeholder {
height: 350px; }
/* line 162, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons {
padding: 20px 20px 0 20px; }
/* line 163, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons header a {
background-color: white;
border: 1px dashed #dfdfdf;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
padding: 10px 20px; }
/* line 166, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons a {
display: block; }
/* line 165, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons header a:hover {
/* line 168, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons a:hover {
text-decoration: none; }
/* line 170, admin-theme/_admin-dashboard.sass */
/* line 173, admin-theme/_admin-dashboard.sass */
#dashboard #dashactivity svg {
height: 150px; }
/* line 177, admin-theme/_admin-dashboard.sass */
/* line 180, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value {
min-width: 30px;
text-align: center; }
/* line 180, admin-theme/_admin-dashboard.sass */
/* line 183, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value:before {
font-size: 0.7em;
font-family: FontAwesome;
content: "\f021";
color: #cccccc; }
/* line 186, admin-theme/_admin-dashboard.sass */
/* line 189, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value span, #dashboard .loading .data_value small {
display: none; }
/* line 188, admin-theme/_admin-dashboard.sass */
/* line 191, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_trend {
display: none; }
/* line 213, admin-theme/_admin-dashboard.sass */
/* line 216, admin-theme/_admin-dashboard.sass */
.data_loading, #dashboard .data_value span, #dashboard .data_value .dash_trend {
opacity: 1;
-webkit-animation-name: bounceG;
@@ -10327,7 +10334,7 @@ li.sortable-placeholder {
transform: scale(0.7); }
@-webkit-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */
/* line 224, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10335,7 +10342,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */
/* line 227, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10344,7 +10351,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@-moz-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */
/* line 224, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10352,7 +10359,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */
/* line 227, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10361,7 +10368,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@-ms-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */
/* line 224, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10369,7 +10376,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */
/* line 227, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10378,7 +10385,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@-o-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */
/* line 224, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10386,7 +10393,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */
/* line 227, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10395,7 +10402,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */
/* line 224, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10403,7 +10410,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */
/* line 227, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10411,11 +10418,11 @@ li.sortable-placeholder {
-ms-transform: scale(1);
transform: scale(1); } }
/* line 228, admin-theme/_admin-dashboard.sass */
/* line 231, admin-theme/_admin-dashboard.sass */
#dash_version {
padding: 0 !important;
overflow: hidden; }
/* line 232, admin-theme/_admin-dashboard.sass */
/* line 235, admin-theme/_admin-dashboard.sass */
#dash_version iframe {
height: 80px;
width: 100%; }