TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into builder-ui 

Conflicts:
	modules/backend/assets/css/october.css
This commit is contained in:
alekseybobkov 2015-07-08 21:11:08 -07:00
parent aafb6014e1 8b147015ec
commit cf0224c2e8
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/backend/assets/css/october.css
View File

@ -10472,6 +10472,12 @@ body.slim-container .form-buttons {
clear: none;
}
}
.form-group .select2-container {
width: 100%!important;
}
.select2-dropdown {
z-index: 10000;
}
[data-control=toolbar] .form-control {
display: inline-block;
margin-right: 15px;
@ -10500,10 +10506,13 @@ body.slim-container .form-buttons {
display: inline-block;
width: auto;
height: 36px;
margin-right: 15px;
}
[data-control=toolbar] .select2-container .select2-selection {
height: 34px;
line-height: 34px;
[data-control=toolbar] .select2-container .select2-selection__rendered {
line-height: 17px;
}
[data-control=toolbar] .select2-container .select2-selection--single {
height: 36px;
}
[data-control=toolbar] select.form-control.custom-select {
display: none;

22
modules/system/assets/ui/less/form.less
View File

@ -369,6 +369,18 @@ body.slim-container {
}
}
//
// Select2
//
.form-group .select2-container {
width: 100%!important;
}
.select2-dropdown {
z-index: 10000;
}
//
// Controls inside toolbar
//
@ -408,10 +420,14 @@ body.slim-container {
display: inline-block;
width: auto;
height: 36px;
margin-right: 15px;
.select2-selection {
height: 34px;
line-height: 34px;
.select2-selection__rendered {
line-height: 17px;
}
.select2-selection--single {
height: 36px;
}
}