revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-22 14:52:41 +01:00
Code Issues Releases Wiki Activity

Make header alignment/layout less horrible.

Browse source 
Summary: <table />s repruhsent

Test Plan:

Reviewers:

CC:
This commit is contained in:
epriestley 2011-02-20 10:00:29 -08:00
parent c457032645
commit 8fe3c80b6c
4 changed files with 55 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/applications/differential/data/commitmessage/DifferentialCommitMessageData.php
View file

@ -93,7 +93,7 @@ class DifferentialCommitMessageData {
} }
$handles = id(new PhabricatorObjectHandleData($phids)) $handles = id(new PhabricatorObjectHandleData($phids))
->loadHandles($handles); ->loadHandles();
if ($this->mode == self::MODE_AMEND) { if ($this->mode == self::MODE_AMEND) {
if ($reviewer) { if ($reviewer) {

2
src/applications/differential/parser/commitmessage/DifferentialCommitMessage.php
View file

@ -388,8 +388,6 @@ class DifferentialCommitMessage {
$data = (int)preg_replace('/[^\d]/', '', $data); $data = (int)preg_replace('/[^\d]/', '', $data);
break; break;
case 'CC': case 'CC':
$data = preg_replace('/\s+/', ' ', $data);
break;
case 'Reviewers': case 'Reviewers':
case 'Reviewed By': case 'Reviewed By':
$data = array_filter(preg_split('/[\s,]+/', $data)); $data = array_filter(preg_split('/[\s,]+/', $data));

41
src/view/page/standard/PhabricatorStandardPageView.php
View file

@ -132,20 +132,23 @@ class PhabricatorStandardPageView extends AphrontPageView {
$tabs = array(); $tabs = array();
foreach ($this->tabs as $name => $tab) { foreach ($this->tabs as $name => $tab) {
$tabs[] = phutil_render_tag( $tab_markup = phutil_render_tag(
'a', 'a',
array( array(
'href' => idx($tab, 'href'), 'href' => idx($tab, 'href'),
),
phutil_escape_html(idx($tab, 'name')));
$tab_markup = phutil_render_tag(
'td',
array(
'class' => ($name == $this->selectedTab) 'class' => ($name == $this->selectedTab)
? 'phabricator-selected-tab' ? 'phabricator-selected-tab'
: null, : null,
), ),
phutil_escape_html(idx($tab, 'name'))); $tab_markup);
$tabs[] = $tab_markup;
} }
$tabs = implode('', $tabs); $tabs = implode('', $tabs);
if ($tabs) {
$tabs = '<span class="phabricator-head-tabs">'.$tabs.'</span>';
}
$login_stuff = null; $login_stuff = null;
$request = $this->getRequest(); $request = $this->getRequest();
@ -215,15 +218,25 @@ class PhabricatorStandardPageView extends AphrontPageView {
'<div class="phabricator-login-details">'. '<div class="phabricator-login-details">'.
$login_stuff. $login_stuff.
'</div>'. '</div>'.
'<a href="/">Phabricator</a> '. '<table class="phabricator-primary-navigation">'.
phutil_render_tag( '<tr>'.
'a', '<th class="phabricator-logo">'.
array( '<a href="/">'.
'href' => $this->getBaseURI(), "Phabricat\xE2\x9A\x99r".
'class' => 'phabricator-head-appname', '</a> '.
), '</th>'.
phutil_escape_html($this->getApplicationName())). '<th>'.
$tabs. phutil_render_tag(
'a',
array(
'href' => $this->getBaseURI(),
'class' => 'phabricator-head-appname',
),
phutil_escape_html($this->getApplicationName())).
'</th>'.
$tabs.
'</tr>'.
'</table>'.
'</div>'. '</div>'.
$this->bodyContent. $this->bodyContent.
'<div style="clear: both;"></div>'. '<div style="clear: both;"></div>'.

39
webroot/rsrc/css/application/base/standard-page-view.css
View file

@ -13,32 +13,45 @@
} }
.phabricator-standard-header { .phabricator-standard-header {
background: #003366; background: #006699;
color: white; color: white;
padding: 1em 1em 0.5em 1em;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
.phabricator-primary-navigation {
padding-top: 12px;
padding-bottom: 8px;
padding-left: 24px;
}
.phabricator-standard-header a { .phabricator-standard-header a {
color: white; color: white;
} }
.phabricator-standard-header .phabricator-head-tabs { .phabricator-primary-navigation th,
padding: 0 1em; .phabricator-primary-navigation td {
vertical-align: bottom;
font-size: 13px; font-size: 13px;
font-weight: bold; border-bottom: 6px solid transparent;
padding-bottom: 4px;
} }
.phabricator-standard-header .phabricator-head-tabs a { .phabricator-primary-navigation th.phabricator-logo {
border-bottom: 3px solid transparent; font-size: 16px;
padding: 0.5em 0.75em; padding-top: 8px;
position: relative; padding-left: 24px;
bottom: 2px; padding-right: 6px;
} }
.phabricator-standard-header .phabricator-head-tabs a.phabricator-selected-tab { .phabricator-primary-navigation td {
border-bottom-color: #cccccc; padding-left: 10px;
padding-right: 10px;
}
.phabricator-primary-navigation td.phabricator-selected-tab {
border-bottom-color: #ffffff;
background: #3377aa;
} }
.phabricator-standard-header .phabricator-head-appname { .phabricator-standard-header .phabricator-head-appname {
@ -48,6 +61,8 @@
.phabricator-login-details { .phabricator-login-details {
float: right; float: right;
padding: 6px 24px 0;
font-size: 12px;
} }
.phabricator-page-foot { .phabricator-page-foot {