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

// moved admin css and backward compatibility css to admin theme css directory

Browse Source
This commit is contained in:
Kevin Granger
2013-11-04 19:48:53 +01:00
parent 569455a7ff
commit fbc93e5632
11 changed files with 810 additions and 5564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/header.inc.php
-1
View File
@@ -37,7 +37,6 @@ echo '
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="robots" content="NOFOLLOW, NOINDEX" />
<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/ui/themes/base/jquery.ui.datepicker.css" />
<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin.css" />
<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/cluetip/jquery.cluetip.css" />
<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/backward/admin.css" />
<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.css" />
admin-dev/themes/default/css/backward/admin.css
+1 -1
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/css/backward/admin.scss
+750 -657
View File
File diff suppressed because it is too large Load Diff
admin-dev/themes/default/css/backward/bootstrap_admin_reset.css
Vendored
+49
View File
@@ -0,0 +1,49 @@
#nobootstrap a {
line-height: normal; }
#nobootstrap .categorieList a {
line-height: 20px; }
#nobootstrap p {
line-height: normal; }
#nobootstrap legend {
font-size: 13px;
line-height: 20px;
width: auto !important; }
#nobootstrap label {
font-size: 13px;
display: inline;
line-height: normal; }
#nobootstrap .breadcrumb {
padding: 0; }
#nobootstrap select, #nobootstrap textarea, #nobootstrap input {
height: auto !important;
font-size: 12px !important;
line-height: normal;
margin-bottom: auto;
font-family: Arial, Verdana, Helvetica, sans-serif;
margin-bottom: 0 !important;
width: auto; }
#nobootstrap label, #nobootstrap input, #nobootstrap button, #nobootstrap select, #nobootstrap textarea {
font-size: 12px;
line-height: 13px; }
#nobootstrap input[type="radio"], #nobootstrap input[type="checkbox"] {
margin: 0; }
#nobootstrap input[type="text"] {
height: 14px !important; }
#nobootstrap table.table {
margin: 0;
padding: 0;
width: 100%;
border-collapse: collapse; }
#nobootstrap table.widthfull {
width: 100%; }
#nobootstrap .table th, #nobootstrap .table td {
line-height: normal;
vertical-align: middle;
border-top: none; }
#nobootstrap #header #header_search #bo_search_submit {
height: 25px !important; }
#nobootstrap [class^="icon-"], #nobootstrap [class*=" icon-"] {
width: auto; }
#nobootstrap .toolbarBox [class^="process-icon-"], #nobootstrap .toolbarBox [class*=" process-icon-"] {
text-indent: -9000px;
overflow: hidden; }
css/bootstrap_admin_reset.sass → admin-dev/themes/default/css/backward/bootstrap_admin_reset.sass
+1 -1
View File
@@ -14,7 +14,7 @@
display: inline
line-height: normal
.breadcrumb
padding:0
padding: 0
li
line-height:normal
select, textarea, input
admin-dev/themes/default/css/backward/modules.css
-75
View File
@@ -1,75 +0,0 @@
.path_bar {display:none;}
/*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;}
.toolbarBox .pageTitle { margin-left:10px; line-height:48px}
.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: bold; line-height: 48px; margin: 0; padding: 0}
.toolbarBox ul.cc_button {float:right;margin:0;padding:0}
.toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center}
.toolbarBox a.toolbar_btn { border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 1px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff}
.toolbarBox a.toolbar_btn:hover {}
.toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px}
.toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png')}
.toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png')}
.toolbarBox .process-icon-preview { background-image: url('../img/process-icon-preview.png')}
.toolbarBox .process-icon-stats { background-image: url('../img/process-icon-stats.png')}
.toolbarBox .process-icon-cancel { background-image: url('../img/process-icon-cancel.png')}
.toolbarBox .process-icon-new, .toolbarBox .process-icon-newAttributes{ background-image: url('../img/process-icon-new.png')}
.toolbarBox .process-icon-save, .toolbarBox .process-icon-save-settings { background-image: url('../img/process-icon-save.png')}
.toolbarBox .process-icon-save-and-stay { background-image: url('../img/process-icon-save-and-stay.png')}
.toolbarBox .process-icon-edit { background-image: url('../img/process-icon-edit.png')}
.toolbarBox .process-icon-back { background-image: url('../img/process-icon-back.png')}
.toolbarBox .process-icon-refresh-index { background-image: url('../img/process-icon-refresh-index.png')}
.toolbarBox .process-icon-refresh-cache { background-image: url('../img/process-icon-refresh-cache.png')}
.toolbarBox .process-icon-save-calendar { background-image: url('../img/process-icon-save-calendar.png')}
.toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png')}
.toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png')}
div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1}
/*FILTER MODULE*/
.filter-module { background-color:#ebedf4; border:1px solid #c2c4d9; padding:10px; display:block; min-height:35px;}
.filter-module #filternameForm {float:left; margin-right:30px;}
.filter-module label {width:auto;}
.filter-module .select-filter { float:left;}
.filter-module .button-filter { float:right;}
/*SIDEBAR*/
.sidebar { position:relative; float:left; width:220px; display:inline;}
.sidebar h3 { background-color:#ebedf4; font-weight:bold; display:block; padding:5px;}
.sidebar .subHeadline { font-weight:bold; float:right; margin-top:-28px; margin-right:5px;}
.sidebar ul.categorieList {}
.sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;}
.sidebar ul.categorieList li:first-child { border-top:none;}
.sidebar ul.categorieList li a {color:#3a6ea7;}
.sidebar ul.categorieList li div.categorieWidth { text-indent:5px; overflow:hidden;}
.sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
/*MODULECONTAINER*/
#moduleContainer { margin-left:220px; padding:13px 0 0 20px;}
#moduleContainer .table tr th { height:40px;}
#moduleContainer .table tr td { font-size:12px; vertical-align:top; padding: 5px 7px 0; border-top:1px solid #ccc; border-bottom:none;}
#moduleContainer .table tr:first-child {border-top:1px solid #ccc}
#moduleContainer .table tr:hover { background-color:#FFF1B5;}
#moduleContainer .moduleDesc { font-size:12px; position:relative; margin-bottom:10px;}
#moduleContainer .moduleDesc h3 { color:#3A6EA7; margin:0;}
#moduleContainer .moduleDesc .metadata { float:left; display:block; margin:5px 0;}
#moduleContainer .moduleDesc .metadata dl { float:left; margin:0; padding-right:10px;}
#moduleContainer .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;}
#moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;}
#moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
#moduleContainer .moduleDesc p.desc { color:#666; font-size:12px; display:block; clear:both;}
#moduleContainer .setup {background-color:#6db300; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;}
#moduleContainer .setup.non-install { border: solid 1px #ec7000; background-color: #ffedb1; color: #ec7000}
#moduleContainer .setup.must-have { background-color: #ec7000;}
#moduleContainer .setup.off{ background-color:#ccc;}
#moduleContainer .row-actions-module span { padding-right:5px;}
#moduleContainer .row-actions-module span a { font-size:12px;}
#moduleContainer .button.uninstalled,
#moduleContainer .button.installed { float:right; display: inline-block; margin-top:15px; font-size:12px;}
#moduleContainer .button.updated { margin-top:15px; display: inline-block; font-size:12px;}
#list-action-button{width:175px}
#list-action-button li{margin-left:10px;display: inline;float: left;}
#moduleContainer .moduleName {font-size:12px; color:#3A6EA7;font-weight:bold;}
#moduleContainer .moduleFavDesc { font-family:Georgia; font-style:italic; color:#666;}
classes/controller/AdminController.php
+8 -10
View File
@@ -1923,18 +1923,16 @@ class AdminControllerCore extends Controller
$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
$admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath);
// Deprecated stylesheets
if (!$this->bootstrap)
{
$this->addCSS(_PS_CSS_DIR_.'admin.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward/admin.css', 'all');
}
//Bootstrap v3.00 + Specific Admin Theme
//Bootstrap v3.01 + Specific Admin Theme
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/admin-theme.css', 'all');
// Reset bootstrap style for the #nobootstrap field - Backward compatibility
$this->addCSS(_PS_CSS_DIR_.'bootstrap_admin_reset.css', 'all');
// Deprecated stylesheets + reset bootstrap style for the #nobootstrap field - Backward compatibility
if (!$this->bootstrap)
{
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward/admin.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward/bootstrap_admin_reset.css', 'all');
}
if ($this->context->language->is_rtl)
$this->addCSS(_THEME_CSS_DIR_.'rtl.css');
controllers/admin/AdminEmployeesController.php
+1 -1
View File
@@ -115,7 +115,7 @@ class AdminEmployeesControllerCore extends AdminController
$path = _PS_ADMIN_DIR_.'/themes/';
foreach (scandir($path) as $theme)
if ($theme[0] != '.' && is_dir($path.$theme) && (file_exists($path.$theme.'/css/admin.css') || file_exists($path.$theme.'/css/admin-theme.css')))
if ($theme[0] != '.' && is_dir($path.$theme) && (file_exists($path.$theme.'/css/admin-theme.css')))
$this->themes[] = $theme;
$home_tab = Tab::getInstanceFromClassName('AdminDashboard', $this->context->language->id);
css/admin.css
-2060
View File
File diff suppressed because it is too large Load Diff
css/admin.scss
-2672
View File
File diff suppressed because it is too large Load Diff
css/bootstrap_admin_reset.css
Vendored
-86
View File
@@ -1,86 +0,0 @@
#nobootstrap a {
line-height:normal;
}
#nobootstrap .categorieList a {
line-height:20px;
}
#nobootstrap p {
line-height:normal;
}
#nobootstrap legend {
font-size:13px;
line-height:20px;
width:auto!important;
}
#nobootstrap label {
font-size:13px;
display:inline;
line-height:normal;
}
#nobootstrap .breadcrumb {
padding:0;
}
#nobootstrap li {
line-height:normal;
}
#nobootstrap select,#nobootstrap textarea, #nobootstrap input {
height:auto!important;
font-size:12px!important;
line-height:normal;
margin-bottom:auto;
font-family:Arial,Verdana,Helvetica,sans-serif;
margin-bottom:0!important;
width:auto;
}
#nobootstrap label, #nobootstrap input, #nobootstrap button, #nobootstrap select, #nobootstrap textarea {
font-size:12px;
line-height:13px;
}
#nobootstrap input[type="radio"],#nobootstrap input[type="checkbox"] {
margin:0;
}
#nobootstrap input[type="text"] {
height:14px!important;
}
#nobootstrap table.table {
margin:0;
padding:0;
width:100%;
border-collapse: collapse;
}
#nobootstrap table.widthfull {
width:100%;
}
#nobootstrap .table thead th {
vertical-align:top;
}
#nobootstrap .table th,#nobootstrap .table td {
line-height:normal;
vertical-align:middle;
border-top:none;
}
#nobootstrap #header #header_search #bo_search_submit {
height:25px!important;
}
#nobootstrap [class^="icon-"], #nobootstrap [class*=" icon-"] { width: auto}
#nobootstrap .toolbarBox [class^="process-icon-"], #nobootstrap .toolbarBox [class*=" process-icon-"] {
text-indent: -9000px;
overflow: hidden
}