Author: solomax
Date: Tue Aug 19 19:51:35 2014
New Revision: 1618956
URL: http://svn.apache.org/r1618956
Log:
[OPENMEETINGS-1061] styles are fixed
Modified:
openmeetings/branches/3.0.x/src/main/webapp/css/theme.css
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
Modified: openmeetings/branches/3.0.x/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/css/theme.css?rev=1618956&r1=1618955&r2=1618956&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/css/theme.css (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/css/theme.css Tue Aug 19
19:51:35 2014
@@ -113,8 +113,8 @@ html, body {
overflow-y: auto;
}
#chatMessage .wysiwyg-editor {
- height: 50px;
- max-height: 50px;
+ height: 70px;
+ max-height: 70px;
}
.clickable {
cursor: pointer;
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.html?rev=1618956&r1=1618955&r2=1618956&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.html
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.html
Tue Aug 19 19:51:35 2014
@@ -26,7 +26,7 @@
$('#chat #controlBlock #control')
.removeClass('ui-icon-carat-1-' +
(chat.height() < 20 ? 'n' : 's'))
.addClass('ui-icon-carat-1-' +
(chat.height() < 20 ? 's' : 'n'));
- chat.animate({ height: chat.height() < 20 ?
"300px" : "16px" }, 1000);
+ chat.animate({ height: chat.height() < 20 ?
"320px" : "16px" }, 1000);
}
function addChatMessageInternal(m) {
if (m && m.type == "chat") {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js?rev=1618956&r1=1618955&r2=1618956&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
Tue Aug 19 19:51:35 2014
@@ -38,7 +38,7 @@ function toggleChat() {
$('#chat #controlBlock #control')
.removeClass('ui-icon-carat-1-' + (chat.height() < 20 ? 'n' :
's'))
.addClass('ui-icon-carat-1-' + (chat.height() < 20 ? 's' :
'n'));
- chat.animate({ height: chat.height() < 20 ? "300px" : "16px" }, 1000);
+ chat.animate({ height: chat.height() < 20 ? "320px" : "16px" }, 1000);
}
function addChatMessageInternal(m) {
if (m && m.type == "chat") {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css?rev=1618956&r1=1618955&r2=1618956&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
Tue Aug 19 19:51:35 2014
@@ -113,8 +113,8 @@ html, body {
overflow-y: auto;
}
#chatMessage .wysiwyg-editor {
- height: 50px;
- max-height: 50px;
+ height: 70px;
+ max-height: 70px;
}
.clickable {
cursor: pointer;
