diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-02-02 17:20:07 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-02-02 17:20:07 +0100 |
| commit | bc98118f92c2cbfb630bda42a0e9b6a5398302c2 (patch) | |
| tree | 76ce7b29c07dd942e1d1be2782e237fe61e2c412 | |
| parent | 38af79dd30f87c3016a2f85d3343bb5f9bb5de7c (diff) | |
| parent | 34c6677d1401a812ae7230d36428aa48d10622f9 (diff) | |
| download | forums-bc98118f92c2cbfb630bda42a0e9b6a5398302c2.tar forums-bc98118f92c2cbfb630bda42a0e9b6a5398302c2.tar.gz forums-bc98118f92c2cbfb630bda42a0e9b6a5398302c2.tar.bz2 forums-bc98118f92c2cbfb630bda42a0e9b6a5398302c2.tar.xz forums-bc98118f92c2cbfb630bda42a0e9b6a5398302c2.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12146] Added a missing # to inline css-style of <span>
Conflicts:
phpBB/styles/prosilver/template/ucp_groups_manage.html
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_groups_manage.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html index eb431e9f3f..5772a735d3 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html @@ -56,7 +56,7 @@ <dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt> <dd> <input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow" /> - <span style="background-color: {GROUP_COLOUR};"> </span> + <span style="background-color: #{GROUP_COLOUR};"> </span> [ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ] <div id="color_palette_placeholder" class="hidden" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div> </dd> |