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

More tweaks, Conpherence

Browse source
This commit is contained in:
Chad Little 2014-05-25 13:18:51 -07:00
parent 3aec1b1159
commit ff9057fd82
8 changed files with 52 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/applications/conpherence/view/ConpherenceMenuItemView.php
View file

@ -102,15 +102,6 @@ final class ConpherenceMenuItemView extends AphrontTagView {
), ),
$this->subtitle); $this->subtitle);
} }
$epoch = null;
if ($this->epoch) {
$epoch = phutil_tag(
'span',
array(
'class' => 'conpherence-menu-item-date',
),
phabricator_relative_date($this->epoch, $this->user));
}
$unread_count = null; $unread_count = null;
if ($this->unreadCount) { if ($this->unreadCount) {
$unread_count = phutil_tag( $unread_count = phutil_tag(
@ -125,7 +116,6 @@ final class ConpherenceMenuItemView extends AphrontTagView {
$image, $image,
$title, $title,
$subtitle, $subtitle,
$epoch,
$unread_count, $unread_count,
); );
} }

7
src/applications/meta/view/PhabricatorApplicationLaunchView.php
View file

@ -84,6 +84,11 @@ final class PhabricatorApplicationLaunchView extends AphrontView {
), ),
$counts[$warning]); $counts[$warning]);
} }
if (nonempty($count1)) {
$numbers = array($count1, ' / ', $count2);
} else {
$numbers = array($count1, $count2);
}
Javelin::initBehavior('phabricator-tooltips'); Javelin::initBehavior('phabricator-tooltips');
$content[] = javelin_tag( $content[] = javelin_tag(
@ -96,7 +101,7 @@ final class PhabricatorApplicationLaunchView extends AphrontView {
), ),
'class' => 'phabricator-application-launch-attention', 'class' => 'phabricator-application-launch-attention',
), ),
array($count1, $count2)); $numbers);
} }
$classes = array(); $classes = array();

1
src/infrastructure/celerity/CelerityResourceTransformer.php
View file

@ -193,6 +193,7 @@ final class CelerityResourceTransformer {
'lightviolet' => '#ecdff1', 'lightviolet' => '#ecdff1',
'charcoal' => '#4b4d51', 'charcoal' => '#4b4d51',
'backdrop' => '#c4cde0', 'backdrop' => '#c4cde0',
'hovergrey' => '#c5cbcf',
// Base Greys // Base Greys
'lightgreyborder' => '#C7CCD9', 'lightgreyborder' => '#C7CCD9',

33
webroot/rsrc/css/application/base/phabricator-application-launch-view.css
View file

@ -47,7 +47,7 @@ div.phabricator-application-launch-container {
} }
.device-desktop a.phabricator-application-launch-container:hover { .device-desktop a.phabricator-application-launch-container:hover {
background-color: #C5C8CF; background-color: {$hovergrey};
text-decoration: none; text-decoration: none;
} }
@ -58,7 +58,7 @@ div.phabricator-application-launch-container {
font-size: 13px; font-size: 13px;
margin-top: 7px; margin-top: 7px;
margin-left: 44px; margin-left: 44px;
text-shadow: 0 1px 2px rgba(255, 255, 255, 0.9); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9);
} }
.phabricator-application-launch-description { .phabricator-application-launch-description {
@ -66,7 +66,7 @@ div.phabricator-application-launch-container {
font-size: 11px; font-size: 11px;
margin-top: 24px; margin-top: 24px;
margin-left: 44px; margin-left: 44px;
text-shadow: 0 1px 2px rgba(255, 255, 255, 0.9); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9);
} }
.phabricator-application-beta { .phabricator-application-beta {
@ -79,32 +79,13 @@ div.phabricator-application-launch-container {
.phabricator-application-launch-attention { .phabricator-application-launch-attention {
position: absolute; position: absolute;
top: 6px; top: 17px;
right: 4px; right: 8px;
color: {$darkbluetext}; color: {$darkbluetext};
font-weight: bold; font-weight: bold;
font-size: 11px; font-size: 12px;
} }
.phabricator-application-attention-count { .phabricator-application-attention-count {
background-color: rgba(0,0,0,.1); color: {$sky};
color: {$orange};
border-radius: 2px;
padding: 1px 6px 2px;
}
.phabricator-application-warning-count {
background-color: rgba(0,0,0,.1);
border-radius: 2px;
padding: 1px 6px 2px;
}
.phabricator-application-attention-count + .phabricator-application-warning-count {
margin-left: 2px;
top: 8px;
}
.application-tile-full .phabricator-application-launch-attention {
top: 17px;
right: 8px;
} }

48
webroot/rsrc/css/application/conpherence/menu.css
View file

@ -14,7 +14,7 @@
.conpherence-layout .conpherence-no-threads { .conpherence-layout .conpherence-no-threads {
text-align: center; text-align: center;
position: fixed; position: fixed;
left: 280px; left: 240px;
right: 241px; right: 241px;
top: 76px; top: 76px;
bottom: 0px; bottom: 0px;
@ -43,7 +43,7 @@
.device-desktop .conpherence-layout .conpherence-menu-pane, .device-desktop .conpherence-layout .conpherence-menu-pane,
.device-desktop .conpherence-layout .phabricator-nav-column-background { .device-desktop .conpherence-layout .phabricator-nav-column-background {
width: 280px; width: 239px;
} }
.device .conpherence-menu-pane { .device .conpherence-menu-pane {
@ -73,7 +73,7 @@
} }
.device-desktop .conpherence-content-pane { .device-desktop .conpherence-content-pane {
margin-left: 280px; margin-left: 240px;
} }
.conpherence-content-pane { .conpherence-content-pane {
@ -89,20 +89,17 @@
.conpherence-menu .conpherence-menu-item-view { .conpherence-menu .conpherence-menu-item-view {
display: block; display: block;
height: 55px; height: 46px;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
text-decoration: none; text-decoration: none;
border-top: solid 1px #3B3D3E; border-left: 4px solid transparent;
border-bottom: solid 1px #1C1F21;
border-right: 0;
border-left: 2px solid transparent;
} }
.conpherence-menu .conpherence-selected { .conpherence-menu .conpherence-selected {
background: rgba(0, 0, 0, .6); background: {$hovergrey};
border-left: 2px solid #66CCFF; border-left: 4px solid {$blue};
} }
.conpherence-menu .loading { .conpherence-menu .loading {
@ -110,42 +107,41 @@
} }
.device-desktop .conpherence-menu .conpherence-menu-item-view:hover { .device-desktop .conpherence-menu .conpherence-menu-item-view:hover {
background-image: url('/rsrc/image/texture/dark-menu-hover.png'); background-color: {$hovergrey};
} }
.conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-image { .conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-image {
top: 6px; top: 6px;
left: 6px; left: 8px;
display: block; display: block;
position: absolute; position: absolute;
width: 35px; width: 30px;
height: 35px; height: 30px;
background-size: 35px; background-size: 30px;
border: 4px solid rgb(29, 32, 34); border: 2px solid #fff;
border-radius: 3px; border-radius: 2px;
} }
.conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-title { .conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-title {
display: block; display: block;
margin-top: 12px; margin-top: 8px;
margin-left: 58px; margin-left: 50px;
text-align: left; text-align: left;
font-weight: bold; font-weight: bold;
font-size: 13px; font-size: 13px;
color: #ffffff; color: {$darkbluetext};
text-shadow: 0px 1px 1px #000000; text-shadow: 0px 1px 1px #fff;
overflow: hidden; overflow: hidden;
width: 140px; width: 180px;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-subtitle { .conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-subtitle {
display: block; display: block;
color: #a1a5a9; color: {$bluetext};
font-size: 11px; font-size: 11px;
margin-top: 2px; margin-top: 2px;
margin-left: 58px; margin-left: 50px;
font-style: italic;
} }
.conpherence-menu .conpherence-menu-item-view .conpherence-menu .conpherence-menu-item-view
@ -171,7 +167,7 @@
position: absolute; position: absolute;
top: 15px; top: 15px;
right: 16px; right: 16px;
color: #a1a5a9; color: {$bluetext};
font-size: 11px; font-size: 11px;
} }

9
webroot/rsrc/css/application/conpherence/message-pane.css
View file

@ -7,7 +7,7 @@
.loading .messages-loading-icon, .loading .messages-loading-icon,
.conpherence-layout .conpherence-no-threads { .conpherence-layout .conpherence-no-threads {
position: fixed; position: fixed;
left: 280px; left: 240px;
right: 241px; right: 241px;
top: 76px; top: 76px;
bottom: 0px; bottom: 0px;
@ -47,12 +47,11 @@
.conpherence-message-pane .conpherence-messages { .conpherence-message-pane .conpherence-messages {
position: fixed; position: fixed;
left: 280px; left: 240px;
right: 241px; right: 241px;
top: 76px; top: 76px;
bottom: 185px; bottom: 185px;
overflow-y: auto; overflow-y: auto;
box-shadow: inset 1px 4px 5px rgba(0,0,0,0.1);
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
@ -81,7 +80,7 @@
padding: 0; padding: 0;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 280px; left: 240px;
right: 241px; right: 241px;
} }
@ -196,7 +195,7 @@
} }
.conpherence-message-pane .remarkup-assist-bar { .conpherence-message-pane .remarkup-assist-bar {
border-width: 1px 0 0; border-width: 1px 0 0;
border-color: #CCC; border-color: {$hovergrey};
border-bottom: transparent; border-bottom: transparent;
} }

14
webroot/rsrc/css/layout/phabricator-crumbs-view.css
View file

@ -12,6 +12,7 @@
/* TODO: Position this over the slider for Differential's file tree view. /* TODO: Position this over the slider for Differential's file tree view.
Remove this once that gets sorted out. */ Remove this once that gets sorted out. */
position: relative; position: relative;
-webkit-font-smoothing: antialiased;
} }
.phabricator-crumbs-view, .phabricator-crumbs-view,
@ -20,7 +21,7 @@
color: {$darkgreytext}; color: {$darkgreytext};
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
text-shadow: 0 1px 2px rgba(255, 255, 255, 0.9); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9);
} }
.phabricator-crumbs-view a.phabricator-crumbs-action-disabled { .phabricator-crumbs-view a.phabricator-crumbs-action-disabled {
@ -43,7 +44,7 @@
border-top: none; border-top: none;
} }
.phabricator-crumbs-view a:hover { .device-desktop .phabricator-crumbs-view a:hover {
text-decoration: underline; text-decoration: underline;
} }
@ -82,13 +83,18 @@
.phabricator-crumbs-action { .phabricator-crumbs-action {
display: inline-block; display: inline-block;
height: 17px; height: 17px;
padding: 8px 14px 8px 24px; padding: 8px 12px;
position: relative; position: relative;
} }
.device-phone a.phabricator-crumbs-action { .device-phone a.phabricator-crumbs-action {
padding: 7px; padding: 7px;
border-left: 1px solid #ccc; border-left: 1px solid {$hovergrey};
}
.device-desktop a.phabricator-crumbs-action:hover {
background: rgba(205, 207, 211, .5);
text-decoration: none;
} }
.device-phone .phabricator-crumbs-action-name { .device-phone .phabricator-crumbs-action-name {

4
webroot/rsrc/css/layout/phabricator-side-menu-view.css
View file

@ -19,7 +19,7 @@
.phabricator-side-menu .phui-list-item-selected, .phabricator-side-menu .phui-list-item-selected,
.device-desktop .phui-side-menu .device-desktop .phui-side-menu
.phui-list-item-selected.phui-list-item-href:hover { .phui-list-item-selected.phui-list-item-href:hover {
background-color: #C5C8CF; background-color: {$hovergrey};
border-left: 4px solid {$blue}; border-left: 4px solid {$blue};
} }
@ -38,5 +38,5 @@
.device-desktop .phabricator-side-menu a.phui-list-item-href:hover { .device-desktop .phabricator-side-menu a.phui-list-item-href:hover {
text-decoration: none; text-decoration: none;
background-color: #C5C8CF; background-color: {$hovergrey};
} }