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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
This commit is contained in:
Damien Metzger
2013-10-25 15:22:01 +02:00
parent e8d5dc8a62 a49cc68b72
commit aa322e4777
38 changed files with 3854 additions and 222 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/admin-theme.sass
+3 -5
View File
@@ -116,12 +116,10 @@ input[type="text"],input[type="search"],input[type="password"], textarea, select
.panel-footer
margin: 15px -20px -20px
height: 73px
.panel-footer
.btn.pull-right
margin-left: 3px
//todo: fix focus firefox
*:focus
outline: none!important
-moz-outline: none!important
-moz-user-focus: ignore!important
//components
@import "admin-theme/admin-header"