diff options
| author | Cesar G <prototech91@gmail.com> | 2014-09-23 12:48:23 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-09-23 12:48:23 -0700 |
| commit | 2478eef55023e6fd1f00a3a134049e49a44115f1 (patch) | |
| tree | cac1e42208f8bd8c86007a95d61c538abc722cd3 | |
| parent | 7307380091749ae5e94d5e3d47937c74ed60c3cf (diff) | |
| parent | 9f981a774149499b2a8e42421a861781bd1b5dc7 (diff) | |
| download | forums-2478eef55023e6fd1f00a3a134049e49a44115f1.tar forums-2478eef55023e6fd1f00a3a134049e49a44115f1.tar.gz forums-2478eef55023e6fd1f00a3a134049e49a44115f1.tar.bz2 forums-2478eef55023e6fd1f00a3a134049e49a44115f1.tar.xz forums-2478eef55023e6fd1f00a3a134049e49a44115f1.zip | |
Merge remote-tracking branch 'Senky/ticket/13082' into develop-ascraeus
* Senky/ticket/13082:
[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 |
2 files changed, 10 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 { |