Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12889] Fix multiple select lists
  [ticket/13082] Repair fix
  [ticket/13082] Join classes
  [ticket/13082] move style to css file
  [ticket/13082] Replace float by text-align
This commit is contained in:
Cesar G 2014-09-23 12:49:28 -07:00
commit b57f050d8e
3 changed files with 14 additions and 1 deletions

View file

@ -8,7 +8,7 @@
<form id="list" method="post" action="{U_ACTION}"> <form id="list" method="post" action="{U_ACTION}">
<fieldset class="display-options" style="float: left"> <fieldset class="display-options search-box">
{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> {L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</fieldset> </fieldset>

View file

@ -109,6 +109,14 @@ hr {
text-align: center; text-align: center;
} }
.search-box {
float: left;
}
.rtl .search-box {
float: right;
}
.small { .small {
font-size: 0.85em; font-size: 0.85em;
} }
@ -1773,6 +1781,7 @@ li.pagination ul {
margin: 10px 0; margin: 10px 0;
color: #FFFFFF; color: #FFFFFF;
text-align: center; text-align: center;
clear: both;
} }
.success { .success {

View file

@ -129,6 +129,10 @@ dd select {
width: auto; width: auto;
} }
dd select[multiple] {
width: 100%;
}
dd textarea { dd textarea {
width: 85%; width: 85%;
} }