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-23 16:49:05 +02:00
parent a27f8bc999 466699edcb
commit 16dfea95e3
9 changed files with 215 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+24 -21
View File
@@ -10317,7 +10317,10 @@ li.sortable-placeholder {
/* line 158, admin-theme/_admin-dashboard.sass */
#dashboard #dashtrends svg {
height: 350px; }
/* line 163, admin-theme/_admin-dashboard.sass */
/* line 162, admin-theme/_admin-dashboard.sass */
#dashboard #dashgoals svg {
height: 250px; }
/* line 167, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons {
background-color: white;
border: 1px dashed #dfdfdf;
@@ -10327,33 +10330,33 @@ li.sortable-placeholder {
-o-border-radius: 3px;
border-radius: 3px;
padding: 10px 20px; }
/* line 167, admin-theme/_admin-dashboard.sass */
/* line 171, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons a {
display: block; }
/* line 169, admin-theme/_admin-dashboard.sass */
/* line 173, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons a:hover {
text-decoration: none; }
/* line 174, admin-theme/_admin-dashboard.sass */
/* line 178, admin-theme/_admin-dashboard.sass */
#dashboard #dashactivity svg {
height: 150px; }
/* line 181, admin-theme/_admin-dashboard.sass */
/* line 185, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value {
min-width: 30px;
text-align: center; }
/* line 184, admin-theme/_admin-dashboard.sass */
/* line 188, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value:before {
font-size: 0.7em;
font-family: FontAwesome;
content: "\f021";
color: #cccccc; }
/* line 190, admin-theme/_admin-dashboard.sass */
/* line 194, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value span, #dashboard .loading .data_value small {
display: none; }
/* line 192, admin-theme/_admin-dashboard.sass */
/* line 196, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_trend {
display: none; }
/* line 217, admin-theme/_admin-dashboard.sass */
/* line 221, admin-theme/_admin-dashboard.sass */
.data_loading, #dashboard .data_value span, #dashboard .data_value .dash_trend {
opacity: 1;
-webkit-animation-name: bounceG;
@@ -10367,7 +10370,7 @@ li.sortable-placeholder {
transform: scale(0.7); }
@-webkit-keyframes bounceG {
/* line 225, admin-theme/_admin-dashboard.sass */
/* line 229, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10375,7 +10378,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 228, admin-theme/_admin-dashboard.sass */
/* line 232, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10384,7 +10387,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@-moz-keyframes bounceG {
/* line 225, admin-theme/_admin-dashboard.sass */
/* line 229, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10392,7 +10395,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 228, admin-theme/_admin-dashboard.sass */
/* line 232, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10401,7 +10404,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@-ms-keyframes bounceG {
/* line 225, admin-theme/_admin-dashboard.sass */
/* line 229, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10409,7 +10412,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 228, admin-theme/_admin-dashboard.sass */
/* line 232, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10418,7 +10421,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@-o-keyframes bounceG {
/* line 225, admin-theme/_admin-dashboard.sass */
/* line 229, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10426,7 +10429,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 228, admin-theme/_admin-dashboard.sass */
/* line 232, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10435,7 +10438,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@keyframes bounceG {
/* line 225, admin-theme/_admin-dashboard.sass */
/* line 229, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10443,7 +10446,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 228, admin-theme/_admin-dashboard.sass */
/* line 232, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10451,11 +10454,11 @@ li.sortable-placeholder {
-ms-transform: scale(1);
transform: scale(1); } }
/* line 232, admin-theme/_admin-dashboard.sass */
/* line 236, admin-theme/_admin-dashboard.sass */
#dash_version {
padding: 0 !important;
overflow: hidden; }
/* line 236, admin-theme/_admin-dashboard.sass */
/* line 240, admin-theme/_admin-dashboard.sass */
#dash_version iframe {
height: 80px;
width: 100%; }
admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass
+4
View File
@@ -157,6 +157,10 @@
font: 300 1.1em/120% $headings-font-family
svg
height: 350px
#dashgoals
svg
height: 250px
#dashproducts
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+2 -2
View File
@@ -86,7 +86,7 @@
</div>
<div class="col-lg-7" id="hookDashboardZoneTwo">
{$hookDashboardZoneTwo}
<div id="dashaddons" class="widget">
<div id="dashaddons">
<a href="http://addons.prestashop.com/208-dashboards?utm_source=backoffice_dashboard" target="_blank">
<i class="icon-plus"></i> {l s='Add more graph and data'}
</a>
@@ -139,4 +139,4 @@
$('#date-end').focus();
});
});
</script>
</script>