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

// backward CSS

Browse Source
This commit is contained in:
Kevin Granger
2013-11-05 16:40:21 +01:00
parent eb383e580e
commit 533ebc0f6d
7 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+1 -1
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/css/backward-admin-bootstrap-reset.css
+1 -1
View File
@@ -1 +1 @@
#nobootstrap *,#nobootstrap *:before,#nobootstrap *:after{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#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}#nobootstrap label{font-size:13px;display:inline;line-height:normal}#nobootstrap fieldset{clear:both}#nobootstrap .breadcrumb{padding:0}#nobootstrap li{line-height:normal}#nobootstrap select,#nobootstrap textarea,#nobootstrap input{height:inherit}#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}
#nobootstrap{width:100%;background-color:#fff;margin:-20px 0 0 -20px;padding:20px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#nobootstrap *,#nobootstrap *:before,#nobootstrap *:after{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#nobootstrap fieldset h1,#nobootstrap fieldset h2,#nobootstrap fieldset h3,#nobootstrap fieldset h4,#nobootstrap fieldset h5,#nobootstrap fieldset h6{margin:0 !important;padding:0 !important;background-color:transparent !important;border:none !important;text-transform:none !important}#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}#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:inherit}#nobootstrap label,#nobootstrap input,#nobootstrap button,#nobootstrap select,#nobootstrap textarea{font-size:12px;line-height:13px;border-radius:none !important}#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 [class^="icon-"],#nobootstrap [class*=" icon-"]{width:auto}#nobootstrap .toolbarBox [class^="process-icon-"],#nobootstrap .toolbarBox [class*=" process-icon-"]{text-indent:-9000px;overflow:hidden}
admin-dev/themes/default/css/backward-admin-old.css
+1 -1
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/scss/admin-theme.sass
+2
View File
@@ -9,6 +9,8 @@ html, body
height: 100%
#main
float: left
width: 100%
min-height: 100%
padding: 36px 0 60px
margin: 0 0 -60px 0
admin-dev/themes/default/scss/backward-admin-bootstrap-reset.sass
+13 -6
View File
@@ -1,7 +1,19 @@
@import compass
#nobootstrap
width: 100%
background-color: white
margin: -20px 0 0 -20px
padding: 20px
@include box-sizing(content-box)
*, *:before, *:after
@include box-sizing(content-box)
fieldset
h1, h2, h3, h4, h5, h6
margin: 0!important
padding: 0!important
background-color: transparent!important
border: none!important
text-transform: none!important
a
line-height: normal
.categorieList a
@@ -16,19 +28,16 @@
font-size: 13px
display: inline
line-height: normal
fieldset
clear: both
.breadcrumb
padding: 0
li
line-height: normal
select, textarea, input
height: inherit
label, input, button, select, textarea
font-size: 12px
line-height: 13px
border-radius: none!important
input[type="radio"], input[type="checkbox"]
margin: 0
@@ -47,8 +56,6 @@
line-height: normal
vertical-align: middle
border-top: none
#header #header_search #bo_search_submit
height: 25px!important
[class^="icon-"], [class*=" icon-"]
width: auto
.toolbarBox [class^="process-icon-"], .toolbarBox [class*=" process-icon-"]
admin-dev/themes/default/scss/backward-admin-old.scss
+1 -6
View File
@@ -8,7 +8,7 @@
ul,ol{list-style:none;margin:0;padding:0}
ul li{color:#585A69}
label{color:#585a69}
fieldset{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;font-size:1.1em;margin:0;padding:1em}
fieldset{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;margin:0;padding:1em}
.Bloc{background:none repeat scroll 0 0 #EBEDF4;background-color:#EBEDF4;border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}
legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}
input[type=text],input[type=password],input[type=file],textarea{background-color:#fff;border:1px solid #ccc}
@@ -342,11 +342,6 @@
a.link,a.link:hover{color:#999}
p{color:#585A69;margin:.5em 0}
hr{border:none;margin-bottom:10px;margin-top:10px;padding:0}
h1{font-size:1.6em;margin:0 0 .67em}
h2{font-size:1.4em}
h3{font-size:1.1em}
h5{font-size:.83em}
h6{font-size:.67em}
.blue{color:#268CCD}
.red{color:red}
form p{margin:.5em 0 0;padding:0 0 .5em}
classes/controller/AdminController.php
+2 -1
View File
@@ -1929,8 +1929,9 @@ class AdminControllerCore extends Controller
// 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-old.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-bootstrap-reset.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-old.css', 'all');
//}
//todo csss for rtl support