Remove JS logic for resizing floating recipient bar and composition area and do it with pure CSS instead

(imported from commit b19d1b008cc070f29e08fd93416e9a5d01e2f110)
This commit is contained in:
Allen Rabinovich
2013-08-21 10:53:34 -07:00
parent 3f95e54dc1
commit 834ff7d750
3 changed files with 49 additions and 16 deletions

View File

@@ -365,8 +365,6 @@ exports.resize_page_components = function () {
} else { } else {
desired_width = $("#main_div").outerWidth(); desired_width = $("#main_div").outerWidth();
} }
composebox.width(desired_width);
floating_recipient_bar.width(desired_width);
tab_bar.width(desired_width); tab_bar.width(desired_width);
tab_bar_under.width(desired_width); tab_bar_under.width(desired_width);

View File

@@ -9,7 +9,7 @@ body {
} }
/* Common background color */ /* Common background color */
body, #tab_bar, #tab_bar_underpadding, .message_list, .message_comp { body, #tab_bar, #tab_bar_underpadding, .message_list, .message_comp, .compose-content {
background-color: #f4f5f4; background-color: #f4f5f4;
-webkit-transition: background-color 200ms linear; -webkit-transition: background-color 200ms linear;
-moz-transition: background-color 200ms linear; -moz-transition: background-color 200ms linear;
@@ -18,7 +18,7 @@ body, #tab_bar, #tab_bar_underpadding, .message_list, .message_comp {
transition: background-color 200ms linear; transition: background-color 200ms linear;
} }
body.narrowed_view, .narrowed_view #tab_bar, .narrowed_view #tab_bar_underpadding, .narrowed_view .message_list { body.narrowed_view, .narrowed_view #tab_bar, .narrowed_view #tab_bar_underpadding, .narrowed_view .message_list, .narrowed_view .compose-content {
background-color: #f0f8ff; background-color: #f0f8ff;
-webkit-transition: background-color 200ms linear; -webkit-transition: background-color 200ms linear;
-moz-transition: background-color 200ms linear; -moz-transition: background-color 200ms linear;
@@ -27,6 +27,9 @@ body.narrowed_view, .narrowed_view #tab_bar, .narrowed_view #tab_bar_underpaddin
transition: background-color 200ms linear; transition: background-color 200ms linear;
} }
.narrowed_view .message_comp.compose-content {
background-color: #ffffff;
}
input, button, select, textarea { input, button, select, textarea {
font-family: 'Humbug', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-family: 'Humbug', 'Helvetica Neue', Helvetica, Arial, sans-serif;
@@ -98,6 +101,7 @@ a {
position: fixed; position: fixed;
margin-top: 50px; margin-top: 50px;
width: 200px; width: 200px;
z-index:3;
} }
.app-main .column-right .right-sidebar { .app-main .column-right .right-sidebar {
@@ -556,14 +560,9 @@ ul.filters li.out_of_home_view {
display: none; display: none;
} }
.message_comp, .message_comp {
#compose_controls { background-color: #ffffff;
border: 1px solid #EEE;
background-color: white;
padding: 8px 20px 8px 10px; padding: 8px 20px 8px 10px;
box-shadow: 0px 3px 7px rgba(0, 0, 0, 0.3);
border-top-left-radius: 6px;
border-top-right-radius: 6px;
} }
#compose_buttons { #compose_buttons {
@@ -1121,14 +1120,30 @@ blockquote p {
#compose { #compose {
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
left: 0px;
z-index: 1; z-index: 1;
width: 100%;
}
#compose-container {
width: 100%;
max-width: 1210px;
margin: auto;
}
.compose-content {
border-top: 1px solid #bbbbbb;
padding: 8px 20px;
margin-left: 210px;
margin-right: 200px;
position: relative;
} }
#compose_close { #compose_close {
display: none; display: none;
position: absolute; position: absolute;
right: 5px; right: 5px;
top: 17px; top: 7px;
} }
/* Like .nav-tabs > li > a */ /* Like .nav-tabs > li > a */
@@ -1511,6 +1526,8 @@ input.recipient_box {
/* If zhome has opacity on it, it suddenly starts getting drawn on top /* If zhome has opacity on it, it suddenly starts getting drawn on top
of top_statusbar -- unless we specify a z-index. */ of top_statusbar -- unless we specify a z-index. */
z-index: 2; z-index: 2;
margin-right: 210px;
max-width: 795px;
} }
table.floating_recipient { table.floating_recipient {
@@ -2411,6 +2428,14 @@ div.edit_bot {
top: 3px; top: 3px;
} }
#floating_recipient_bar {
margin-right: 20px;
}
.compose-content {
margin-right: 10px;
}
.nav .dropdown-menu { .nav .dropdown-menu {
left: -160px; left: -160px;
min-width: 180px; min-width: 180px;
@@ -2481,6 +2506,16 @@ div.edit_bot {
margin-left: 38px; margin-left: 38px;
} }
#floating_recipient_bar {
margin-right: 25px;
min-width: 330px;
}
.compose-content {
margin-right:15px;
margin-left: 10px;
}
} }
@media (max-width: 500px) { @media (max-width: 500px) {
@@ -2491,7 +2526,7 @@ div.edit_bot {
@media (max-width: 350px) { @media (max-width: 350px) {
html { html {
overflow-x: scroll; overflow-x: hidden;
} }
} }

View File

@@ -1,6 +1,6 @@
<div id="compose"> <div id="compose">
<div class="message_area_padder"> <div id="compose-container">
<div id="compose_controls"> <div id="compose_controls" class="compose-content">
<div id="compose_buttons"> <div id="compose_buttons">
<span class="new_message_button"> <span class="new_message_button">
<button type="button" class="btn btn-large compose_stream_button" <button type="button" class="btn btn-large compose_stream_button"
@@ -16,7 +16,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="message_comp"> <div class="message_comp compose-content">
<button type="button" class="close" id='compose_close'>×</button> <button type="button" class="close" id='compose_close'>×</button>
<div class="alert" id="send-status"> <div class="alert" id="send-status">
<span class="send-status-close">&times;</span> <span class="send-status-close">&times;</span>