aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--view/css/conversation.css14
-rw-r--r--view/theme/redbasic/css/style.css16
-rwxr-xr-xview/tpl/jot-header.tpl2
3 files changed, 16 insertions, 16 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 304e0f196..5cbd5c896 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -34,10 +34,18 @@ code {
padding: 10px;
}
-.profile-jot-text {
+#profile-jot-text {
+ resize: none;
+ border-width: 0px;
height: 39px;
+ line-height: 19px;
padding: 10px;
width: 100%;
+ display: inherit;
+}
+
+#profile-jot-text:focus {
+ resize: vertical;
}
.jot-attachment {
@@ -60,10 +68,6 @@ code {
height: 30px;
}
-#profile-jot-form {
- line-height: initial;
-}
-
#profile-jot-wrapper {
margin-bottom: 30px;
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 903900e7f..c21360a1f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1108,22 +1108,15 @@ img.mail-conv-sender-photo {
}
#profile-jot-text {
- resize: none;
- border-width: 0px;
border-radius: $radiuspx;
}
-#profile-jot-text:focus {
- resize: vertical;
-}
-
-
#profile-jot-text::-webkit-input-placeholder {
- font-size:16px;
+ font-size: 16px;
}
#profile-jot-text::-moz-placeholder {
- font-size:16px;
+ font-size: 16px;
}
#profile-jot-text:focus::-webkit-input-placeholder {
@@ -1815,7 +1808,10 @@ nav .badge.mail-update:hover {
}
/* Abusing theme-green is less work than makeing a new new one */
-.theme-green .back-bar .selected-bar { background-color: #000000; background-image: none; !important }
+.theme-green .back-bar .selected-bar {
+ background-color: #000000;
+ background-image: none !important;
+}
/* Turn checkboxes into switches */
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index b8618ab69..085710f55 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -10,7 +10,7 @@ function initEditor(cb){
$("#profile-jot-text-loading").spin('small').show();
if(plaintext == 'none') {
$("#profile-jot-text-loading").spin(false).hide();
- $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+ $("#profile-jot-text").css({ 'height': 200, 'color': '#000', 'line-height': 'inherit' });
{{if $bbco_autocomplete}}
$("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode
{{/if}}