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

// Fixed dashboard style

Browse Source
This commit is contained in:
Damien Metzger committed 2013-10-21 18:18:48 +02:00
1 parent 58aa64fab7
commit bf6c57063c
3 files changed
+42 -34
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
+30 -23
View File
@@ -10282,34 +10282,41 @@ li.sortable-placeholder {
height: 350px; } height: 350px; }
/* line 162, admin-theme/_admin-dashboard.sass */ /* line 162, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons { #dashboard #dashaddons {
padding: 20px 20px 0 20px; } background-color: white;
/* line 163, admin-theme/_admin-dashboard.sass */ border: 1px dashed #dfdfdf;
#dashboard #dashaddons header a { -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; } display: block; }
/* line 165, admin-theme/_admin-dashboard.sass */ /* line 168, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons header a:hover { #dashboard #dashaddons a:hover {
text-decoration: none; } text-decoration: none; }
/* line 170, admin-theme/_admin-dashboard.sass */ /* line 173, admin-theme/_admin-dashboard.sass */
#dashboard #dashactivity svg { #dashboard #dashactivity svg {
height: 150px; } height: 150px; }
/* line 177, admin-theme/_admin-dashboard.sass */ /* line 180, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value { #dashboard .loading .data_value {
min-width: 30px; min-width: 30px;
text-align: center; } text-align: center; }
/* line 180, admin-theme/_admin-dashboard.sass */ /* line 183, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value:before { #dashboard .loading .data_value:before {
font-size: 0.7em; font-size: 0.7em;
font-family: FontAwesome; font-family: FontAwesome;
content: "\f021"; content: "\f021";
color: #cccccc; } 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 { #dashboard .loading .data_value span, #dashboard .loading .data_value small {
display: none; } display: none; }
/* line 188, admin-theme/_admin-dashboard.sass */ /* line 191, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_trend { #dashboard .loading .data_trend {
display: none; } 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 { .data_loading, #dashboard .data_value span, #dashboard .data_value .dash_trend {
opacity: 1; opacity: 1;
-webkit-animation-name: bounceG; -webkit-animation-name: bounceG;
@@ -10323,7 +10330,7 @@ li.sortable-placeholder {
transform: scale(0.7); } transform: scale(0.7); }
@-webkit-keyframes bounceG { @-webkit-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */ /* line 224, admin-theme/_admin-dashboard.sass */
0% { 0% {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@@ -10331,7 +10338,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1); -ms-transform: scale(0.1);
transform: scale(0.1); } transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */ /* line 227, admin-theme/_admin-dashboard.sass */
100% { 100% {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
@@ -10340,7 +10347,7 @@ li.sortable-placeholder {
transform: scale(1); } } transform: scale(1); } }
@-moz-keyframes bounceG { @-moz-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */ /* line 224, admin-theme/_admin-dashboard.sass */
0% { 0% {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@@ -10348,7 +10355,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1); -ms-transform: scale(0.1);
transform: scale(0.1); } transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */ /* line 227, admin-theme/_admin-dashboard.sass */
100% { 100% {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
@@ -10357,7 +10364,7 @@ li.sortable-placeholder {
transform: scale(1); } } transform: scale(1); } }
@-ms-keyframes bounceG { @-ms-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */ /* line 224, admin-theme/_admin-dashboard.sass */
0% { 0% {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@@ -10365,7 +10372,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1); -ms-transform: scale(0.1);
transform: scale(0.1); } transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */ /* line 227, admin-theme/_admin-dashboard.sass */
100% { 100% {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
@@ -10374,7 +10381,7 @@ li.sortable-placeholder {
transform: scale(1); } } transform: scale(1); } }
@-o-keyframes bounceG { @-o-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */ /* line 224, admin-theme/_admin-dashboard.sass */
0% { 0% {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@@ -10382,7 +10389,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1); -ms-transform: scale(0.1);
transform: scale(0.1); } transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */ /* line 227, admin-theme/_admin-dashboard.sass */
100% { 100% {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
@@ -10391,7 +10398,7 @@ li.sortable-placeholder {
transform: scale(1); } } transform: scale(1); } }
@keyframes bounceG { @keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */ /* line 224, admin-theme/_admin-dashboard.sass */
0% { 0% {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@@ -10399,7 +10406,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1); -ms-transform: scale(0.1);
transform: scale(0.1); } transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */ /* line 227, admin-theme/_admin-dashboard.sass */
100% { 100% {
opacity: 1; opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
@@ -10407,11 +10414,11 @@ li.sortable-placeholder {
-ms-transform: scale(1); -ms-transform: scale(1);
transform: scale(1); } } transform: scale(1); } }
/* line 228, admin-theme/_admin-dashboard.sass */ /* line 231, admin-theme/_admin-dashboard.sass */
#dash_version { #dash_version {
padding: 0 !important; padding: 0 !important;
overflow: hidden; } overflow: hidden; }
/* line 232, admin-theme/_admin-dashboard.sass */ /* line 235, admin-theme/_admin-dashboard.sass */
#dash_version iframe { #dash_version iframe {
height: 80px; height: 80px;
width: 100%; } width: 100%; }
admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass
+5 -2
View File
@@ -160,11 +160,14 @@
#dashproducts #dashproducts
#dashaddons #dashaddons
header a background-color: white
border: 1px dashed #DFDFDF
@include border-radius(3px)
a
display: block display: block
&:hover &:hover
text-decoration: none text-decoration: none
padding: 20px 20px 0 20px padding: 10px 20px
#dashactivity #dashactivity
svg svg
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+7 -9
View File
@@ -26,9 +26,9 @@
<script> <script>
var dashboard_ajax_url = '{$link->getAdminLink('AdminDashboard')}'; var dashboard_ajax_url = '{$link->getAdminLink('AdminDashboard')}';
var adminstats_ajax_url = '{$link->getAdminLink('AdminStats')}'; var adminstats_ajax_url = '{$link->getAdminLink('AdminStats')}';
var no_results_translation = '{l s='No result'}'; var no_results_translation = '{l s='No result' js='1'}';
var dashboard_use_push = '{$dashboard_use_push|intval}'; var dashboard_use_push = '{$dashboard_use_push|intval}';
var read_more = '{l s='Read more'}' var read_more = '{l s='Read more' js='1'}';
</script> </script>
<div id="dashboard"> <div id="dashboard">
@@ -46,13 +46,11 @@
</div> </div>
<div class="col-lg-7" id="hookDashboardZoneTwo"> <div class="col-lg-7" id="hookDashboardZoneTwo">
{$hookDashboardZoneTwo} {$hookDashboardZoneTwo}
<section id="dashaddons" class="panel widget"> <div id="dashaddons" class="widget">
<header class="panel-heading"> <a href="http://addons.prestashop.com/208-dashboards?utm_source=backoffice_dashboard" target="_blank">
<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'}
<i class="icon-plus"></i> {l s='Add more graph and data'} </a>
</a> </div>
</header>
</section>
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">