diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -45,7 +45,7 @@ 'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2', 'rsrc/css/application/conpherence/durable-column.css' => '51c1e074', '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/transaction.css' => '25138b7f', 'rsrc/css/application/conpherence/update.css' => '1099a660', @@ -517,7 +517,7 @@ 'config-welcome-css' => '6abd79be', 'conpherence-durable-column-view' => '51c1e074', 'conpherence-menu-css' => 'f389e048', - 'conpherence-message-pane-css' => 'b7b8f1be', + 'conpherence-message-pane-css' => '00ceda0c', 'conpherence-notification-css' => '72178795', 'conpherence-thread-manager' => '0a5192c4', 'conpherence-transaction-css' => '25138b7f', diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css --- a/webroot/rsrc/css/application/conpherence/message-pane.css +++ b/webroot/rsrc/css/application/conpherence/message-pane.css @@ -56,15 +56,14 @@ right: 241px; top: 76px; bottom: 172px; - overflow-y: auto; -webkit-overflow-scrolling: touch; } -.conpherence-messages > .conpherence-edited:first-child { +.conpherence-messages .jx-scrollbar-content > .conpherence-edited:first-child { padding-top: 20px; } -.conpherence-messages > .conpherence-edited:last-child { +.conpherence-messages > .jx-scrollbar-content .conpherence-edited:last-child { padding-bottom: 20px; } @@ -149,7 +148,7 @@ } .device-phone .conpherence-message-pane .conpherence-transaction-view { - margin: 0 10px 0 0; + margin: 0 8px; } .conpherence-message-pane .conpherence-transaction-image { @@ -162,9 +161,13 @@ top: 5px; } +.device-phone .conpherence-message-pane .conpherence-transaction-image { + display: none; +} + .conpherence-message-pane .conpherence-comment.anchor-target, .conpherence-message-pane .conpherence-edited.anchor-target { - background: #fdf5d4; + background: {$lightyellow}; } .conpherence-message-pane .conpherence-comment.anchor-target { @@ -182,9 +185,13 @@ margin-left: 45px; } +.device-phone .conpherence-message-pane .conpherence-transaction-detail { + margin: 0; +} + .conpherence-message-pane .conpherence-transaction-view.date-marker { padding: 0; - margin: 12px 12px 4px; + margin: 16px 12px 4px; min-height: auto; } @@ -200,9 +207,10 @@ padding: 0px 5px; } -.device-phone .conpherence-message-pane .conpherence-transaction-detail { - min-height: auto; - margin: 0; +.device-phone .conpherence-message-pane .conpherence-edited { + min-height: none; + color: {$lightgreytext}; + margin: 0 8px; } .conpherence-message-pane .conpherence-edited .conpherence-transaction-content { @@ -221,16 +229,16 @@ } .conpherence-message-pane .conpherence-edited + .conpherence-comment { - margin-top: 20px; + margin-top: 16px; } -.conpherence-message-pane .conpherence-edited .conpherence-transaction-header { - float: right; +.conpherence-transaction-view.conpherence-edited + + .conpherence-transaction-view.date-marker { + margin-top: 24px; } -.device-phone .conpherence-message-pane .conpherence-edited { - color: {$lightgreytext}; - margin: 0 10px; +.conpherence-message-pane .conpherence-edited .conpherence-transaction-header { + float: right; } .conpherence-message-pane .conpherence-edited @@ -238,11 +246,6 @@ 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 { display: none; }