diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-04-06 11:08:18 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-04-06 11:08:18 +0200 |
| commit | 0e88f0db4ad728ed071f42301ee7196c8bf1c2ab (patch) | |
| tree | bdbefdf212f86e78df3698b0b0bdfca5c5dc212c | |
| parent | d0aa7c6455170396fd8b6c9add7cf2a19bb17426 (diff) | |
| parent | 8920ca5d438aafcede84b4e96381d93647b2d6cc (diff) | |
| download | forums-0e88f0db4ad728ed071f42301ee7196c8bf1c2ab.tar forums-0e88f0db4ad728ed071f42301ee7196c8bf1c2ab.tar.gz forums-0e88f0db4ad728ed071f42301ee7196c8bf1c2ab.tar.bz2 forums-0e88f0db4ad728ed071f42301ee7196c8bf1c2ab.tar.xz forums-0e88f0db4ad728ed071f42301ee7196c8bf1c2ab.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12359] Remove inline width styling on UCP birthday fields
Conflicts:
phpBB/styles/prosilver/template/ucp_profile_profile_info.html
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_profile_profile_info.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html index b8ba163d3b..c0bf681f47 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html +++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html @@ -14,9 +14,9 @@ <dl> <dt><label for="bday_day">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt> <dd> - <label for="bday_day">{L_DAY}{L_COLON} <select name="bday_day" id="bday_day" style="width: 4em;">{S_BIRTHDAY_DAY_OPTIONS}</select></label> - <label for="bday_month">{L_MONTH}{L_COLON} <select name="bday_month" id="bday_month" style="width: 4em;">{S_BIRTHDAY_MONTH_OPTIONS}</select></label> - <label for="bday_year">{L_YEAR}{L_COLON} <select name="bday_year" id="bday_year" style="width: 6em;">{S_BIRTHDAY_YEAR_OPTIONS}</select></label> + <label for="bday_day">{L_DAY}{L_COLON} <select name="bday_day" id="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select></label> + <label for="bday_month">{L_MONTH}{L_COLON} <select name="bday_month" id="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select></label> + <label for="bday_year">{L_YEAR}{L_COLON} <select name="bday_year" id="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></label> </dd> </dl> <!-- ENDIF --> |