From 89fa218c59ed5b00ddf730c2ab57bff8ed428e5f Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 24 Nov 2014 18:57:28 +0100 Subject: [PATCH] Some css tweaks. Center the controlpanel form elements --- converse.js | 1 + css/converse.css | 12 +++++++++--- less/converse.less | 14 +++++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/converse.js b/converse.js index aa82302ce..89d13ba79 100644 --- a/converse.js +++ b/converse.js @@ -1677,6 +1677,7 @@ this.RoomsPanel = Backbone.View.extend({ tagName: 'div', + className: 'controlbox-pane', id: 'chatrooms', events: { 'submit form.add-chatroom': 'createChatRoom', diff --git a/css/converse.css b/css/converse.css index 6977a20be..3636fa01d 100644 --- a/css/converse.css +++ b/css/converse.css @@ -491,7 +491,6 @@ -moz-animation: spin 2s infinite linear; -o-animation: spin 2s infinite linear; animation: spin 2s infinite linear; - width: 100%; display: block; text-align: center; margin: 5px; @@ -831,6 +830,7 @@ dl.add-converse-contact { #conversejs .fancy-dropdown { border: 1px solid #ddd; height: 22px; + text-align: left; } #conversejs .fancy-dropdown a.choose-xmpp-status { width: 155px; @@ -986,6 +986,7 @@ dl.add-converse-contact { padding: 0 5px 0 0; } #converse-roster { + text-align: left; width: 100%; position: relative; margin: 0.5em 0 0 0; @@ -1034,6 +1035,9 @@ dl.add-converse-contact { #conversejs dd.available-chatroom a.open-room { width: 148px; } +#available-chatrooms { + text-align: left; +} #available-chatrooms dt, #converse-roster dt { font-weight: normal; @@ -1131,6 +1135,7 @@ dl.add-converse-contact { width: 300px; } #conversejs .controlbox-pane { + text-align: center; background-color: white; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; @@ -1146,7 +1151,6 @@ dl.add-converse-contact { #conversejs .controlbox-pane dd { margin-left: 0; margin-bottom: 0; - padding: 1em; } #conversejs .controlbox-pane dd.odd { background-color: #DCEAC5; @@ -1187,7 +1191,6 @@ dl.add-converse-contact { #conversejs form#converse-login .login-submit, #conversejs form#converse-register .submit, #conversejs form#converse-login .submit { - width: 100%; margin-top: 1em; height: 30px; } @@ -1454,6 +1457,9 @@ input.custom-xmpp-status { #conversejs .chatbox .dropdown dd.search-xmpp ul li:hover { background-color: #bed6e5; } +#conversejs .xmpp-status-menu { + text-align: left; +} #conversejs .xmpp-status-menu li a { width: 100%; } diff --git a/less/converse.less b/less/converse.less index ef146f77b..337bbf73c 100644 --- a/less/converse.less +++ b/less/converse.less @@ -520,7 +520,6 @@ -moz-animation: spin 2s infinite linear; -o-animation: spin 2s infinite linear; animation: spin 2s infinite linear; - width: 100%; display: block; text-align: center; margin: 5px; @@ -923,6 +922,7 @@ dl.add-converse-contact { #conversejs .fancy-dropdown { border:1px solid #ddd; height: 22px; + text-align: left; } #conversejs .fancy-dropdown a.choose-xmpp-status { @@ -1104,6 +1104,7 @@ dl.add-converse-contact { } #converse-roster { + text-align: left; width: 100%; position: relative; margin: 0.5em 0 0 0; @@ -1161,6 +1162,10 @@ dl.add-converse-contact { width: 148px; } +#available-chatrooms { + text-align: left; +} + #available-chatrooms dt, #converse-roster dt { font-weight: normal; @@ -1277,6 +1282,7 @@ dl.add-converse-contact { } #conversejs .controlbox-pane { + text-align: center; background-color: white; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; @@ -1293,7 +1299,6 @@ dl.add-converse-contact { #conversejs .controlbox-pane dd { margin-left: 0; margin-bottom: 0; - padding: 1em; } #conversejs .controlbox-pane dd.odd { @@ -1343,7 +1348,6 @@ dl.add-converse-contact { #conversejs form#converse-login .login-submit, #conversejs form#converse-register .submit, #conversejs form#converse-login .submit { - width: 100%; margin-top: 1em; height: 30px; } @@ -1660,6 +1664,10 @@ input.custom-xmpp-status { background-color: #bed6e5; } +#conversejs .xmpp-status-menu { + text-align: left; +} + #conversejs .xmpp-status-menu li a { width: 100%; }