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

// Reset Bootstrap for backward compatibility

Browse Source
This commit is contained in:
Kevin Granger
2013-06-14 19:25:18 +02:00
parent 7a65f478b6
commit 6648fd3e97
14 changed files with 5495 additions and 6307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin.css
+1300
View File
File diff suppressed because it is too large Load Diff
admin-dev/themes/default/css/modules.css
-9
View File
@@ -1,13 +1,4 @@
.path_bar {display:none;}
#notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:90px;}
.notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;}
#orders_notif {background: url('../img/notif_order.png') no-repeat center top;}
#customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
#messages_notif {background: url('../img/notif_message.png') no-repeat center top;}
#orders_notif.open_notifs,
#customers_notif.open_notifs,
#messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; }
/*toolbarBox*/
.toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
admin-dev/themes/default/css/ps-admin-bootstrap.css
+3 -2
View File
@@ -5657,7 +5657,7 @@ body.fixed-top {
background-color: #d7e9f2; }
.page-sidebar > ul > li > a {
text-transform: uppercase;
font-size: 13px;
font-size: 12px;
color: #777777;
display: block;
padding: 8px 0 8px 15px;
@@ -5671,8 +5671,9 @@ body.fixed-top {
padding: 0;
border-bottom: 1px solid #cccccc; }
.page-sidebar > ul > li ul li a {
font-size: 12px;
display: block;
padding: 5px 0 5px 40px;
padding: 3px 0 3px 40px;
border: none;
border-bottom: 1px solid #f6f6f6; }
.page-sidebar > ul li:not(.active) ul {
admin-dev/themes/default/sass/ps-admin-bootstrap-responsive.scss
-1
View File
@@ -1 +0,0 @@
@import "bootstrap/responsive";
admin-dev/themes/default/sass/ps-admin-bootstrap.sass
+4 -3
View File
@@ -5,7 +5,7 @@ body.fixed-top
top: 42px
margin-bottom: 42px
.page-sidebar
.page-sidebar
position: fixed
top: 82px
width: 225px
@@ -24,7 +24,7 @@ body.fixed-top
> a
text-transform: uppercase
font-size: 13px
font-size: 12px
color: #777
display: block
padding: 8px 0 8px 15px
@@ -39,8 +39,9 @@ body.fixed-top
border-bottom: 1px solid #ccc
li
a
font-size: 12px
display: block
padding: 5px 0 5px 40px
padding: 3px 0 3px 40px
border: none
border-bottom: 1px solid #F6F6F6
li:not(.active) ul
admin-dev/themes/default/template/header.tpl
+1 -1
View File
@@ -98,7 +98,7 @@
{/if}
</head>
<body style="{if isset($bo_color) && $bo_color}background:{$bo_color};{/if}{if isset($bo_width) && $bo_width > 0}text-align:center;{/if}" class="no_bootstrap fixed-top">
<body class="fixed-top">
{if $display_header}
<div id="ajax_running"><img src="../img/admin/ajax-loader-yellow.gif" alt="" /> {l s='Loading...'}</div>
admin-dev/themes/default/template/layout.tpl
+3
View File
@@ -91,5 +91,8 @@
{/if}
</div>
{/if}
<div {if !$bootstrap} id="nobootstrap" {/if}>
{$page}
</div>
{include file='footer.tpl'}