Page MenuHomePhabricator
Files F14056091

D13056.diff
No OneTemporary
Actions

D13056.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -90,7 +90,7 @@
'rsrc/css/application/phortune/phortune-credit-card-form.css' => '8391eb02',
'rsrc/css/application/phortune/phortune.css' => '9149f103',
'rsrc/css/application/phrequent/phrequent.css' => 'ffc185ad',
- 'rsrc/css/application/phriction/phriction-document-css.css' => '0d16bc9a',
+ 'rsrc/css/application/phriction/phriction-document-css.css' => 'd1861e06',
'rsrc/css/application/policy/policy-edit.css' => '815c66f7',
'rsrc/css/application/policy/policy-transaction-detail.css' => '82100a43',
'rsrc/css/application/policy/policy.css' => '957ea14c',
@@ -754,7 +754,7 @@
'phortune-credit-card-form-css' => '8391eb02',
'phortune-css' => '9149f103',
'phrequent-css' => 'ffc185ad',
- 'phriction-document-css' => '0d16bc9a',
+ 'phriction-document-css' => 'd1861e06',
'phui-action-panel-css' => '3ee9afd5',
'phui-box-css' => 'a5bb366d',
'phui-button-css' => 'b995182d',
diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
--- a/src/applications/phriction/controller/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/PhrictionDiffController.php
@@ -206,7 +206,6 @@
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
- ->setCollapsed(true)
->appendChild($output);
return $this->buildApplicationPage(
@@ -244,7 +243,7 @@
'a',
array(
'href' => '/phriction/edit/'.$document_id.'/',
- 'class' => 'button grey',
+ 'class' => 'button simple',
),
pht('Edit Current Version'));
}
@@ -254,7 +253,7 @@
'a',
array(
'href' => '/phriction/edit/'.$document_id.'/?revert='.$version,
- 'class' => 'button grey',
+ 'class' => 'button simple',
),
pht('Revert to Version %s...', $version));
}
@@ -268,7 +267,6 @@
$handles = $this->loadViewerHandles($phids);
$list = new PHUIObjectItemListView();
- $list->setFlush(true);
$first = true;
foreach ($content as $c) {
@@ -287,10 +285,10 @@
}
if ($first == true) {
- $item->setBarColor('green');
+ $item->setStatusIcon('fa-file green');
$first = false;
} else {
- $item->setBarColor('red');
+ $item->setStatusIcon('fa-file red');
}
$list->addItem($item);
diff --git a/src/applications/phriction/controller/PhrictionHistoryController.php b/src/applications/phriction/controller/PhrictionHistoryController.php
--- a/src/applications/phriction/controller/PhrictionHistoryController.php
+++ b/src/applications/phriction/controller/PhrictionHistoryController.php
@@ -75,7 +75,7 @@
$color = 'red';
break;
case PhrictionChangeType::CHANGE_EDIT:
- $color = 'blue';
+ $color = 'lightbluetext';
break;
case PhrictionChangeType::CHANGE_MOVE_HERE:
$color = 'yellow';
@@ -93,7 +93,7 @@
$item = id(new PHUIObjectItemView())
->setHeader(pht('%s by %s', $change_type, $author))
- ->setBarColor($color)
+ ->setStatusIcon('fa-file '.$color)
->addAttribute(
phutil_tag(
'a',
diff --git a/webroot/rsrc/css/application/phriction/phriction-document-css.css b/webroot/rsrc/css/application/phriction/phriction-document-css.css
--- a/webroot/rsrc/css/application/phriction/phriction-document-css.css
+++ b/webroot/rsrc/css/application/phriction/phriction-document-css.css
@@ -2,47 +2,10 @@
* @provides phriction-document-css
*/
-.phriction-header {
- background: #eeeeee;
- border-bottom: 1px solid #dddddd;
- padding: 1em;
-}
-
-.phriction-header a.button {
- float: right;
- margin: 0em 0em 0em 1%;
-}
-
-.phriction-header h1 {
- margin: 4px 0;
-}
-
-.phriction-breadcrumbs {
- font-size: 12px;
- color: {$greytext};
-}
-
.phriction-document-crumbs a {
font-weight: bold;
}
-.phriction-children ul {
- margin-left: 30px;
- padding-bottom: 10px;
- list-style: circle;
- color: {$lightgreytext};
-}
-
-.phriction-children-header {
- background: {$lightgreybackground};
- padding: 8px 0 8px 16px;
- font-weight: bold;
- margin-bottom: 15px;
- border-bottom: 1px solid {$lightblueborder};
- color: {$bluetext};
- text-shadow: 0 1px 2px #fff;
-}
-
.phriction-revert-table {
width: 100%;
}
@@ -52,7 +15,6 @@
width: 50%;
padding: 8px 0;
margin: 0 16px;
- background-color: {$lightbluebackground};
border-top: 1px solid {$lightblueborder};
}
@@ -64,7 +26,7 @@
width: 50%;
color: {$darkgreytext};
padding: 12px;
- background-color: #E5E8EE;
+ background-color: {$lightgreybackground};
}
.phriction-history-nav-table td.nav-next {

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 6:19 PM (1 d, 1 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6721798
Default Alt Text
D13056.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility