makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-22 19:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12292] Improve style details page
This commit is contained in:
Joas Schilling 2014-03-22 13:23:02 +01:00
commit 61062969a9
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/adm/style/acp_styles.html
View file

@ -2,6 +2,10 @@
<a id="maincontent"></a>
<!-- IF S_STYLE_DETAILS -->
<a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
<!-- ENDIF -->
<!-- IF S_CONFIRM_ACTION -->
<form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
@ -72,8 +76,8 @@
<fieldset class="submit-buttons">
<legend>{L_SUBMIT}</legend>
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
<a href="{U_ACTION}" class="button2">{L_BACK}</a>
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
{S_FORM_TOKEN}
</fieldset>
<!-- ENDIF -->
@ -154,14 +158,6 @@
</fieldset>
<!-- ENDIF -->
<!-- IF .extra_links -->
<fieldset class="quick">
<!-- BEGIN extra_links -->
<a class="button2" href="{extra_links.U_ACTION}">{extra_links.L_ACTION}</a>
<!-- END extra_links -->
</fieldset>
<!-- ENDIF -->
</form>
<!-- ENDIF -->

4
phpBB/adm/style/admin.css
View file

@ -1513,7 +1513,7 @@ input.autowidth { width: auto !important;}
/* Form button styles
---------------------------------------- */
a.button1, input.button1, input.button3,
a.button1, input.button1,
a.button2, input.button2 {
width: auto !important;
padding: 1px 3px 0 3px;
@ -1556,7 +1556,7 @@ input.disabled {
}
/* Focus states */
input.button1:focus, input.button2:focus, input.button3:focus {
input.button1:focus, input.button2:focus, {
outline-style: none;
}

3
phpBB/includes/acp/acp_styles.php
View file

@ -530,6 +530,9 @@ class acp_styles
return;
}
// Show page title
$this->welcome_message('ACP_STYLES', null);
// Show parent styles
foreach ($list as $row)
{