From 7d717ea207d13c867a14b3d9f758c0260e944ca9 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Thu, 10 Oct 2013 16:29:40 +0200 Subject: [PATCH] // fix css + kpi + dashboard --- admin-dev/themes/default/css/admin-theme.css | 271 ++++++++---------- admin-dev/themes/default/css/admin-theme.sass | 22 -- .../css/admin-theme/_admin-commons.sass | 11 + .../css/admin-theme/_admin-dashboard.sass | 21 +- .../default/css/admin-theme/_admin-nav.sass | 10 +- .../css/admin-theme/_admin-tables.sass | 2 +- .../default/template/helpers/kpi/kpi.tpl | 2 +- .../default/template/helpers/kpi/row.tpl | 2 + .../templates/hook/dashboard_zone_two.tpl | 19 +- 9 files changed, 156 insertions(+), 204 deletions(-) diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index f4bc086ee..b0c889c38 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -7647,33 +7647,9 @@ html, body { width: 100%; } } /* line 84, admin-theme.sass */ -.navbar-inner { - box-shadow: none !important; } -/* line 86, admin-theme.sass */ -.navbar-inner .input-append { - margin-bottom: 0; } - -/* line 89, admin-theme.sass */ -.breadcrumb { - background-color: white; } - -/* line 92, admin-theme.sass */ #nobootstrap { float: left; } -/* line 104, admin-theme.sass */ -.nav-tabs { - border-bottom: none; } -/* line 106, admin-theme.sass */ -.nav-tabs li a { - font-size: 1.1em; - font-family: "Ubuntu", sans-serif; - text-transform: uppercase; - font-weight: 300; } -/* line 112, admin-theme.sass */ -.nav-tabs li.active a, .nav-tabs li.active a:hover { - background-color: white; } - /* line 1, admin-theme/_admin-header.sass */ #header_infos { background-color: #242424; } @@ -7865,40 +7841,40 @@ a.link-social:hover { #nav-sidebar ul.menu li.maintab { position: relative; } /* line 32, admin-theme/_admin-nav.sass */ -#nav-sidebar ul.menu li.maintab.active a.title { +#nav-sidebar ul.menu li.maintab.active a.title, #nav-sidebar ul.menu li.maintab.active a.title:hover { color: white; background-color: #1ba6e5; } /* line 35, admin-theme/_admin-nav.sass */ -#nav-sidebar ul.menu li.maintab.active a.title i { +#nav-sidebar ul.menu li.maintab.active a.title i, #nav-sidebar ul.menu li.maintab.active a.title:hover i { color: black; background-color: white; } -/* line 39, admin-theme/_admin-nav.sass */ -#nav-sidebar ul.menu li.maintab.active a.title:hover:not(.active) { +/* line 40, admin-theme/_admin-nav.sass */ +#nav-sidebar ul.menu li.maintab.active a.title:hover { color: white; } -/* line 42, admin-theme/_admin-nav.sass */ +/* line 43, admin-theme/_admin-nav.sass */ #nav-sidebar ul.menu li.maintab.expanded a.title { color: white; background-color: #3a3d45; border-bottom: solid 1px #17181c; } -/* line 46, admin-theme/_admin-nav.sass */ -#nav-sidebar ul.menu li.maintab.expanded a.title i { - color: white; } -/* line 48, admin-theme/_admin-nav.sass */ +/* line 47, admin-theme/_admin-nav.sass */ #nav-sidebar ul.menu li.maintab.expanded a.title:hover { background-color: #686d7d; } -/* line 52, admin-theme/_admin-nav.sass */ +/* line 49, admin-theme/_admin-nav.sass */ +#nav-sidebar ul.menu li.maintab.expanded a.title i { + color: white; } +/* line 53, admin-theme/_admin-nav.sass */ #nav-sidebar ul.menu li.maintab.expanded ul.submenu { display: block; } -/* line 54, admin-theme/_admin-nav.sass */ +/* line 55, admin-theme/_admin-nav.sass */ #nav-sidebar ul.menu li.maintab.expanded ul.submenu a { color: #9da1ae; background-color: #2e3037; border-bottom: solid 1px #17181c; } -/* line 58, admin-theme/_admin-nav.sass */ +/* line 59, admin-theme/_admin-nav.sass */ #nav-sidebar ul.menu li.maintab.expanded ul.submenu a:hover { color: white; background-color: #454953; } -/* line 61, admin-theme/_admin-nav.sass */ +/* line 62, admin-theme/_admin-nav.sass */ #nav-sidebar ul.menu li.maintab a.title { display: block; position: relative; @@ -7920,7 +7896,7 @@ a.link-social:hover { -moz-transition-timing-function: ease-out; -o-transition-timing-function: ease-out; transition-timing-function: ease-out; } -/* line 76, admin-theme/_admin-nav.sass */ +/* line 77, admin-theme/_admin-nav.sass */ #nav-sidebar ul.menu li.maintab a.title i { color: #9094a2; background-color: #17181c; @@ -7934,14 +7910,14 @@ a.link-social:hover { -moz-transition-timing-function: ease-out; -o-transition-timing-function: ease-out; transition-timing-function: ease-out; } -/* line 82, admin-theme/_admin-nav.sass */ +/* line 83, admin-theme/_admin-nav.sass */ #nav-sidebar ul.menu li.maintab a.title:hover { background-color: #686d7d; color: white; } -/* line 85, admin-theme/_admin-nav.sass */ +/* line 86, admin-theme/_admin-nav.sass */ #nav-sidebar ul.menu li.maintab a.title:hover i { color: white; } -/* line 87, admin-theme/_admin-nav.sass */ +/* line 88, admin-theme/_admin-nav.sass */ #nav-sidebar ul.menu li.maintab span.submenu_expand { position: absolute; right: 10px; @@ -7953,15 +7929,15 @@ a.link-social:hover { color: black; background-color: transparent; text-shadow: #686d7d 1px 1px 0; } -/* line 100, admin-theme/_admin-nav.sass */ +/* line 101, admin-theme/_admin-nav.sass */ #nav-sidebar ul.menu li.maintab span.submenu_expand:hover { color: white; text-shadow: #232429 -1px -1px 0; } -/* line 103, admin-theme/_admin-nav.sass */ +/* line 104, admin-theme/_admin-nav.sass */ #nav-sidebar ul.submenu { list-style: none; padding: 0; } -/* line 107, admin-theme/_admin-nav.sass */ +/* line 108, admin-theme/_admin-nav.sass */ #nav-sidebar ul.submenu li a { display: block; padding: 4px 5px 4px 10px; @@ -7969,15 +7945,15 @@ a.link-social:hover { border: none; border-bottom: solid 1px #eeeeee; background-color: white; } -/* line 114, admin-theme/_admin-nav.sass */ +/* line 115, admin-theme/_admin-nav.sass */ #nav-sidebar ul.submenu li a:hover { color: #515561; background-color: #edeeef; text-decoration: none; } -/* line 118, admin-theme/_admin-nav.sass */ +/* line 119, admin-theme/_admin-nav.sass */ #nav-sidebar ul.submenu li:last-child a { border-bottom: none; } -/* line 120, admin-theme/_admin-nav.sass */ +/* line 121, admin-theme/_admin-nav.sass */ #nav-sidebar ul.submenu li.active a { color: white; background-color: #1ba6e5; @@ -7987,7 +7963,7 @@ a.link-social:hover { #nav-sidebar { display: none; } } -/* line 127, admin-theme/_admin-nav.sass */ +/* line 128, admin-theme/_admin-nav.sass */ #nav-topbar { position: fixed; height: 28px; @@ -7996,14 +7972,14 @@ a.link-social:hover { width: 100%; z-index: 600; background-color: white; } -/* line 135, admin-theme/_admin-nav.sass */ +/* line 136, admin-theme/_admin-nav.sass */ #nav-topbar ul.menu { height: 28px; margin: 0; padding: 0; display: block; list-style: none; } -/* line 141, admin-theme/_admin-nav.sass */ +/* line 142, admin-theme/_admin-nav.sass */ #nav-topbar ul.menu > li { height: 28px; padding: 0; @@ -8012,46 +7988,46 @@ a.link-social:hover { list-style: none; position: relative; float: left; } -/* line 149, admin-theme/_admin-nav.sass */ +/* line 150, admin-theme/_admin-nav.sass */ #nav-topbar ul.menu > li > a { display: block; line-height: 28px; color: #515561; padding: 0 6px; margin: 0; } -/* line 155, admin-theme/_admin-nav.sass */ +/* line 156, admin-theme/_admin-nav.sass */ #nav-topbar ul.menu > li > a i { margin: 0; width: 15px; background-color: transparent; font-size: 18px; } -/* line 160, admin-theme/_admin-nav.sass */ +/* line 161, admin-theme/_admin-nav.sass */ #nav-topbar ul.menu > li > a:hover { text-decoration: none; background-color: #515561; color: white; } -/* line 164, admin-theme/_admin-nav.sass */ +/* line 165, admin-theme/_admin-nav.sass */ #nav-topbar ul.menu > li > a:hover i { color: white !important; } -/* line 167, admin-theme/_admin-nav.sass */ +/* line 168, admin-theme/_admin-nav.sass */ #nav-topbar ul.menu > li.active > a { color: white; background-color: #515561; } -/* line 170, admin-theme/_admin-nav.sass */ +/* line 171, admin-theme/_admin-nav.sass */ #nav-topbar ul.menu > li.active > a i { color: white; } -/* line 172, admin-theme/_admin-nav.sass */ +/* line 173, admin-theme/_admin-nav.sass */ #nav-topbar .menu-collapse { display: none; } -/* line 174, admin-theme/_admin-nav.sass */ +/* line 175, admin-theme/_admin-nav.sass */ #nav-topbar ul.submenu { display: none !important; -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 2px 4px; box-shadow: rgba(0, 0, 0, 0.3) 0 2px 4px; } -/* line 178, admin-theme/_admin-nav.sass */ +/* line 179, admin-theme/_admin-nav.sass */ #nav-topbar > ul.menu > li.expanded ul.submenu { display: block !important; } -/* line 181, admin-theme/_admin-nav.sass */ +/* line 182, admin-theme/_admin-nav.sass */ #nav-topbar > ul.menu > li ul.submenu { display: none !important; position: absolute; @@ -8060,33 +8036,33 @@ a.link-social:hover { left: 0; top: 28px; width: 200px !important; } -/* line 189, admin-theme/_admin-nav.sass */ +/* line 190, admin-theme/_admin-nav.sass */ #nav-topbar > ul.menu > li ul.submenu li { width: 200px; padding: 0; list-style: none; } -/* line 193, admin-theme/_admin-nav.sass */ +/* line 194, admin-theme/_admin-nav.sass */ #nav-topbar > ul.menu > li ul.submenu li a { display: block; padding: 4px 5px 4px 10px; font-size: 12px; background-color: white; border-bottom: solid 1px #eeeeee; } -/* line 199, admin-theme/_admin-nav.sass */ +/* line 200, admin-theme/_admin-nav.sass */ #nav-topbar > ul.menu > li ul.submenu li a:hover { color: #515561; background-color: #edeeef; text-decoration: none; } -/* line 203, admin-theme/_admin-nav.sass */ +/* line 204, admin-theme/_admin-nav.sass */ #nav-topbar > ul.menu > li ul.submenu li:last-child a { border-bottom: none; } -/* line 205, admin-theme/_admin-nav.sass */ +/* line 206, admin-theme/_admin-nav.sass */ #nav-topbar > ul.menu > li ul.submenu li.active a { color: white; background-color: #1ba6e5; border-bottom: solid 1px #1585b8; } -/* line 210, admin-theme/_admin-nav.sass */ +/* line 211, admin-theme/_admin-nav.sass */ .menu-collapse { height: 54px; width: 100%; @@ -8098,24 +8074,24 @@ a.link-social:hover { border-bottom: 3px solid #3a3d45; color: #0b0c0e; } -/* line 222, admin-theme/_admin-nav.sass */ +/* line 223, admin-theme/_admin-nav.sass */ .page-topbar #main { padding-top: 64px; } -/* line 224, admin-theme/_admin-nav.sass */ +/* line 225, admin-theme/_admin-nav.sass */ .page-topbar #nav-sidebar { display: none; } -/* line 226, admin-theme/_admin-nav.sass */ +/* line 227, admin-theme/_admin-nav.sass */ .page-topbar .page-head { top: 63px; } -/* line 228, admin-theme/_admin-nav.sass */ +/* line 229, admin-theme/_admin-nav.sass */ .page-topbar #content { margin-left: 0; width: 100%; } -/* line 231, admin-theme/_admin-nav.sass */ +/* line 232, admin-theme/_admin-nav.sass */ .page-topbar #content .page-head h2.page-title { padding: 0 0 0 20px; } -/* line 235, admin-theme/_admin-nav.sass */ +/* line 236, admin-theme/_admin-nav.sass */ .page-sidebar-closed #nav-sidebar { width: 50px; -webkit-transition-property: width; @@ -8128,10 +8104,10 @@ a.link-social:hover { -moz-transition-timing-function: ease-out; -o-transition-timing-function: ease-out; transition-timing-function: ease-out; } -/* line 240, admin-theme/_admin-nav.sass */ +/* line 241, admin-theme/_admin-nav.sass */ .page-sidebar-closed #nav-sidebar span.title { display: none; } -/* line 242, admin-theme/_admin-nav.sass */ +/* line 243, admin-theme/_admin-nav.sass */ .page-sidebar-closed #nav-sidebar ul.submenu { display: none !important; padding-top: 37px; @@ -8139,35 +8115,35 @@ a.link-social:hover { top: 0; -webkit-box-shadow: rgba(0, 0, 0, 0.2) 1px 1px 0, rgba(0, 0, 0, 0.3) 2px 2px 4px; box-shadow: rgba(0, 0, 0, 0.2) 1px 1px 0, rgba(0, 0, 0, 0.3) 2px 2px 4px; } -/* line 248, admin-theme/_admin-nav.sass */ +/* line 249, admin-theme/_admin-nav.sass */ .page-sidebar-closed #nav-sidebar > ul > li:hover { width: 250px !important; position: relative; } -/* line 251, admin-theme/_admin-nav.sass */ +/* line 252, admin-theme/_admin-nav.sass */ .page-sidebar-closed #nav-sidebar > ul > li:hover span.title { display: inline-block; } -/* line 253, admin-theme/_admin-nav.sass */ +/* line 254, admin-theme/_admin-nav.sass */ .page-sidebar-closed #nav-sidebar > ul > li:hover ul.submenu { display: block !important; position: absolute; left: 50px; width: 200px !important; } -/* line 258, admin-theme/_admin-nav.sass */ +/* line 259, admin-theme/_admin-nav.sass */ .page-sidebar-closed #content { margin-left: 50px; } -/* line 260, admin-theme/_admin-nav.sass */ +/* line 261, admin-theme/_admin-nav.sass */ .page-sidebar-closed #content .page-head h2.page-title { padding: 0 0 0 70px; } @media (max-width: 768px) { - /* line 260, admin-theme/_admin-nav.sass */ + /* line 261, admin-theme/_admin-nav.sass */ .page-sidebar-closed #content .page-head h2.page-title { padding: 0 0 0 20px; } } @media (max-width: 768px) { - /* line 258, admin-theme/_admin-nav.sass */ + /* line 259, admin-theme/_admin-nav.sass */ .page-sidebar-closed #content { margin-left: 0; width: 100%; } } -/* line 267, admin-theme/_admin-nav.sass */ +/* line 268, admin-theme/_admin-nav.sass */ .page-sidebar-closed .submenu_expand { display: none; } @@ -8222,6 +8198,19 @@ textarea { #header_notifs_icon_wrapper .badge-error.notifs_badge, .badge-error.badge { background-color: #d9534f; } +/* line 34, admin-theme/_admin-commons.sass */ +.nav-tabs { + border-bottom: none; } +/* line 36, admin-theme/_admin-commons.sass */ +.nav-tabs li a { + font-size: 1.1em; + font-family: "Ubuntu", sans-serif; + text-transform: uppercase; + font-weight: 300; } +/* line 42, admin-theme/_admin-commons.sass */ +.nav-tabs li.active a, .nav-tabs li.active a:hover { + background-color: white; } + /* line 1, admin-theme/_admin-tables.sass */ .table { border-collapse: separate; @@ -8297,7 +8286,7 @@ td.actions { /* line 59, admin-theme/_admin-tables.sass */ .bulk-actions { - margin: 17px 0; } + margin: 17px 0 0 0; } /* line 1, admin-theme/_admin-tree.sass */ .tree { @@ -9226,70 +9215,74 @@ li.sortable-placeholder { font-family: FontAwesome; content: "\f0aa"; } -/* line 36, admin-theme/_admin-dashboard.sass */ +/* line 34, admin-theme/_admin-dashboard.sass */ +.box-stats { + height: 70px; } + +/* line 39, admin-theme/_admin-dashboard.sass */ #dashboard section header { padding: 3px 8px; margin: 0 0 3px 0; color: white; font-size: 1.2em; background-color: #1ba6e5; } -/* line 42, admin-theme/_admin-dashboard.sass */ +/* line 45, admin-theme/_admin-dashboard.sass */ #dashboard section header.panel-heading, #dashboard section #header_notifs_icon_wrapper .notifs_panel header.notifs_panel_header, #header_notifs_icon_wrapper .notifs_panel #dashboard section header.notifs_panel_header { color: #555555; } -/* line 45, admin-theme/_admin-dashboard.sass */ +/* line 48, admin-theme/_admin-dashboard.sass */ #dashboard .data_list { margin: 0 0 10px 0; padding: 0; } -/* line 49, admin-theme/_admin-dashboard.sass */ +/* line 52, admin-theme/_admin-dashboard.sass */ #dashboard .data_list li { position: relative; } -/* line 54, admin-theme/_admin-dashboard.sass */ +/* line 57, admin-theme/_admin-dashboard.sass */ #dashboard .data_list .data_value { line-height: 39px; position: absolute; top: 0; right: 0; padding: 0 10px 0 0; } -/* line 61, admin-theme/_admin-dashboard.sass */ +/* line 64, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_small { margin: 8px 0 10px 0; padding: 0 0 0 0; border-top: solid 1px #dddddd; } -/* line 65, admin-theme/_admin-dashboard.sass */ +/* line 68, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_small li { padding: 3px 0; position: relative; border: none; margin: 0; border-bottom: dashed 1px #dddddd; } -/* line 71, admin-theme/_admin-dashboard.sass */ +/* line 74, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_small .data_label { text-transform: uppercase; color: #bbbbbb; } -/* line 74, admin-theme/_admin-dashboard.sass */ +/* line 77, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_small .data_value { line-height: 25px; position: absolute; top: 0; right: 0; padding: 0; } -/* line 81, admin-theme/_admin-dashboard.sass */ +/* line 84, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_large { margin: 8px 0 10px 0; padding: 0; } -/* line 85, admin-theme/_admin-dashboard.sass */ +/* line 88, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_large li { padding: 6px 0; position: relative; border: none; margin: 0; } -/* line 90, admin-theme/_admin-dashboard.sass */ +/* line 93, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_large .data_label { line-height: 0.8em; } -/* line 92, admin-theme/_admin-dashboard.sass */ +/* line 95, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_large .data_label small { font-size: 0.6em; } -/* line 94, admin-theme/_admin-dashboard.sass */ +/* line 97, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_large .data_value { text-align: right; line-height: 0.6em; @@ -9297,10 +9290,10 @@ li.sortable-placeholder { top: 0; right: 0; padding: 8px 0 0 0; } -/* line 101, admin-theme/_admin-dashboard.sass */ +/* line 104, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_large .data_value small { font-size: 0.5em; } -/* line 104, admin-theme/_admin-dashboard.sass */ +/* line 107, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_vertical { padding: 0; margin: 0 0 10px 0; @@ -9310,30 +9303,30 @@ li.sortable-placeholder { -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; } -/* line 111, admin-theme/_admin-dashboard.sass */ +/* line 114, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_vertical li { border-left: solid 1px #dddddd; padding: 6px; } -/* line 115, admin-theme/_admin-dashboard.sass */ +/* line 118, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_vertical li:first-child { border: none; } -/* line 117, admin-theme/_admin-dashboard.sass */ +/* line 120, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_vertical .data_label { min-height: 32px; display: block; line-height: 1em; text-align: center; } -/* line 122, admin-theme/_admin-dashboard.sass */ +/* line 125, admin-theme/_admin-dashboard.sass */ #dashboard .data_list_vertical .data_value { display: block; text-align: center; } -/* line 127, admin-theme/_admin-dashboard.sass */ +/* line 130, admin-theme/_admin-dashboard.sass */ #dashboard #dashtrends header { margin-bottom: 0; } -/* line 129, admin-theme/_admin-dashboard.sass */ +/* line 132, admin-theme/_admin-dashboard.sass */ #dashboard #dashtrends #dashtrends_toolbar { margin: 4px -16px; } -/* line 131, admin-theme/_admin-dashboard.sass */ +/* line 134, admin-theme/_admin-dashboard.sass */ #dashboard #dashtrends dl { margin: 0; min-height: 120px; @@ -9342,64 +9335,42 @@ li.sortable-placeholder { padding: 10px; border-left: 1px solid #dddddd; border-bottom: 1px solid #dddddd; } -/* line 139, admin-theme/_admin-dashboard.sass */ +/* line 142, admin-theme/_admin-dashboard.sass */ #dashboard #dashtrends dl:first-child { border-left: none; } -/* line 141, admin-theme/_admin-dashboard.sass */ +/* line 144, admin-theme/_admin-dashboard.sass */ #dashboard #dashtrends dl.active { background-color: #eeeeee; } -/* line 143, admin-theme/_admin-dashboard.sass */ +/* line 146, admin-theme/_admin-dashboard.sass */ #dashboard #dashtrends dt { text-align: center; height: 37px; line-height: 1em; font: 300 1.1em/120% "Ubuntu", sans-serif; } -/* line 148, admin-theme/_admin-dashboard.sass */ +/* line 151, admin-theme/_admin-dashboard.sass */ #dashboard #dashtrends svg { height: 350px; } -/* line 152, admin-theme/_admin-dashboard.sass */ -#dashboard #dashproducts header { - margin-bottom: 0; } -/* line 154, admin-theme/_admin-dashboard.sass */ -#dashboard #dashproducts nav { - border-bottom: solid 1px #dddddd; - margin: 0 -11px; } -/* line 157, admin-theme/_admin-dashboard.sass */ -#dashboard #dashproducts nav ul { - margin: 0 -5px; - padding: 0; - text-decoration: none; - background-color: white; } -/* line 162, admin-theme/_admin-dashboard.sass */ -#dashboard #dashproducts nav ul li { - float: left; } -/* line 164, admin-theme/_admin-dashboard.sass */ -#dashboard #dashproducts nav ul li.active { - background-color: #1ba6e5; } -/* line 166, admin-theme/_admin-dashboard.sass */ -#dashboard #dashproducts nav ul li.active a { - color: white; } -/* line 169, admin-theme/_admin-dashboard.sass */ +/* line 158, admin-theme/_admin-dashboard.sass */ #dashboard #dashactivity svg { height: 150px; } -/* line 176, admin-theme/_admin-dashboard.sass */ +/* line 165, admin-theme/_admin-dashboard.sass */ #dashboard .loading .data_value { min-width: 30px; text-align: center; } -/* line 179, admin-theme/_admin-dashboard.sass */ +/* line 168, admin-theme/_admin-dashboard.sass */ #dashboard .loading .data_value:before { font-size: 0.7em; font-family: FontAwesome; content: "\f021"; color: #cccccc; } -/* line 185, admin-theme/_admin-dashboard.sass */ +/* line 174, admin-theme/_admin-dashboard.sass */ #dashboard .loading .data_value span, #dashboard .loading .data_value small { display: none; } -/* line 187, admin-theme/_admin-dashboard.sass */ +/* line 176, admin-theme/_admin-dashboard.sass */ #dashboard .loading .data_trend { display: none; } -/* line 212, admin-theme/_admin-dashboard.sass */ +/* line 201, admin-theme/_admin-dashboard.sass */ .data_loading, #dashboard .data_value span, #dashboard .data_value .dash_trend { opacity: 1; -webkit-animation-name: bounceG; @@ -9413,7 +9384,7 @@ li.sortable-placeholder { transform: scale(0.7); } @-webkit-keyframes bounceG { - /* line 220, admin-theme/_admin-dashboard.sass */ + /* line 209, admin-theme/_admin-dashboard.sass */ 0% { opacity: 0; filter: alpha(opacity=0); @@ -9421,7 +9392,7 @@ li.sortable-placeholder { -ms-transform: scale(0.1); transform: scale(0.1); } - /* line 223, admin-theme/_admin-dashboard.sass */ + /* line 212, admin-theme/_admin-dashboard.sass */ 100% { opacity: 1; filter: alpha(opacity=100); @@ -9430,7 +9401,7 @@ li.sortable-placeholder { transform: scale(1); } } @-moz-keyframes bounceG { - /* line 220, admin-theme/_admin-dashboard.sass */ + /* line 209, admin-theme/_admin-dashboard.sass */ 0% { opacity: 0; filter: alpha(opacity=0); @@ -9438,7 +9409,7 @@ li.sortable-placeholder { -ms-transform: scale(0.1); transform: scale(0.1); } - /* line 223, admin-theme/_admin-dashboard.sass */ + /* line 212, admin-theme/_admin-dashboard.sass */ 100% { opacity: 1; filter: alpha(opacity=100); @@ -9447,7 +9418,7 @@ li.sortable-placeholder { transform: scale(1); } } @-ms-keyframes bounceG { - /* line 220, admin-theme/_admin-dashboard.sass */ + /* line 209, admin-theme/_admin-dashboard.sass */ 0% { opacity: 0; filter: alpha(opacity=0); @@ -9455,7 +9426,7 @@ li.sortable-placeholder { -ms-transform: scale(0.1); transform: scale(0.1); } - /* line 223, admin-theme/_admin-dashboard.sass */ + /* line 212, admin-theme/_admin-dashboard.sass */ 100% { opacity: 1; filter: alpha(opacity=100); @@ -9464,7 +9435,7 @@ li.sortable-placeholder { transform: scale(1); } } @-o-keyframes bounceG { - /* line 220, admin-theme/_admin-dashboard.sass */ + /* line 209, admin-theme/_admin-dashboard.sass */ 0% { opacity: 0; filter: alpha(opacity=0); @@ -9472,7 +9443,7 @@ li.sortable-placeholder { -ms-transform: scale(0.1); transform: scale(0.1); } - /* line 223, admin-theme/_admin-dashboard.sass */ + /* line 212, admin-theme/_admin-dashboard.sass */ 100% { opacity: 1; filter: alpha(opacity=100); @@ -9481,7 +9452,7 @@ li.sortable-placeholder { transform: scale(1); } } @keyframes bounceG { - /* line 220, admin-theme/_admin-dashboard.sass */ + /* line 209, admin-theme/_admin-dashboard.sass */ 0% { opacity: 0; filter: alpha(opacity=0); @@ -9489,7 +9460,7 @@ li.sortable-placeholder { -ms-transform: scale(0.1); transform: scale(0.1); } - /* line 223, admin-theme/_admin-dashboard.sass */ + /* line 212, admin-theme/_admin-dashboard.sass */ 100% { opacity: 1; filter: alpha(opacity=100); @@ -9497,11 +9468,11 @@ li.sortable-placeholder { -ms-transform: scale(1); transform: scale(1); } } -/* line 227, admin-theme/_admin-dashboard.sass */ +/* line 216, admin-theme/_admin-dashboard.sass */ #dash_version { padding: 0 !important; overflow: hidden; } -/* line 231, admin-theme/_admin-dashboard.sass */ +/* line 220, admin-theme/_admin-dashboard.sass */ #dash_version iframe { height: 140px; width: 100%; } diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index e714dd05c..1a8cfdf33 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -81,37 +81,15 @@ html, body margin-left: 0 width: 100% -.navbar-inner - box-shadow: none!important - .input-append - margin-bottom: 0 - -.breadcrumb - background-color: lighten($bg-content-color,7%) - #nobootstrap float: left -//WIP (refacto, keep it simple, order ...) - //todo: remove temp fix for bootstrap RC1 -> final input[type="text"],input[type="search"],input[type="password"], textarea, select @extend .form-control fieldset > .row @extend .form-group -//tabs -.nav-tabs - border-bottom: none - li a - font-size: 1.1em - font-family: $headings-font-family - text-transform: uppercase - font-weight: 300 - li.active - a, a:hover - background-color: white - //components @import "admin-theme/admin-header" @import "admin-theme/admin-footer" diff --git a/admin-dev/themes/default/css/admin-theme/_admin-commons.sass b/admin-dev/themes/default/css/admin-theme/_admin-commons.sass index 19553905c..9d1c5c0bb 100644 --- a/admin-dev/themes/default/css/admin-theme/_admin-commons.sass +++ b/admin-dev/themes/default/css/admin-theme/_admin-commons.sass @@ -30,3 +30,14 @@ textarea @extend .badge background-color: $brand-danger +//tabs +.nav-tabs + border-bottom: none + li a + font-size: 1.1em + font-family: $headings-font-family + text-transform: uppercase + font-weight: 300 + li.active + a, a:hover + background-color: white \ No newline at end of file diff --git a/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass b/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass index 27262b34a..fee163c52 100644 --- a/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass +++ b/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass @@ -31,6 +31,9 @@ font-family: FontAwesome content: "\f0aa" +.box-stats + height: 70px + #dashboard section header @@ -149,22 +152,8 @@ height: 350px #dashproducts - header - margin-bottom: 0 - nav - border-bottom: solid 1px #ddd - margin: 0 -11px - ul - margin: 0 -5px - padding: 0 - text-decoration: none - background-color: white - li - float: left - li.active - background-color: $brand-primary - a - color: white + + #dashactivity svg height: 150px diff --git a/admin-dev/themes/default/css/admin-theme/_admin-nav.sass b/admin-dev/themes/default/css/admin-theme/_admin-nav.sass index b6e85b695..9afd24888 100644 --- a/admin-dev/themes/default/css/admin-theme/_admin-nav.sass +++ b/admin-dev/themes/default/css/admin-theme/_admin-nav.sass @@ -29,24 +29,25 @@ li.maintab position: relative &.active - a.title + a.title, a.title:hover color: contrast-color($brand-primary, white, #333, 10%) background-color: $brand-primary i color: black background-color: white + &.active - a.title:hover:not(.active) + a.title:hover color: contrast-color($main-color, white, #333, 10%) &.expanded a.title color: white background-color: darken($main-color,10%) border-bottom: solid 1px darken($main-color,25%) - i - color: white &:hover background-color: lighten($main-color,10%) + i + color: white span.submenu_expand @extend .icon-angle-up ul.submenu @@ -268,7 +269,6 @@ display: none //icons - .icon-AdminDashboard @extend .icon-dashboard .icon-AdminCatalog diff --git a/admin-dev/themes/default/css/admin-theme/_admin-tables.sass b/admin-dev/themes/default/css/admin-theme/_admin-tables.sass index edce65f39..c7150ae64 100644 --- a/admin-dev/themes/default/css/admin-theme/_admin-tables.sass +++ b/admin-dev/themes/default/css/admin-theme/_admin-tables.sass @@ -57,4 +57,4 @@ td.actions min-width: 200px .bulk-actions - margin: 17px 0 \ No newline at end of file + margin: 17px 0 0 0 \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/kpi/kpi.tpl b/admin-dev/themes/default/template/helpers/kpi/kpi.tpl index f94973ab3..a8f09a94b 100644 --- a/admin-dev/themes/default/template/helpers/kpi/kpi.tpl +++ b/admin-dev/themes/default/template/helpers/kpi/kpi.tpl @@ -22,7 +22,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -<{if $href}a style="display:block" href="{$href|escape}"{else}div{/if} id="{$id|escape}" class="col-lg-3 box-stats {$color|escape}" > +<{if $href}a style="display:block" href="{$href|escape}"{else}div{/if} id="{$id|escape}" class="box-stats {$color|escape}" > {if $icon}{/if} {if $chart}
diff --git a/admin-dev/themes/default/template/helpers/kpi/row.tpl b/admin-dev/themes/default/template/helpers/kpi/row.tpl index cb33a4afe..6cfe8035d 100644 --- a/admin-dev/themes/default/template/helpers/kpi/row.tpl +++ b/admin-dev/themes/default/template/helpers/kpi/row.tpl @@ -25,7 +25,9 @@
{foreach $kpis as $kpi} +
{$kpi} +
{/foreach}
\ No newline at end of file diff --git a/modules/dashproducts/views/templates/hook/dashboard_zone_two.tpl b/modules/dashproducts/views/templates/hook/dashboard_zone_two.tpl index 5af2871a2..027133d6f 100644 --- a/modules/dashproducts/views/templates/hook/dashboard_zone_two.tpl +++ b/modules/dashproducts/views/templates/hook/dashboard_zone_two.tpl @@ -24,7 +24,8 @@ *}
-
+ +
{l s='Product and Sales'} @@ -37,7 +38,7 @@
-
-
-

{l s="Last 10 orders:"}

+
+
+

{l s="Last 10 orders:"}

@@ -62,7 +63,7 @@
-

{l s="Top 5 products:"}

+

{l s="Top 5 products:"}

@@ -71,7 +72,7 @@
-

{l s="Coming soon"}

+

{l s="Coming soon"}

@@ -82,7 +83,7 @@
@@ -91,7 +92,7 @@
-

{l s="Coming soon"}

+

{l s="Coming soon"}