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

//added bootstrap in BO

Browse Source
This commit is contained in:
Vincent Augagneur
2013-06-13 16:35:14 +02:00
parent be0d6f1c6c
commit 518998ded2
4 changed files with 6264 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/header.tpl
+1 -1
View File
@@ -96,7 +96,7 @@
</style> </style>
{/if} {/if}
</head> </head>
<body style="{if isset($bo_color) && $bo_color}background:{$bo_color};{/if}{if isset($bo_width) && $bo_width > 0}text-align:center;{/if}"> <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">
{if $display_header} {if $display_header}
<div id="ajax_running"><img src="../img/admin/ajax-loader-yellow.gif" alt="" /> {l s='Loading...'}</div> <div id="ajax_running"><img src="../img/admin/ajax-loader-yellow.gif" alt="" /> {l s='Loading...'}</div>
<div id="top_container" {if $bo_width > 0}style="margin:auto;width:{$bo_width}px"{/if}> <div id="top_container" {if $bo_width > 0}style="margin:auto;width:{$bo_width}px"{/if}>
classes/controller/AdminController.php
+2
View File
@@ -1705,6 +1705,8 @@ class AdminControllerCore extends Controller
public function setMedia() public function setMedia()
{ {
$this->addCSS(_PS_CSS_DIR_.'bootstrap.css', 'all');
$this->addCSS(_PS_CSS_DIR_.'bootstrap_admin_reset.css', 'all');
$this->addCSS(_PS_CSS_DIR_.'admin.css', 'all'); $this->addCSS(_PS_CSS_DIR_.'admin.css', 'all');
$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_); $admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
$admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath); $admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath);
css/bootstrap.css
Vendored
+6167
View File
File diff suppressed because it is too large Load Diff
css/bootstrap_admin_reset.css
Vendored
+94
View File
@@ -0,0 +1,94 @@
.no_bootstrap {
line-height:normal;
font-size:12px;
font-family:Arial,Verdana,Helvetica,sans-serif;
}
.no_bootstrap a {
line-height:normal;
}
.no_bootstrap .categorieList a {
line-height:20px;
}
.no_bootstrap p {
line-height:normal;
}
.no_bootstrap legend {
font-size:13px;
line-height:20px;
width:auto!important;
}
.no_bootstrap label {
font-size:13px;
display:inline;
line-height:normal;
}
.no_bootstrap .breadcrumb {
padding:0;
}
.no_bootstrap li {
line-height:normal;
}
.no_bootstrap select,.no_bootstrap textarea,input {
height:auto!important;
font-size:12px!important;
line-height:normal;
margin-bottom:auto;
-webkit-border-radius:0!important;
-moz-border-radius:0!important;
border-radius:0!important;
font-family:Arial,Verdana,Helvetica,sans-serif;
margin-bottom:0!important;
width:auto;
}
.no_bootstrap label,input,button,select,textarea {
font-size:12px;
line-height:13px;
}
.no_bootstrap input[type="radio"],.no_bootstrap input[type="checkbox"] {
margin:0;
}
.no_bootstrap input[type="text"] {
height:14px!important;
}
.no_bootstrap .table {
margin:0;
padding:0;
width:auto;
}
.no_bootstrap table.widthfull {
width:100%;
}
.no_bootstrap table {
border-collapse:separate!important;
}
.no_bootstrap .table thead th {
vertical-align:top;
}
.no_bootstrap .table th,.no_bootstrap .table td {
line-height:normal;
vertical-align:middle;
border-top:none;
}
.no_bootstrap #header #header_search #bo_search_submit {
height:25px!important;
}
.no_bootstrap [class^="icon-"], .no_bootstrap [class*=" icon-"] { width: auto}