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

Rework some CSS with new Scrollbar in Conpherence

Browse source 
Summary: Cleans up spacing, missed rules, double scrollbars, and make mobile pretty. Still need to re-work mobile submit.

Test Plan: Review Conpherence on Mobile, Tablet, and Desktop.

Reviewers: epriestley, btrahan

Reviewed By: btrahan

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D12414
This commit is contained in:
Chad Little 2015-04-14 13:36:51 -07:00
parent a7eb2f1b4d
commit badba7836f
2 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/celerity/map.php
View file

@ -45,7 +45,7 @@ return array(
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2', 'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
'rsrc/css/application/conpherence/durable-column.css' => '51c1e074', 'rsrc/css/application/conpherence/durable-column.css' => '51c1e074',
'rsrc/css/application/conpherence/menu.css' => 'f389e048', 'rsrc/css/application/conpherence/menu.css' => 'f389e048',
'rsrc/css/application/conpherence/message-pane.css' => 'b7b8f1be', 'rsrc/css/application/conpherence/message-pane.css' => '00ceda0c',
'rsrc/css/application/conpherence/notification.css' => '72178795', 'rsrc/css/application/conpherence/notification.css' => '72178795',
'rsrc/css/application/conpherence/transaction.css' => '25138b7f', 'rsrc/css/application/conpherence/transaction.css' => '25138b7f',
'rsrc/css/application/conpherence/update.css' => '1099a660', 'rsrc/css/application/conpherence/update.css' => '1099a660',
@ -517,7 +517,7 @@ return array(
'config-welcome-css' => '6abd79be', 'config-welcome-css' => '6abd79be',
'conpherence-durable-column-view' => '51c1e074', 'conpherence-durable-column-view' => '51c1e074',
'conpherence-menu-css' => 'f389e048', 'conpherence-menu-css' => 'f389e048',
'conpherence-message-pane-css' => 'b7b8f1be', 'conpherence-message-pane-css' => '00ceda0c',
'conpherence-notification-css' => '72178795', 'conpherence-notification-css' => '72178795',
'conpherence-thread-manager' => '0a5192c4', 'conpherence-thread-manager' => '0a5192c4',
'conpherence-transaction-css' => '25138b7f', 'conpherence-transaction-css' => '25138b7f',

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

@ -56,15 +56,14 @@
right: 241px; right: 241px;
top: 76px; top: 76px;
bottom: 172px; bottom: 172px;
overflow-y: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
.conpherence-messages > .conpherence-edited:first-child { .conpherence-messages .jx-scrollbar-content > .conpherence-edited:first-child {
padding-top: 20px; padding-top: 20px;
} }
.conpherence-messages > .conpherence-edited:last-child { .conpherence-messages > .jx-scrollbar-content .conpherence-edited:last-child {
padding-bottom: 20px; padding-bottom: 20px;
} }
@ -149,7 +148,7 @@
} }
.device-phone .conpherence-message-pane .conpherence-transaction-view { .device-phone .conpherence-message-pane .conpherence-transaction-view {
margin: 0 10px 0 0; margin: 0 8px;
} }
.conpherence-message-pane .conpherence-transaction-image { .conpherence-message-pane .conpherence-transaction-image {
@ -162,9 +161,13 @@
top: 5px; top: 5px;
} }
.device-phone .conpherence-message-pane .conpherence-transaction-image {
display: none;
}
.conpherence-message-pane .conpherence-comment.anchor-target, .conpherence-message-pane .conpherence-comment.anchor-target,
.conpherence-message-pane .conpherence-edited.anchor-target { .conpherence-message-pane .conpherence-edited.anchor-target {
background: #fdf5d4; background: {$lightyellow};
} }
.conpherence-message-pane .conpherence-comment.anchor-target { .conpherence-message-pane .conpherence-comment.anchor-target {
@ -182,9 +185,13 @@
margin-left: 45px; margin-left: 45px;
} }
.device-phone .conpherence-message-pane .conpherence-transaction-detail {
margin: 0;
}
.conpherence-message-pane .conpherence-transaction-view.date-marker { .conpherence-message-pane .conpherence-transaction-view.date-marker {
padding: 0; padding: 0;
margin: 12px 12px 4px; margin: 16px 12px 4px;
min-height: auto; min-height: auto;
} }
@ -200,9 +207,10 @@
padding: 0px 5px; padding: 0px 5px;
} }
.device-phone .conpherence-message-pane .conpherence-transaction-detail { .device-phone .conpherence-message-pane .conpherence-edited {
min-height: auto; min-height: none;
margin: 0; color: {$lightgreytext};
margin: 0 8px;
} }
.conpherence-message-pane .conpherence-edited .conpherence-transaction-content { .conpherence-message-pane .conpherence-edited .conpherence-transaction-content {
@ -221,28 +229,23 @@
} }
.conpherence-message-pane .conpherence-edited + .conpherence-comment { .conpherence-message-pane .conpherence-edited + .conpherence-comment {
margin-top: 20px; margin-top: 16px;
}
.conpherence-transaction-view.conpherence-edited +
.conpherence-transaction-view.date-marker {
margin-top: 24px;
} }
.conpherence-message-pane .conpherence-edited .conpherence-transaction-header { .conpherence-message-pane .conpherence-edited .conpherence-transaction-header {
float: right; float: right;
} }
.device-phone .conpherence-message-pane .conpherence-edited {
color: {$lightgreytext};
margin: 0 10px;
}
.conpherence-message-pane .conpherence-edited .conpherence-message-pane .conpherence-edited
.conpherence-transaction-content a { .conpherence-transaction-content a {
color: {$darkbluetext}; color: {$darkbluetext};
} }
.device-phone .conpherence-message-pane .conpherence-edited
.conpherence-transaction-content {
padding: 0 0 5px 35px;
}
.device-phone .conpherence-message-pane .conpherence-transaction-info { .device-phone .conpherence-message-pane .conpherence-transaction-info {
display: none; display: none;
} }