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;} .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*/
.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 { 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; } background-color: #d7e9f2; }
.page-sidebar > ul > li > a { .page-sidebar > ul > li > a {
text-transform: uppercase; text-transform: uppercase;
font-size: 13px; font-size: 12px;
color: #777777; color: #777777;
display: block; display: block;
padding: 8px 0 8px 15px; padding: 8px 0 8px 15px;
@@ -5671,8 +5671,9 @@ body.fixed-top {
padding: 0; padding: 0;
border-bottom: 1px solid #cccccc; } border-bottom: 1px solid #cccccc; }
.page-sidebar > ul > li ul li a { .page-sidebar > ul > li ul li a {
font-size: 12px;
display: block; display: block;
padding: 5px 0 5px 40px; padding: 3px 0 3px 40px;
border: none; border: none;
border-bottom: 1px solid #f6f6f6; } border-bottom: 1px solid #f6f6f6; }
.page-sidebar > ul li:not(.active) ul { .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 top: 42px
margin-bottom: 42px margin-bottom: 42px
.page-sidebar .page-sidebar
position: fixed position: fixed
top: 82px top: 82px
width: 225px width: 225px
@@ -24,7 +24,7 @@ body.fixed-top
> a > a
text-transform: uppercase text-transform: uppercase
font-size: 13px font-size: 12px
color: #777 color: #777
display: block display: block
padding: 8px 0 8px 15px padding: 8px 0 8px 15px
@@ -39,8 +39,9 @@ body.fixed-top
border-bottom: 1px solid #ccc border-bottom: 1px solid #ccc
li li
a a
font-size: 12px
display: block display: block
padding: 5px 0 5px 40px padding: 3px 0 3px 40px
border: none border: none
border-bottom: 1px solid #F6F6F6 border-bottom: 1px solid #F6F6F6
li:not(.active) ul li:not(.active) ul
admin-dev/themes/default/template/header.tpl
+1 -1
View File
@@ -98,7 +98,7 @@
{/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}" class="no_bootstrap fixed-top"> <body class="fixed-top">
{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>
admin-dev/themes/default/template/layout.tpl
+3
View File
@@ -91,5 +91,8 @@
{/if} {/if}
</div> </div>
{/if} {/if}
<div {if !$bootstrap} id="nobootstrap" {/if}>
{$page} {$page}
</div>
{include file='footer.tpl'} {include file='footer.tpl'}
classes/controller/AdminController.php
+8 -5
View File
@@ -39,6 +39,7 @@ class AdminControllerCore extends Controller
public $allow_employee_form_lang; public $allow_employee_form_lang;
public $layout = 'layout.tpl'; public $layout = 'layout.tpl';
public $bootstrap = false ;
protected $meta_title; protected $meta_title;
@@ -1397,7 +1398,8 @@ class AdminControllerCore extends Controller
'install_dir_exists' => file_exists(_PS_ADMIN_DIR_.'/../install'), 'install_dir_exists' => file_exists(_PS_ADMIN_DIR_.'/../install'),
'pic_dir' => _THEME_PROD_PIC_DIR_, 'pic_dir' => _THEME_PROD_PIC_DIR_,
'controller_name' => htmlentities(Tools::getValue('controller')), 'controller_name' => htmlentities(Tools::getValue('controller')),
'currentIndex' => self::$currentIndex 'currentIndex' => self::$currentIndex,
'bootstrap' => $this->bootstrap,
)); ));
} }
@@ -1705,13 +1707,14 @@ 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');
$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);
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/ps-admin-bootstrap.css', 'all'); $this->addCSS(_PS_CSS_DIR_.'admin.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/admin.css', 'all'); $this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/admin.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/ps-admin-bootstrap.css', 'all');
// Reset bootstrap style for the #nobootstrap field - Backward compatibility
$this->addCSS(_PS_CSS_DIR_.'bootstrap_admin_reset.css', 'all');
if ($this->context->language->is_rtl) if ($this->context->language->is_rtl)
$this->addCSS(_THEME_CSS_DIR_.'rtl.css'); $this->addCSS(_THEME_CSS_DIR_.'rtl.css');
controllers/admin/AdminCartRulesController.php
+1
View File
@@ -28,6 +28,7 @@ class AdminCartRulesControllerCore extends AdminController
{ {
public function __construct() public function __construct()
{ {
$this->bootstrap = true;
$this->table = 'cart_rule'; $this->table = 'cart_rule';
$this->className = 'CartRule'; $this->className = 'CartRule';
$this->lang = true; $this->lang = true;
css/admin.css
+1770
View File
File diff suppressed because it is too large Load Diff
css/admin.scss
+2378
View File
File diff suppressed because it is too large Load Diff
css/bootsrap_admin_reset.css
-94
View File
@@ -1,94 +0,0 @@
.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}
css/bootstrap.css
Vendored
-6167
View File
File diff suppressed because it is too large Load Diff
css/bootstrap_admin_reset.css
Vendored
+27 -25
View File
@@ -1,42 +1,36 @@
.no_bootstrap { #nobootstrap a {
line-height:normal;
font-size:12px;
font-family:Arial,Verdana,Helvetica,sans-serif;
}
.no_bootstrap a {
line-height:normal; line-height:normal;
} }
.no_bootstrap .categorieList a { #nobootstrap .categorieList a {
line-height:20px; line-height:20px;
} }
.no_bootstrap p { #nobootstrap p {
line-height:normal; line-height:normal;
} }
.no_bootstrap legend { #nobootstrap legend {
font-size:13px; font-size:13px;
line-height:20px; line-height:20px;
width:auto!important; width:auto!important;
} }
.no_bootstrap label { #nobootstrap label {
font-size:13px; font-size:13px;
display:inline; display:inline;
line-height:normal; line-height:normal;
} }
.no_bootstrap .breadcrumb { #nobootstrap .breadcrumb {
padding:0; padding:0;
} }
.no_bootstrap li { #nobootstrap li {
line-height:normal; line-height:normal;
} }
.no_bootstrap select,.no_bootstrap textarea,input { #nobootstrap select,#nobootstrap textarea,input {
height:auto!important; height:auto!important;
font-size:12px!important; font-size:12px!important;
line-height:normal; line-height:normal;
@@ -49,46 +43,54 @@
width:auto; width:auto;
} }
.no_bootstrap label,input,button,select,textarea { #nobootstrap label,input,button,select,textarea {
font-size:12px; font-size:12px;
line-height:13px; line-height:13px;
} }
.no_bootstrap input[type="radio"],.no_bootstrap input[type="checkbox"] { #nobootstrap input[type="radio"],#nobootstrap input[type="checkbox"] {
margin:0; margin:0;
} }
.no_bootstrap input[type="text"] { #nobootstrap input[type="text"] {
height:14px!important; height:14px!important;
} }
.no_bootstrap .table { #nobootstrap table.table {
margin:0; margin:0;
padding:0; padding:0;
width:auto; width:100%;
border: solid 1px black;
} }
.no_bootstrap table.widthfull { #nobootstrap table.table-bordered {
border: none;
}
#nobootstrap table.table-stripped {
border: none;
}
#nobootstrap table.widthfull {
width:100%; width:100%;
} }
.no_bootstrap table { #nobootstrap table {
border-collapse:separate!important; border-collapse:separate!important;
} }
.no_bootstrap .table thead th { #nobootstrap .table thead th {
vertical-align:top; vertical-align:top;
} }
.no_bootstrap .table th,.no_bootstrap .table td { #nobootstrap .table th,#nobootstrap .table td {
line-height:normal; line-height:normal;
vertical-align:middle; vertical-align:middle;
border-top:none; border-top:none;
} }
.no_bootstrap #header #header_search #bo_search_submit { #nobootstrap #header #header_search #bo_search_submit {
height:25px!important; height:25px!important;
} }
.no_bootstrap [class^="icon-"], .no_bootstrap [class*=" icon-"] { width: auto} #nobootstrap [class^="icon-"], #nobootstrap [class*=" icon-"] { width: auto}