diff options
| author | Cesar G <prototech91@gmail.com> | 2014-09-23 12:49:28 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-09-23 12:49:28 -0700 |
| commit | b57f050d8e95d138a30c66997870778487ee72d9 (patch) | |
| tree | b58da347f619724a4fe4965e189fea2648f38e76 | |
| parent | ead527610602ac2e292b0b46cbe60c9da0cca2f3 (diff) | |
| parent | f2a98339e2707d7c237cc948c94586d6bb88b506 (diff) | |
| download | forums-b57f050d8e95d138a30c66997870778487ee72d9.tar forums-b57f050d8e95d138a30c66997870778487ee72d9.tar.gz forums-b57f050d8e95d138a30c66997870778487ee72d9.tar.bz2 forums-b57f050d8e95d138a30c66997870778487ee72d9.tar.xz forums-b57f050d8e95d138a30c66997870778487ee72d9.zip | |
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
| -rw-r--r-- | phpBB/adm/style/acp_logs.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/admin.css | 9 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/forms.css | 4 |
3 files changed, 14 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 4f67f46e24..76ea801de0 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -8,7 +8,7 @@ <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}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> </fieldset> diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index b83750875a..b03cb0ba24 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -109,6 +109,14 @@ hr { text-align: center; } +.search-box { + float: left; +} + +.rtl .search-box { + float: right; +} + .small { font-size: 0.85em; } @@ -1773,6 +1781,7 @@ li.pagination ul { margin: 10px 0; color: #FFFFFF; text-align: center; + clear: both; } .success { diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 7cc85a7e00..f08a8a9691 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -129,6 +129,10 @@ dd select { width: auto; } +dd select[multiple] { + width: 100%; +} + dd textarea { width: 85%; } |