Skip to content

Commit 2e1c7da

Browse files
author
Chad Little
committedSep 15, 2016
Clean up some Conpherence header CSS
Summary: Darkens the topic, adds fun colors to action icons. Test Plan: Hover over new action icons. See darker topic text. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D16556
1 parent e78373d commit 2e1c7da

File tree

5 files changed

+39
-19
lines changed

5 files changed

+39
-19
lines changed
 

‎resources/celerity/map.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
*/
88
return array(
99
'names' => array(
10-
'conpherence.pkg.css' => '7bddd31a',
10+
'conpherence.pkg.css' => 'a9b238ee',
1111
'conpherence.pkg.js' => '5fafd1ff',
12-
'core.pkg.css' => 'dc6d08e3',
12+
'core.pkg.css' => 'ee276281',
1313
'core.pkg.js' => '1d376fa9',
1414
'darkconsole.pkg.js' => 'e7393ebb',
1515
'differential.pkg.css' => '3fb7f532',
@@ -47,7 +47,7 @@
4747
'rsrc/css/application/config/setup-issue.css' => 'f794cfc3',
4848
'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
4949
'rsrc/css/application/conpherence/durable-column.css' => '194ac487',
50-
'rsrc/css/application/conpherence/header-pane.css' => 'bdba8a5b',
50+
'rsrc/css/application/conpherence/header-pane.css' => '517de9fe',
5151
'rsrc/css/application/conpherence/menu.css' => '8344d122',
5252
'rsrc/css/application/conpherence/message-pane.css' => 'c075e8fe',
5353
'rsrc/css/application/conpherence/notification.css' => '6cdcc253',
@@ -144,7 +144,7 @@
144144
'rsrc/css/phui/phui-header-view.css' => '06385974',
145145
'rsrc/css/phui/phui-hovercard.css' => 'de1a2119',
146146
'rsrc/css/phui/phui-icon-set-selector.css' => '1ab67aad',
147-
'rsrc/css/phui/phui-icon.css' => 'b1dbd620',
147+
'rsrc/css/phui/phui-icon.css' => '9bab6f02',
148148
'rsrc/css/phui/phui-image-mask.css' => 'a8498f9c',
149149
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
150150
'rsrc/css/phui/phui-info-view.css' => '28efab79',
@@ -619,7 +619,7 @@
619619
'config-options-css' => '0ede4c9b',
620620
'config-page-css' => '8798e14f',
621621
'conpherence-durable-column-view' => '194ac487',
622-
'conpherence-header-pane-css' => 'bdba8a5b',
622+
'conpherence-header-pane-css' => '517de9fe',
623623
'conpherence-menu-css' => '8344d122',
624624
'conpherence-message-pane-css' => 'c075e8fe',
625625
'conpherence-notification-css' => '6cdcc253',
@@ -921,7 +921,7 @@
921921
'phui-hovercard' => '1bd28176',
922922
'phui-hovercard-view-css' => 'de1a2119',
923923
'phui-icon-set-selector-css' => '1ab67aad',
924-
'phui-icon-view-css' => 'b1dbd620',
924+
'phui-icon-view-css' => '9bab6f02',
925925
'phui-image-mask-css' => 'a8498f9c',
926926
'phui-info-panel-css' => '27ea50a1',
927927
'phui-info-view-css' => '28efab79',

‎src/applications/conpherence/controller/ConpherenceController.php

+2
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ protected function buildHeaderPaneContent(
7272
$this->getApplicationURI('update/'.$conpherence->getID()).'/')
7373
->setIcon('fa-pencil')
7474
->addClass('hide-on-device')
75+
->setColor('violet')
7576
->setWorkflow(true));
7677

7778
$header->addActionItem(
@@ -81,6 +82,7 @@ protected function buildHeaderPaneContent(
8182
'?action='.ConpherenceUpdateActions::NOTIFICATIONS)
8283
->setIcon('fa-gear')
8384
->addClass('hide-on-device')
85+
->setColor('pink')
8486
->setWorkflow(true));
8587

8688
$widget_key = PhabricatorConpherenceWidgetVisibleSetting::SETTINGKEY;

‎src/view/phui/PHUIIconCircleView.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ protected function getTagAttributes() {
4545
$classes[] = 'phui-icon-circle';
4646

4747
if ($this->color) {
48-
$classes[] = 'phui-icon-circle-'.$this->color;
48+
$classes[] = 'hover-'.$this->color;
49+
} else {
50+
$classes[] = 'hover-sky';
4951
}
5052

5153
if ($this->size) {
@@ -60,8 +62,7 @@ protected function getTagAttributes() {
6062

6163
protected function getTagContent() {
6264
return id(new PHUIIconView())
63-
->setIcon($this->icon)
64-
->addClass($this->color);
65+
->setIcon($this->icon);
6566
}
6667

6768
}

‎webroot/rsrc/css/application/conpherence/header-pane.css

+5-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
}
1818

1919
.conpherence-header-pane .phui-header-subheader {
20-
color: {$lightgreyborder};
20+
color: {$lightgreytext};
2121
padding: 0;
2222
font-size: 12px;
2323
margin: 0;
@@ -44,25 +44,22 @@
4444
vertical-align: middle;
4545
}
4646

47-
.conpherence-header-pane .conpherence-participant-toggle.phui-icon-circle {
47+
.conpherence-participant-toggle.phui-icon-circle {
4848
text-decoration: none;
4949
border-color: {$sky};
5050
cursor: pointer;
5151
}
5252

53-
.conpherence-header-pane .conpherence-participant-toggle.phui-icon-circle
54-
.phui-icon-view {
53+
.conpherence-participant-toggle.phui-icon-circle .phui-icon-view {
5554
color: {$sky};
5655
}
5756

58-
.hide-widgets .conpherence-header-pane
59-
.conpherence-participant-toggle.phui-icon-circle {
57+
.hide-widgets .conpherence-participant-toggle.phui-icon-circle {
6058
text-decoration: none;
6159
border-color: {$lightblueborder};
6260
cursor: pointer;
6361
}
6462

65-
.hide-widgets .conpherence-header-pane
66-
.conpherence-participant-toggle.phui-icon-circle .phui-icon-view {
63+
.hide-widgets .conpherence-participant-toggle.phui-icon-circle .phui-icon-view {
6764
color: {$lightblueborder};
6865
}

‎webroot/rsrc/css/phui/phui-icon.css

+22-2
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,36 @@ a.phui-icon-view:hover {
7171
line-height: 36px;
7272
}
7373

74-
a.phui-icon-circle:hover {
74+
a.phui-icon-circle.hover-sky:hover {
7575
text-decoration: none;
7676
border-color: {$sky};
7777
cursor: pointer;
7878
}
7979

80-
a.phui-icon-circle:hover .phui-icon-view {
80+
a.phui-icon-circle.hover-sky:hover .phui-icon-view {
8181
color: {$sky};
8282
}
8383

84+
a.phui-icon-circle.hover-violet:hover {
85+
text-decoration: none;
86+
border-color: {$violet};
87+
cursor: pointer;
88+
}
89+
90+
a.phui-icon-circle.hover-violet:hover .phui-icon-view {
91+
color: {$violet};
92+
}
93+
94+
a.phui-icon-circle.hover-pink:hover {
95+
text-decoration: none;
96+
border-color: {$pink};
97+
cursor: pointer;
98+
}
99+
100+
a.phui-icon-circle.hover-pink:hover .phui-icon-view {
101+
color: {$pink};
102+
}
103+
84104
/* - Icon in a Square ------------------------------------------------------- */
85105

86106
.phui-icon-view.phui-icon-square {

0 commit comments

Comments
 (0)
Failed to load comments.