diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'conpherence.pkg.css' => 'cea72e09', + 'conpherence.pkg.css' => '0b64e988', 'conpherence.pkg.js' => '6249a1cf', 'core.pkg.css' => 'a729d20e', 'core.pkg.js' => '1a77dddf', @@ -50,7 +50,7 @@ 'rsrc/css/application/conpherence/durable-column.css' => 'd82e130c', 'rsrc/css/application/conpherence/header-pane.css' => '1c81cda6', 'rsrc/css/application/conpherence/menu.css' => '4f51db5a', - 'rsrc/css/application/conpherence/message-pane.css' => '394ae8fa', + 'rsrc/css/application/conpherence/message-pane.css' => 'b085d40d', 'rsrc/css/application/conpherence/notification.css' => '965db05b', 'rsrc/css/application/conpherence/participant-pane.css' => 'ac1baaa8', 'rsrc/css/application/conpherence/transaction.css' => '85129c68', @@ -568,7 +568,7 @@ 'conpherence-durable-column-view' => 'd82e130c', 'conpherence-header-pane-css' => '1c81cda6', 'conpherence-menu-css' => '4f51db5a', - 'conpherence-message-pane-css' => '394ae8fa', + 'conpherence-message-pane-css' => 'b085d40d', 'conpherence-notification-css' => '965db05b', 'conpherence-participant-pane-css' => 'ac1baaa8', 'conpherence-thread-manager' => '358c717b', 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 @@ -58,7 +58,7 @@ left: 240px; right: 240px; top: 103px; - bottom: 122px; + bottom: 142px; overflow-x: hidden; overflow-y: auto; -webkit-overflow-scrolling: touch; @@ -97,7 +97,7 @@ .conpherence-message-pane .phui-form-view { border-width: 0; - height: 110px; + height: 130px; padding: 0 20px 12px; position: fixed; bottom: 0; @@ -110,7 +110,7 @@ color: {$lightgreytext}; font-style: italic; position: absolute; - bottom: 6px; + bottom: 2px; left: 24px; } @@ -166,17 +166,16 @@ } .conpherence-message-pane .remarkup-assist-bar { - border: 2px solid {$lightgreyborder}; border-bottom: none; border-top-left-radius: 3px; border-top-right-radius: 3px; - background-color: {$lightgreybackground}; } .device .conpherence-message-pane .remarkup-assist-bar { position: absolute; - top: 12px; - left: 12px; + top: 9px; + left: 9px; + width: 24px; background: {$bluebackground}; border-radius: 3px; border: none; @@ -349,40 +348,26 @@ } .conpherence-message-pane .remarkup-assist-textarea { - height: 68px; + height: 88px; padding: 8px; - border: 2px solid {$lightgreyborder}; - border-top: 1px solid {$thinblueborder}; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; - resize: none; - outline: none; - box-shadow: none; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; } -.conpherence-message-pane .remarkup-assist-textarea:focus { - border: 2px solid {$lightgreyborder}; - border-top: 1px solid {$thinblueborder}; -} - .device .conpherence-message-pane .remarkup-assist-textarea { margin: 0; padding: 7px 8px 6px 30px; width: 100%; height: 34px; resize: none; - border-top: 2px solid {$lightgreyborder}; + border-color: {$greyborder}; border-top-left-radius: 3px; border-top-right-radius: 3px; } -.conpherence-message-pane .remarkup-assist-textarea:focus { - outline: none; -} - .device .conpherence-message-pane .aphront-form-control-submit { padding: 0; position: absolute;