Skip to content

C
converse.js
Commit 5c9a7c25 authored by JC Brand's avatar JC Brand
Browse files
Options

Bring mockup markup inline with reality and update scss/css

parent 3de79ba6
Hide whitespace changes
Inline Side-by-side
Showing with 910 additions and 920 deletions
css/converse.css
View file @ 5c9a7c25
...@@ -88,10 +88,7 @@ ...@@ -88,10 +88,7 @@
box-sizing: border-box; box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
/* (jQ addClass:) if input has value: */
/* (jQ addClass:) if mouse is over the 'x' input area*/
/* @group Tabs */ /* @group Tabs */
/* single tab */
/* status dropdown styles */ } /* status dropdown styles */ }
#conversejs html, #conversejs body, #conversejs div, #conversejs span, #conversejs applet, #conversejs object, #conversejs iframe, #conversejs html, #conversejs body, #conversejs div, #conversejs span, #conversejs applet, #conversejs object, #conversejs iframe,
#conversejs h1, #conversejs h2, #conversejs h3, #conversejs h4, #conversejs h5, #conversejs h6, #conversejs p, #conversejs blockquote, #conversejs pre, #conversejs h1, #conversejs h2, #conversejs h3, #conversejs h4, #conversejs h5, #conversejs h6, #conversejs p, #conversejs blockquote, #conversejs pre,
...@@ -766,6 +763,12 @@ ...@@ -766,6 +763,12 @@
border: 0; border: 0;
font: inherit; font: inherit;
vertical-align: baseline; } vertical-align: baseline; }
#conversejs textarea,
#conversejs input[type=text], #conversejs input[type=password],
#conversejs button {
font-size: 14px;
padding: 0.5em;
min-height: 0; }
#conversejs strong { #conversejs strong {
font-weight: 700; } font-weight: 700; }
#conversejs ol, #conversejs ul { #conversejs ol, #conversejs ul {
...@@ -1020,10 +1023,9 @@ ...@@ -1020,10 +1023,9 @@
font-family: 'Converse-js' !important; font-family: 'Converse-js' !important;
content: "\231b"; } content: "\231b"; }
#conversejs .spinner { #conversejs .spinner {
-webkit-animation: spin 2s infinite linear; -webkit-animation: spin 2s infinite, linear;
-moz-animation: spin 2s infinite linear; -moz-animation: spin 2s infinite, linear;
-o-animation: spin 2s infinite linear; animation: spin 2s infinite, linear;
animation: spin 2s infinite linear;
display: block; display: block;
text-align: center; text-align: center;
margin: 5px; } margin: 5px; }
...@@ -1035,20 +1037,6 @@ ...@@ -1035,20 +1037,6 @@
text-align: center; text-align: center;
display: block; display: block;
margin: 0 auto; } margin: 0 auto; }
#conversejs #minimized-chats .box-flyout {
position: absolute;
display: block;
height: auto;
bottom: 25px;
margin-left: 0; }
#conversejs #minimized-chats .box-flyout .chat-head {
font-size: 100%;
border-radius: 4px;
padding: 3px 0 0 5px;
margin: 0 0 1px 0;
box-shadow: 1px 3px 5px 3px rgba(0, 0, 0, 0.4);
height: 24px;
width: 130px; }
#conversejs #minimized-chats, #conversejs #minimized-chats,
#conversejs .toggle-controlbox { #conversejs .toggle-controlbox {
float: right; float: right;
...@@ -1065,6 +1053,20 @@ ...@@ -1065,6 +1053,20 @@
width: 130px; width: 130px;
padding: 0; padding: 0;
display: none; } display: none; }
#conversejs #minimized-chats .box-flyout {
position: absolute;
display: block;
height: auto;
bottom: 25px;
margin-left: 0; }
#conversejs #minimized-chats .box-flyout .chat-head {
font-size: 100%;
border-radius: 4px;
padding: 3px 0 0 5px;
margin: 0 0 1px 0;
box-shadow: 1px 3px 5px 3px rgba(0, 0, 0, 0.4);
height: 24px;
width: 130px; }
#conversejs #toggle-minimized-chats { #conversejs #toggle-minimized-chats {
position: relative; position: relative;
padding: 4px 0 0 4px; padding: 4px 0 0 4px;
...@@ -1072,9 +1074,9 @@ ...@@ -1072,9 +1074,9 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
color: #0f0f0f; } color: #0f0f0f; }
#conversejs #toggle-minimized-chats .unread-message-count { #conversejs #toggle-minimized-chats .unread-message-count {
right: 5px; right: 5px;
bottom: 5px; } bottom: 5px; }
#conversejs .toggle-controlbox, #conversejs .toggle-controlbox,
#conversejs .toggle-minimized-chats { #conversejs .toggle-minimized-chats {
float: right; float: right;
...@@ -1093,31 +1095,23 @@ ...@@ -1093,31 +1095,23 @@
height: -webkit-calc(100% - 40px); height: -webkit-calc(100% - 40px);
height: calc(100% - 40px); height: calc(100% - 40px);
border-top: 0; } border-top: 0; }
#conversejs .chatroom .chat-area { #conversejs .chat-body p {
float: left; font-size: 14px;
height: 100%; color: #6C4C44;
width: 200px; } padding: 5px;
#conversejs .chatroom .participants { margin: 0; }
float: right;
background-color: white;
overflow-y: auto;
overflow-x: hidden;
border-left: 1px solid #AAA;
border-bottom-right-radius: 4px;
width: 100px;
height: 100%; }
#conversejs .tt-highlight { #conversejs .tt-highlight {
background-color: #00230F; } background-color: #00230F; }
#conversejs div.tt-suggestion p:hover .tt-highlight { #conversejs .tt-suggestion p {
background-color: #00230F;
background: #27774A; }
#conversejs div.tt-suggestion p:hover {
background-color: #00230F; }
#conversejs div.tt-suggestion p {
color: white; color: white;
text-shadow: rgba(0, 0, 0, 0.51) 0 -1px 0; text-shadow: rgba(0, 0, 0, 0.51) 0 -1px 0;
cursor: pointer; cursor: pointer;
font-size: 11px; } font-size: 11px; }
#conversejs .tt-suggestion p:hover {
background-color: #00230F; }
#conversejs .tt-suggestion p:hover .tt-highlight {
background-color: #00230F;
background: #27774A; }
#conversejs .tt-dropdown-menu { #conversejs .tt-dropdown-menu {
margin: 0 1px 0 1px; margin: 0 1px 0 1px;
width: 96px; width: 96px;
...@@ -1128,21 +1122,10 @@ ...@@ -1128,21 +1122,10 @@
background: #27774A; background: #27774A;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px; } border-bottom-left-radius: 4px; }
#conversejs .chatroom div.participants label {
font-style: italic; }
#conversejs .chatroom label {
margin-left: 2px;
font-size: 12px; }
#conversejs .chatroom .invited-contact {
margin: 0;
width: 99px;
border: 1px solid #999; }
#conversejs .chatroom .invited-contact.tt-input {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gkBCjE0uzKkOgAAAidJREFUKM+N0k+IEnEUB/D3cyscdagkWpHV0WGWREXm0AgOGkSJ07kh2UXYU5cOewm6Bp0KXG/tpSCv6hyEFQIhMEaE3yERYfwTOoqKGLQxDAbqYadLgu7J7/XxeY/3ez8EACDLsgljfMfj8ZxUKhXXYDAAnueBoqgyAMipVOovXAuSZdnUaDQeDofDs16vFyUIAjRNUwmCoG02G1AUdZ5IJN7GYrHfm3AvEAjcnUwmX0ajUdRqtV74fL6sruufKYoa6bp+fzabPUMI7ZfL5eImNHk8npNerxc1m80XHMe98fv9H3K5XDkSibxjWfb1arWaYoyPMMbCFqxUKi6CIODw8LDmdDq7oigaAACiKK5omv7KcdylpmlIkiTHFlRVFTRNUxVFqa/ROqIoGoqi5A3DgFartfU4Jp7ngSAI2uVyPZIk6dZmUZKk2w6H4xghBPF4HK7vWLbZbDCdTp+rqvpUkiS0RvV6/bTf7x8wDHMViURqm/AGAMgURZ232+1X1Wr102KxuEwmk3lZlo/7/f7BcrkkSZKs2e12tHXH/x/gHsY4jTE+0jQNGYYBCCFgGOaKJMkfjUaDZximGQ6HXzSbzZ+ZTMbY6oIxFgqFgqPT6YAgCMBxXM1ut6N0Op0fj8chi8XyjWXZ98Fg8DuCHZLNZh+USqWP8/n8idvt/hUKhV7u7QK9Xu8fmqanAJBQVXUfAGY7TQQAKBaLN8fjsdDtdh/run72Dzhf7XLe2UevAAAAAElFTkSuQmCC) no-repeat right 3px center; }
#conversejs .participants label { #conversejs .participants label {
margin-top: 5px; margin-top: 5px;
display: block; } display: block; }
#conversejs .participants ul.participant-list li { #conversejs .participants .participant-list li {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
...@@ -1151,10 +1134,8 @@ ...@@ -1151,10 +1134,8 @@
font-weight: bold; font-weight: bold;
padding: 0.5em 0 0 0.5em; padding: 0.5em 0 0 0.5em;
cursor: default; } cursor: default; }
#conversejs ul.participant-list li.moderator { #conversejs .participants .participant-list li.moderator {
color: #8f2831; } color: #8f2831; }
#conversejs .chatroom .participant-list {
list-style: none; }
#conversejs .chat-blink { #conversejs .chat-blink {
background-color: #176679; background-color: #176679;
border-right: 1px solid #176679; border-right: 1px solid #176679;
...@@ -1207,20 +1188,23 @@ ...@@ -1207,20 +1188,23 @@
#conversejs .chat-date { #conversejs .chat-date {
display: inline-block; display: inline-block;
padding-top: 10px; } padding-top: 10px; }
#conversejs p.not-implemented { #conversejs .not-implemented {
margin-top: 3em; margin-top: 3em;
margin-left: 0.3em; margin-left: 0.3em;
color: #808080; } color: #808080; }
#conversejs div.mentioned { #conversejs .mentioned {
font-weight: bold; } font-weight: bold; }
#conversejs div.delayed .chat-message-them { #conversejs .delayed .chat-message-them {
color: #FB5D50; } color: #FB5D50; }
#conversejs div.delayed .chat-message-me { #conversejs .delayed .chat-message-me {
color: #7EABBB; } color: #7EABBB; }
#conversejs input.error {
border: 1px solid red; }
#conversejs .error { #conversejs .error {
color: red; } color: red; }
#conversejs input.error {
border: 1px solid red; }
#conversejs #converse-register .form-errors {
color: red;
display: none; }
#conversejs #converse-register .provider-title { #conversejs #converse-register .provider-title {
font-size: 115%; } font-size: 115%; }
#conversejs #converse-register .provider-score { #conversejs #converse-register .provider-score {
...@@ -1265,8 +1249,8 @@ ...@@ -1265,8 +1249,8 @@
border-top-left-radius: 4px; border-top-left-radius: 4px;
padding: 2px 2px 2px 4px; padding: 2px 2px 2px 4px;
margin: 0; } margin: 0; }
#conversejs .chat-head .avatar { #conversejs .chat-head .avatar {
float: left; } float: left; }
#conversejs .chat-head-chatbox, #conversejs .chat-head-chatbox,
#conversejs .chat-head-chatroom { #conversejs .chat-head-chatroom {
height: 40px; height: 40px;
...@@ -1276,8 +1260,8 @@ ...@@ -1276,8 +1260,8 @@
background-color: #0F592F; } background-color: #0F592F; }
#conversejs .chat-head-chatbox { #conversejs .chat-head-chatbox {
background-color: #436F64; } background-color: #436F64; }
#conversejs p.user-custom-message, #conversejs .user-custom-message,
#conversejs p.chatroom-topic { #conversejs .chatroom-topic {
color: white; color: white;
font-size: 80%; font-size: 80%;
font-style: italic; font-style: italic;
...@@ -1298,21 +1282,21 @@ ...@@ -1298,21 +1282,21 @@
border: 1px solid #F1DCD6; border: 1px solid #F1DCD6;
height: 22px; height: 22px;
text-align: left; } text-align: left; }
#conversejs .fancy-dropdown a.choose-xmpp-status { #conversejs .fancy-dropdown .choose-xmpp-status {
width: 155px; } width: 155px; }
#conversejs .fancy-dropdown a.choose-xmpp-status, #conversejs .fancy-dropdown .choose-xmpp-status span {
#conversejs .fancy-dropdown a.toggle-xmpp-contact-form { padding-right: 5px;
text-shadow: 0 1px 0 #ffffff; padding-left: 5px;
overflow: hidden; float: left; }
text-overflow: ellipsis; #conversejs .fancy-dropdown .choose-xmpp-status,
white-space: nowrap; #conversejs .fancy-dropdown .toggle-xmpp-contact-form {
display: inline; } text-shadow: 0 1px 0 #ffffff;
#conversejs .fancy-dropdown a.toggle-xmpp-contact-form span { overflow: hidden;
float: left; } text-overflow: ellipsis;
#conversejs .choose-xmpp-status span { white-space: nowrap;
padding-right: 5px; display: inline; }
padding-left: 5px; #conversejs .fancy-dropdown .toggle-xmpp-contact-form span {
float: left; } float: left; }
#conversejs #fancy-xmpp-status-select a.change-xmpp-status-message { #conversejs #fancy-xmpp-status-select a.change-xmpp-status-message {
float: right; float: right;
clear: right; clear: right;
...@@ -1327,8 +1311,8 @@ ...@@ -1327,8 +1311,8 @@
margin: 0; margin: 0;
padding-left: 5px; padding-left: 5px;
padding: 0 0 5px 5px; } padding: 0 0 5px 5px; }
#conversejs form.search-xmpp-contact input { #conversejs form.search-xmpp-contact input {
width: 8em; } width: 8em; }
#conversejs .controlbox-head { #conversejs .controlbox-head {
margin: 0; margin: 0;
color: #FFF; color: #FFF;
...@@ -1378,38 +1362,29 @@ ...@@ -1378,38 +1362,29 @@
overflow-y: auto; overflow-y: auto;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px; } border-bottom-left-radius: 4px; }
#conversejs .chat-body p { #conversejs .chatroom-form {
font-size: 14px; padding: 1em; }
color: #6C4C44; #conversejs .chatroom-form .instructions {
padding: 5px; color: gray;
margin: 0; } font-size: 95%; }
#conversejs .chatroom-form legend { #conversejs .chatroom-form input {
font-size: 14px; width: 100%;
font-weight: bold; padding: 5px;
margin: 5px 0; } text-align: center; }
#conversejs .chatroom-form label { #conversejs .chatroom-form legend {
height: 30px; font-size: 16px;
font-weight: bold; font-weight: bold;
display: block; margin: 10px 0 15px 0; }
clear: both; } #conversejs .chatroom-form label {
#conversejs .chatroom-form label input, height: 30px;
#conversejs .chatroom-form label select { font-weight: bold;
float: right; } display: block;
#conversejs #converse-roster dd.odd { clear: both; }
background-color: #DCEAC5; #conversejs .chatroom-form label label input, #conversejs .chatroom-form label label select {
/* Make this difference */ } float: right; }
#conversejs #converse-roster dd.current-xmpp-contact span {
font-size: 16px;
float: left;
color: #436F64; }
#conversejs .requesting-xmpp-contact .request-actions { #conversejs .requesting-xmpp-contact .request-actions {
margin-left: 0.5em; margin-left: 0.5em;
float: right; } float: right; }
#conversejs #converse-roster span.req-contact-name {
width: 65%; }
#conversejs #converse-roster span.pending-contact-name,
#conversejs #converse-roster a.open-chat {
width: 80%; }
#conversejs #converse-roster { #conversejs #converse-roster {
text-align: left; text-align: left;
width: 100%; width: 100%;
...@@ -1417,40 +1392,78 @@ ...@@ -1417,40 +1392,78 @@
margin: 0.5em 0 0 0; margin: 0.5em 0 0 0;
height: 194px; height: 194px;
height: calc(100% - 68px); height: calc(100% - 68px);
overflow: hidden; } overflow: hidden;
#conversejs #converse-roster .roster-filter-group { /* (jQ addClass:) if input has value: */
display: table; } /* (jQ addClass:) if mouse is over the 'x' input area*/ }
#conversejs #converse-roster .filter-type { #conversejs #converse-roster .roster-filter-group {
display: table-cell; display: table; }
height: 24px; #conversejs #converse-roster .filter-type {
padding: 0; display: table-cell;
margin: 0 0 0.5em -2px; height: 24px;
display: inline-block; padding: 0;
width: 85px; } margin: 0 0 0.5em -2px;
#conversejs #converse-roster .roster-filter { display: inline-block;
display: table-cell; width: 85px;
padding: 2px; font-size: 14px; }
margin: 0 0 0.5em 6px; #conversejs #converse-roster .roster-filter {
width: 104px; display: table-cell;
height: 24px; padding: 2px;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg==) no-repeat right -20px center; margin: 0 0 0.5em 6px;
border: 1px solid #999; width: 104px;
display: inline-block; } height: 24px;
#conversejs #converse-roster .roster-filter.x { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg==) no-repeat right -20px center;
background-position: right 3px center; } border: 1px solid #999;
#conversejs #converse-roster .roster-filter.onX { display: inline-block; }
cursor: pointer; } #conversejs #converse-roster .roster-filter.x {
#conversejs #converse-roster .roster-contacts { background-position: right 3px center; }
margin: 0; #conversejs #converse-roster .roster-filter.onX {
overflow-y: auto; cursor: pointer; }
overflow-x: hidden; #conversejs #converse-roster .roster-contacts {
max-height: 195px; margin: 0;
max-height: calc(100% - 26px); overflow-y: auto;
padding-bottom: 15px; } overflow-x: hidden;
#conversejs #converse-roster .group-toggle { max-height: 195px;
color: #6C4C44; max-height: calc(100% - 26px);
display: block; padding-bottom: 15px; }
width: 100%; } #conversejs #converse-roster .group-toggle {
color: #6C4C44;
display: block;
width: 100%; }
#conversejs #converse-roster dt {
display: none; }
#conversejs #converse-roster dd {
line-height: 16px; }
#conversejs #converse-roster dd a, #conversejs #converse-roster dd span {
text-shadow: 0 1px 0 #FAFAFA;
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-left: 3px; }
#conversejs #converse-roster dd span {
padding: 0 5px 0 0;
margin-left: 3px; }
#conversejs #converse-roster dd a.decline-xmpp-request {
margin-left: 5px; }
#conversejs #converse-roster dd a.remove-xmpp-contact {
float: right;
width: 22px;
margin: 0;
display: none;
color: #6C4C44; }
#conversejs #converse-roster dd:hover a.remove-xmpp-contact {
display: inline-block; }
#conversejs #converse-roster dd.odd {
background-color: #DCEAC5;
/* Make this difference */ }
#conversejs #converse-roster dd.current-xmpp-contact span {
font-size: 16px;
float: left;
color: #436F64; }
#conversejs #converse-roster span.req-contact-name {
width: 65%; }
#conversejs #converse-roster span.pending-contact-name, #conversejs #converse-roster a.open-chat {
width: 80%; }
#conversejs dd.available-chatroom { #conversejs dd.available-chatroom {
overflow-x: hidden; overflow-x: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -1467,8 +1480,6 @@ ...@@ -1467,8 +1480,6 @@
border: none; border: none;
padding: 5px; padding: 5px;
text-shadow: 0 1px 0 #FAFAFA; } text-shadow: 0 1px 0 #FAFAFA; }
#conversejs #converse-roster dt {
display: none; }
#conversejs .room-info { #conversejs .room-info {
font-size: 11px; font-size: 11px;
font-style: normal; font-style: normal;
...@@ -1509,33 +1520,10 @@ ...@@ -1509,33 +1520,10 @@
clear: both; clear: both;
height: 24px; height: 24px;
overflow-y: hidden; } overflow-y: hidden; }
#conversejs #converse-roster dd {
line-height: 16px; }
#conversejs .roster-group:hover, #conversejs .roster-group:hover,
#conversejs dd.available-chatroom:hover, #conversejs dd.available-chatroom:hover,
#conversejs #converse-roster dd:hover { #conversejs #converse-roster dd:hover {
background-color: #E3C9C1; } background-color: #E3C9C1; }
#conversejs #converse-roster dd a,
#conversejs #converse-roster dd span {
text-shadow: 0 1px 0 #FAFAFA;
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-left: 3px; }
#conversejs #converse-roster dd span {
padding: 0 5px 0 0;
margin-left: 3px; }
#conversejs #converse-roster dd a.decline-xmpp-request {
margin-left: 5px; }
#conversejs #converse-roster dd a.remove-xmpp-contact {
float: right;
width: 22px;
margin: 0;
display: none;
color: #6C4C44; }
#conversejs #converse-roster dd:hover a.remove-xmpp-contact {
display: inline-block; }
#conversejs .chatbox, #conversejs .chatbox,
#conversejs .chatroom { #conversejs .chatroom {
height: 25px; height: 25px;
...@@ -1544,8 +1532,67 @@ ...@@ -1544,8 +1532,67 @@
display: block; } display: block; }
#conversejs .chatbox { #conversejs .chatbox {
width: 200px; } width: 200px; }
#conversejs .chatbox .box-flyout {
width: 200px; }
#conversejs .chatbox .dropdown a {
height: 22px;
width: 148px;
display: inline-block;
line-height: 24px; }
#conversejs .chatbox .dropdown li {
list-style: none;
padding-left: 0; }
#conversejs .chatbox .dropdown dd ul {
padding: 5px 0 5px 0;
list-style: none;
position: absolute;
left: 0;
top: 0;
border: 1px solid #F1DCD6;
border-top: 0;
width: 99%;
z-index: 21;
background-color: #F1E2DD; }
#conversejs .chatbox .dropdown dd ul li:hover {
background-color: #E3C9C1; }
#conversejs .chatbox .dropdown dd.search-xmpp ul li:hover {
background-color: #F1E2DD; }
#conversejs .chatbox .dropdown dt a span {
cursor: pointer;
display: block;
padding: 4px 7px 0 5px; }
#conversejs .chatroom { #conversejs .chatroom {
width: 300px; } width: 300px; }
#conversejs .chatroom label {
margin-left: 2px;
font-size: 12px; }
#conversejs .chatroom .box-flyout {
width: 300px; }
#conversejs .chatroom .participant-list {
list-style: none; }
#conversejs .chatroom .chat-textarea {
border-bottom-right-radius: 0; }
#conversejs .chatroom .chat-area {
float: left;
height: 100%;
width: 200px; }
#conversejs .chatroom .invited-contact {
margin: 0;
width: 99px;
border: 1px solid #999; }
#conversejs .chatroom .invited-contact.tt-input {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gkBCjE0uzKkOgAAAidJREFUKM+N0k+IEnEUB/D3cyscdagkWpHV0WGWREXm0AgOGkSJ07kh2UXYU5cOewm6Bp0KXG/tpSCv6hyEFQIhMEaE3yERYfwTOoqKGLQxDAbqYadLgu7J7/XxeY/3ez8EACDLsgljfMfj8ZxUKhXXYDAAnueBoqgyAMipVOovXAuSZdnUaDQeDofDs16vFyUIAjRNUwmCoG02G1AUdZ5IJN7GYrHfm3AvEAjcnUwmX0ajUdRqtV74fL6sruufKYoa6bp+fzabPUMI7ZfL5eImNHk8npNerxc1m80XHMe98fv9H3K5XDkSibxjWfb1arWaYoyPMMbCFqxUKi6CIODw8LDmdDq7oigaAACiKK5omv7KcdylpmlIkiTHFlRVFTRNUxVFqa/ROqIoGoqi5A3DgFartfU4Jp7ngSAI2uVyPZIk6dZmUZKk2w6H4xghBPF4HK7vWLbZbDCdTp+rqvpUkiS0RvV6/bTf7x8wDHMViURqm/AGAMgURZ232+1X1Wr102KxuEwmk3lZlo/7/f7BcrkkSZKs2e12tHXH/x/gHsY4jTE+0jQNGYYBCCFgGOaKJMkfjUaDZximGQ6HXzSbzZ+ZTMbY6oIxFgqFgqPT6YAgCMBxXM1ut6N0Op0fj8chi8XyjWXZ98Fg8DuCHZLNZh+USqWP8/n8idvt/hUKhV7u7QK9Xu8fmqanAJBQVXUfAGY7TQQAKBaLN8fjsdDtdh/run72Dzhf7XLe2UevAAAAAElFTkSuQmCC) no-repeat right 3px center; }
#conversejs .chatroom div.participants {
float: right;
background-color: white;
overflow-y: auto;
overflow-x: hidden;
border-left: 1px solid #AAA;
border-bottom-right-radius: 4px;
width: 100px;
height: 100%; }
#conversejs .chatroom div.participants label {
font-style: italic; }
#conversejs .chatroom-form, #conversejs .chatroom-form,
#conversejs .controlbox-pane { #conversejs .controlbox-pane {
text-align: center; text-align: center;
...@@ -1558,14 +1605,15 @@ ...@@ -1558,14 +1605,15 @@
height: -webkit-calc(100% - 40px); height: -webkit-calc(100% - 40px);
height: calc(100% - 40px); height: calc(100% - 40px);
overflow-y: auto; overflow-y: auto;
padding: 5px 0;
position: absolute; position: absolute;
width: 100%; } width: 100%; }
#conversejs .controlbox-pane dd { #conversejs .controlbox-pane {
margin-left: 0; padding: 5px 0; }
margin-bottom: 0; } #conversejs .controlbox-pane dd {
#conversejs .controlbox-pane dd.odd { margin-left: 0;
background-color: #DCEAC5; } margin-bottom: 0; }
#conversejs .controlbox-pane dd.odd {
background-color: #DCEAC5; }
#conversejs #converse-register .title { #conversejs #converse-register .title {
font-weight: bold; } font-weight: bold; }
#conversejs #converse-register .info { #conversejs #converse-register .info {
...@@ -1577,24 +1625,18 @@ ...@@ -1577,24 +1625,18 @@
#conversejs #converse-register .instructions { #conversejs #converse-register .instructions {
color: gray; color: gray;
font-size: 85%; } font-size: 85%; }
#conversejs .chatroom-form .instructions {
color: gray;
font-size: 95%; }
#conversejs .form-help:hover, #conversejs .form-help:hover,
#conversejs #converse-register .instructions:hover { #conversejs #converse-register .instructions:hover {
color: #6C4C44; } color: #6C4C44; }
#conversejs .form-help { #conversejs .form-help {
padding-top: 5px; } padding-top: 5px; }
#conversejs #converse-register .form-errors {
color: red;
display: none; }
#conversejs #converse-register, #conversejs #converse-register,
#conversejs #converse-login { #conversejs #converse-login {
background: white; background: white;
padding: 1em 0.5em; } padding: 1em; }
#conversejs #converse-register input, #conversejs #converse-register input,
#conversejs #converse-login input { #conversejs #converse-login input {
width: 178px; width: 100%;
height: 30px; } height: 30px; }
#conversejs #converse-register .input-group { #conversejs #converse-register .input-group {
display: table; display: table;
...@@ -1618,24 +1660,21 @@ ...@@ -1618,24 +1660,21 @@
#conversejs #converse-register .save-submit { #conversejs #converse-register .save-submit {
width: 45%; width: 45%;
margin: 5px 3px 5px 3px; } margin: 5px 3px 5px 3px; }
#conversejs .chatroom-form input {
width: 80%;
padding: 5px;
text-align: center; }
#conversejs .chatroom-form label, #conversejs .chatroom-form label,
#conversejs .controlbox-pane label, #conversejs .controlbox-pane label,
#conversejs #converse-register label, #conversejs #converse-register label,
#conversejs #converse-login label { #conversejs #converse-login label {
height: auto; height: auto;
font-size: 14px; font-size: 14px;
margin-top: 2px; margin: 4px;
font-weight: bold; } font-weight: bold; }
#conversejs #converse-register .login-submit, #conversejs #converse-register .login-submit,
#conversejs #converse-login .login-submit, #conversejs #converse-login .login-submit,
#conversejs #converse-register .submit, #conversejs #converse-register .submit,
#conversejs #converse-login .submit { #conversejs #converse-login .submit {
margin-top: 1em; height: 30px;
height: 30px; } padding: 0px;
font-size: 14px; }
#conversejs form.set-xmpp-status { #conversejs form.set-xmpp-status {
background: none; background: none;
margin: none; margin: none;
...@@ -1643,13 +1682,13 @@ ...@@ -1643,13 +1682,13 @@
#conversejs form.add-chatroom { #conversejs form.add-chatroom {
background: none; background: none;
padding: 8px; } padding: 8px; }
#conversejs form.add-chatroom input[type=button], #conversejs form.add-chatroom input[type=button],
#conversejs form.add-chatroom input[type=submit], #conversejs form.add-chatroom input[type=submit],
#conversejs form.add-chatroom input[type=text] { #conversejs form.add-chatroom input[type=text] {
margin: 3px 0; margin: 3px 0;
width: 100%; } width: 100%; }
#conversejs form.add-chatroom input[type=submit] { #conversejs form.add-chatroom input[type=submit] {
color: #436F64; } color: #436F64; }
#conversejs select#select-xmpp-status { #conversejs select#select-xmpp-status {
float: right; float: right;
margin-right: 0.5em; } margin-right: 0.5em; }
...@@ -1658,37 +1697,37 @@ ...@@ -1658,37 +1697,37 @@
display: inline; display: inline;
overflow: hidden; overflow: hidden;
font-size: 12px; font-size: 12px;
list-style-type: none; } list-style-type: none;
#conversejs .chat-head #controlbox-tabs li { /* single tab */ }
float: left; #conversejs .chat-head #controlbox-tabs a.current,
list-style: none; #conversejs .chat-head #controlbox-tabs a.current:hover {
padding-left: 0; box-shadow: none;
text-shadow: white 0 1px 0; border-bottom: 0;
width: 38%; } height: 40px;
#conversejs ul#controlbox-tabs li a { cursor: default;
display: block; color: #6C4C44; }
font-size: 12px; #conversejs .chat-head #controlbox-tabs li {
height: 39px; float: left;
line-height: 39px; list-style: none;
margin: 0; padding-left: 0;
text-align: center; text-shadow: white 0 1px 0;
text-decoration: none; width: 38%; }
border-top-right-radius: 4px; #conversejs .chat-head #controlbox-tabs li a {
border-top-left-radius: 4px; background-color: white;
color: #888; } border-bottom: 1px solid #CCC;
#conversejs .chat-head #controlbox-tabs li a:hover { border-top-left-radius: 4px;
color: #6C4C44; } border-top-right-radius: 4px;
#conversejs .chat-head #controlbox-tabs li a { box-shadow: inset 0 4px 12px rgba(0, 0, 0, 0.3);
background-color: white; color: #888;
box-shadow: inset 0 4px 12px rgba(0, 0, 0, 0.3); display: block;
border-bottom: 1px solid #CCC; } font-size: 12px;
#conversejs ul#controlbox-tabs a.current, height: 39px;
#conversejs ul#controlbox-tabs a.current:hover { line-height: 39px;
box-shadow: none; margin: 0;
border-bottom: 0; text-align: center;
height: 40px; text-decoration: none; }
cursor: default; #conversejs .chat-head #controlbox-tabs li a:hover {
color: #6C4C44; } color: #6C4C44; }
#conversejs div#chatrooms { #conversejs div#chatrooms {
overflow-y: auto; } overflow-y: auto; }
#conversejs form.sendXMPPMessage { #conversejs form.sendXMPPMessage {
...@@ -1716,76 +1755,73 @@ ...@@ -1716,76 +1755,73 @@
padding: 3px; padding: 3px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
resize: none; resize: none; }
height: 59px; } #conversejs .chat-toolbar {
#conversejs .chatroom .chat-textarea {
border-bottom-right-radius: 0; }
#conversejs ul.chat-toolbar {
font-size: 14px; font-size: 14px;
margin: 0; margin: 0;
padding: 0 5px 0 0; padding: 0 5px 0 0;
height: 20px; height: 20px;
display: block; } display: block; }
#conversejs .chat-toolbar .toggle-participants, #conversejs .chat-toolbar a {
#conversejs .chat-toolbar .toggle-clear, color: #436F64; }
#conversejs .chat-toolbar .toggle-otr { #conversejs .chat-toolbar .unencrypted a,
float: right; } #conversejs .chat-toolbar .unencrypted {
#conversejs .chat-toolbar a { color: #8f2831; }
color: #6C4C44; } #conversejs .chat-toolbar .unverified a,
#conversejs .chat-toolbar ul { #conversejs .chat-toolbar .unverified {
display: none; color: #cf5300; }
font-size: 12px; #conversejs .chat-toolbar .private a,
position: absolute; #conversejs .chat-toolbar .private {
bottom: 100%; color: #4b7003; }
margin: 0 0 1px 0; #conversejs .chat-toolbar .toggle-participants,
right: 0; #conversejs .chat-toolbar .toggle-clear,
background: #fff; #conversejs .chat-toolbar .toggle-otr {
box-shadow: 0 -1px 2px 0 rgba(0, 0, 0, 0.4); } float: right; }
#conversejs .chat-toolbar ul li { #conversejs .chat-toolbar li {
position: relative; display: inline-block;
list-style: none; list-style: none;
cursor: pointer; } padding: 0 3px 0 3px;
#conversejs .chat-toolbar ul li a:hover { cursor: pointer;
color: #8f2831; } margin-top: 1px; }
#conversejs .chat-toolbar .toggle-smiley { #conversejs .chat-toolbar li:hover {
padding-left: 5px; } cursor: pointer; }
#conversejs .chat-toolbar .toggle-smiley ul li { #conversejs .chat-toolbar ul {
font-size: 14px; background: #fff;
padding: 5px; bottom: 100%;
z-index: 98; } box-shadow: 0 -1px 2px 0 rgba(0, 0, 0, 0.4);
#conversejs .chat-toolbar .toggle-otr ul li { display: none;
background-color: white; font-size: 12px;
display: block; margin: 0 0 1px 0;
z-index: 99; } position: absolute;
#conversejs .chat-toolbar ul li:hover { right: 0; }
background-color: #E3C9C1; } #conversejs .chat-toolbar ul li {
#conversejs .chat-toolbar .toggle-otr ul li a { cursor: pointer;
transition: background-color 0.2s ease-in-out; list-style: none;
-webkit-transition: background-color 0.2s ease-in-out; position: relative; }
-moz-transition: background-color 0.2s ease-in-out; #conversejs .chat-toolbar ul li a:hover {
display: block; color: #8f2831; }
padding: 1px; #conversejs .chat-toolbar .toggle-smiley {
text-decoration: none; } padding-left: 5px; }
#conversejs .chat-toolbar .toggle-smiley ul li {
font-size: 14px;
padding: 5px;
z-index: 98; }
#conversejs .chat-toolbar .toggle-smiley ul li:hover {
background-color: #E3C9C1; }
#conversejs .chat-toolbar .toggle-otr ul li {
background-color: white;
display: block;
z-index: 99; }
#conversejs .chat-toolbar .toggle-otr ul li a {
-moz-transition: background-color 0.2s ease-in-out;
-webkit-transition: background-color 0.2s ease-in-out;
transition: background-color 0.2s ease-in-out;
display: block;
padding: 1px;
text-decoration: none; }
#conversejs .chat-toolbar-text { #conversejs .chat-toolbar-text {
font-size: 12px; font-size: 12px;
padding-right: 3px; } padding-right: 3px; }
#conversejs .unencrypted a,
#conversejs .unencrypted {
color: #8f2831; }
#conversejs .unverified a,
#conversejs .unverified {
color: #cf5300; }
#conversejs .private a,
#conversejs .private {
color: #4b7003; }
#conversejs ul.chat-toolbar li {
display: inline-block;
list-style: none;
padding: 0 3px 0 3px;
cursor: pointer;
margin-top: 1px; }
#conversejs ul.chat-toolbar li:hover {
cursor: pointer; }
#conversejs form#set-custom-xmpp-status { #conversejs form#set-custom-xmpp-status {
float: left; float: left;
padding: 0; } padding: 0; }
...@@ -1799,63 +1835,36 @@ ...@@ -1799,63 +1835,36 @@
padding: 1px 2px 1px 1px; } padding: 1px 2px 1px 1px; }
#conversejs #controlbox { #conversejs #controlbox {
display: none; } display: none; }
#conversejs #controlbox div.xmpp-status { #conversejs #controlbox div.xmpp-status {
display: inline; } display: inline; }
#conversejs .chatbox dl.dropdown { #conversejs .chatbox .dropdown {
margin: 0.5em; margin: 0.5em;
background-color: #F1E2DD; } background-color: #F1E2DD; }
#conversejs .chatbox .dropdown dd {
position: relative; }
#conversejs .chatbox .dropdown dd, #conversejs .chatbox .dropdown dd,
#conversejs .dropdown dt, #conversejs .dropdown dt,
#conversejs .dropdown ul { #conversejs .dropdown ul {
margin: 0; margin: 0;
padding: 0; } padding: 0; }
#conversejs .chatbox .dropdown dd { #conversejs .custom-xmpp-status {
position: relative; }
#conversejs input.custom-xmpp-status {
width: 124px; } width: 124px; }
#conversejs form.add-xmpp-contact { #conversejs .add-xmpp-contact {
background: none; background: none;
padding: 5px; } padding: 5px; }
#conversejs form.add-xmpp-contact input { #conversejs .add-xmpp-contact input {
margin: 0 0 1rem; } margin: 0 0 1rem; }
#conversejs form.add-xmpp-contact button { #conversejs .add-xmpp-contact button {
width: 100%; } width: 100%; }
#conversejs .chatbox .dropdown dt a span {
cursor: pointer;
display: block;
padding: 4px 7px 0 5px; }
#conversejs .chatbox .dropdown dd ul {
padding: 5px 0 5px 0;
list-style: none;
position: absolute;
left: 0;
top: 0;
border: 1px solid #F1DCD6;
border-top: 0;
width: 99%;
z-index: 21;
background-color: #F1E2DD; }
#conversejs .chatbox .dropdown li {
list-style: none;
padding-left: 0; }
#conversejs .chatbox .dropdown a {
height: 22px;
width: 148px;
display: inline-block;
line-height: 24px; }
#conversejs .chatbox .dropdown dd ul li:hover {
background-color: #E3C9C1; }
#conversejs .chatbox .dropdown dd.search-xmpp ul li:hover {
background-color: #F1E2DD; }
#conversejs .xmpp-status-menu { #conversejs .xmpp-status-menu {
text-align: left; } text-align: left; }
#conversejs .xmpp-status-menu li a { #conversejs .xmpp-status-menu li a {
width: 100%; } width: 100%; }
#conversejs .xmpp-status-menu li a span {
padding: 0 5px 0 5px; }
#conversejs .xmpp-status-menu li a.logout, #conversejs .xmpp-status-menu li a.logout,
#conversejs .xmpp-status-menu li a.logout span { #conversejs .xmpp-status-menu li a.logout span {
color: #681F2C; } color: #681F2C; }
#conversejs .xmpp-status-menu li a span {
padding: 0 5px 0 5px; }
#conversejs .set-xmpp-status .dropdown dd ul { #conversejs .set-xmpp-status .dropdown dd ul {
z-index: 22; } z-index: 22; }
#conversejs .minimized-chats-flyout, #conversejs .minimized-chats-flyout,
...@@ -1874,18 +1883,14 @@ ...@@ -1874,18 +1883,14 @@
position: absolute; position: absolute;
height: auto; height: auto;
width: 130px; } width: 130px; }
#conversejs .minimized-chats-flyout .chat-head-chatroom,
#conversejs .minimized-chats-flyout .chat-head {
border-radius: 4px;
width: 130px;
height: 25px;
margin-bottom: 1px; }
#conversejs .minimized-chats-flyout.minimized { #conversejs .minimized-chats-flyout.minimized {
height: auto; } height: auto; }
#conversejs .minimized-chats-flyout .chat-head-chatroom,
#conversejs .minimized-chats-flyout .chat-head {
border-radius: 4px;
width: 130px;
height: 25px;
margin-bottom: 1px; }
#conversejs .chatbox .box-flyout {
width: 200px; }
#conversejs .chatroom .box-flyout {
width: 300px; }
#conversejs .dragresize { #conversejs .dragresize {
position: absolute; position: absolute;
width: 200px; width: 200px;
......
mockup/index.html
View file @ 5c9a7c25
...@@ -30,17 +30,33 @@ ...@@ -30,17 +30,33 @@
<div class="dragresize dragresize-tm"></div> <div class="dragresize dragresize-tm"></div>
<div class="chat-head controlbox-head"> <div class="chat-head controlbox-head">
<ul id="controlbox-tabs"> <ul id="controlbox-tabs">
<li><a class="current" href="#login">Sign in</a></li> <li><a class="current" href="#login-dialog">Sign in</a></li>
<li><a class="s" href="#register">Register</a></li>
</ul> </ul>
<a class="close-chatbox-button icon-close"></a> <a class="close-chatbox-button icon-close"></a>
</div> </div>
<div id="login-dialog"> <div class="controlbox-panes">
<form id="converse-login"> <div id="login-dialog" class="controlbox-pane"><form id="converse-login" method="post">
<label>XMPP/Jabber Username:</label><input type="text" id="jid"> <label>XMPP Username:</label>
<label>Password:</label><input type="password" id="password"> <input type="username" name="jid" placeholder="user@server">
<input class="login-submit" type="submit" value="Log In"> <label>Password:</label>
<input type="password" name="password" placeholder="password">
<input class="submit" type="submit" value="Log In">
<span class="conn-feedback"></span>
</form> </form>
<span class="conn-feedback"></span> </div>
<div id="register" class="controlbox-pane" style="display: none;">
<form id="converse-register">
<span class="reg-feedback"></span>
<label>Your XMPP provider's domain name:</label>
<input type="text" name="domain" placeholder=" e.g. conversejs.org">
<p class="form-help">
Tip: A list of public XMPP providers is available
<a href="https://xmpp.net/directory.php" class="url" target="_blank">here</a>.
</p>
<input class="submit" type="submit" value="Fetch registration form">
</form>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -115,11 +131,13 @@ ...@@ -115,11 +131,13 @@
</dd> </dd>
</dl> </dl>
<div id="converse-roster"> <div id="converse-roster">
<input class="roster-filter" placeholder="Type to filter"> <span class="roster-filter-group">
<select class="filter-type"> <input class="roster-filter" placeholder="Type to filter">
<option value="contacts">Contacts</option> <select class="filter-type">
<option value="groups">Groups</option> <option value="contacts">Contacts</option>
</select> <option value="groups">Groups</option>
</select>
</span>
<dl class="roster-contacts" style="display: block;"> <dl class="roster-contacts" style="display: block;">
<dt class="roster-group" style="display: block;"> <dt class="roster-group" style="display: block;">
<a href="#" data-group="Colleagues" class="group-toggle icon-opened" title="Click to hide these contacts">Colleagues</a> <a href="#" data-group="Colleagues" class="group-toggle icon-opened" title="Click to hide these contacts">Colleagues</a>
...@@ -301,6 +319,7 @@ ...@@ -301,6 +319,7 @@
<span class="chat-message-content">Another message to check that scrolling works.</span> <span class="chat-message-content">Another message to check that scrolling works.</span>
</div> </div>
</div> </div>
<form class="sendXMPPMessage" action="" method="post"> <form class="sendXMPPMessage" action="" method="post">
<ul class="chat-toolbar no-text-select"> <ul class="chat-toolbar no-text-select">
<li class="toggle-smiley icon-happy" title="Insert a smilery"> <li class="toggle-smiley icon-happy" title="Insert a smilery">
...@@ -321,13 +340,11 @@ ...@@ -321,13 +340,11 @@
</ul> </ul>
</li> </li>
<li class="toggle-clear"><a class="icon-remove" title="Clear all messages"></a></li> <li class="toggle-clear"><a class="icon-remove" title="Clear all messages"></a></li>
<li class="toggle-otr unencrypted" title="Turn on 'off-the-record' chat encryption"> <li class="toggle-otr unencrypted" title="Your messages are not encrypted. Click here to enable OTR encryption.">
<span class="chat-toolbar-text">unencrypted</span> <span class="chat-toolbar-text">unencrypted</span>
<span class="icon-unlocked"></span> <span class="icon-unlocked"></span>
<ul> <ul>
<li><a href="#">Start private conversation</a></li> <li><a class="start-otr" href="#">Start encrypted conversation</a></li>
<li><a href="#">End private conversation</a></li>
<li><a href="#">Authenticate buddy</a></li>
<li><a href="http://www.cypherpunks.ca/otr/help/3.2.0/levels.php" target="_blank">What's this?</a></li> <li><a href="http://www.cypherpunks.ca/otr/help/3.2.0/levels.php" target="_blank">What's this?</a></li>
</ul> </ul>
</li> </li>
...@@ -434,7 +451,8 @@ ...@@ -434,7 +451,8 @@
<form class="chatroom-form"> <form class="chatroom-form">
<!-- TODO: Make this a long form that scrolls --> <!-- TODO: Make this a long form that scrolls -->
<legend>This chatroom requires a password</legend> <legend>This chatroom requires a password</legend>
<label>Password: <input type="password" name="password"></label> <label>Password:</label>
<input type="password" name="password">
</form> </form>
</div> </div>
</div> </div>
......
sass/converse.scss
View file @ 5c9a7c25
...@@ -51,6 +51,9 @@ ...@@ -51,6 +51,9 @@
$chat-head-height: 40px; $chat-head-height: 40px;
$save-button-color: #436F64; $save-button-color: #436F64;
$font-size: 14px;
$legend-font-size: 16px;
a, a:visited { a, a:visited {
text-decoration: none; text-decoration: none;
color: $link-color; color: $link-color;
...@@ -72,6 +75,14 @@ ...@@ -72,6 +75,14 @@
vertical-align: baseline; vertical-align: baseline;
} }
textarea,
input[type=text], input[type=password],
button {
font-size: $font-size;
padding: 0.5em;
min-height: 0;
}
strong { strong {
font-weight: 700; font-weight: 700;
} }
...@@ -91,7 +102,7 @@ ...@@ -91,7 +102,7 @@
color: $text-color; color: $text-color;
font-size: 14px; font-size: $font-size;
bottom: 0; bottom: 0;
direction: ltr; direction: ltr;
height: 25px; height: 25px;
...@@ -233,7 +244,7 @@ ...@@ -233,7 +244,7 @@
} }
.emoticon { .emoticon {
font-size: 14px; font-size: $font-size;
} }
.hidden { .hidden {
...@@ -262,10 +273,7 @@ ...@@ -262,10 +273,7 @@
} }
.spinner { .spinner {
-webkit-animation: spin 2s infinite linear; @include animation(spin 2s infinite, linear);
-moz-animation: spin 2s infinite linear;
-o-animation: spin 2s infinite linear;
animation: spin 2s infinite linear;
display: block; display: block;
text-align: center; text-align: center;
margin: 5px; margin: 5px;
...@@ -283,24 +291,6 @@ ...@@ -283,24 +291,6 @@
margin: 0 auto; margin: 0 auto;
} }
#minimized-chats .box-flyout {
position: absolute;
display: block;
height: auto;
bottom: 25px;
margin-left: 0;
}
#minimized-chats .box-flyout .chat-head {
font-size: 100%;
border-radius: 4px;
padding: 3px 0 0 5px;
margin: 0 0 1px 0;
box-shadow: 1px 3px 5px 3px rgba(0, 0, 0, 0.4);
height: 24px;
width: 130px;
}
#minimized-chats, #minimized-chats,
.toggle-controlbox { .toggle-controlbox {
float: right; float: right;
...@@ -319,6 +309,24 @@ ...@@ -319,6 +309,24 @@
width: 130px; width: 130px;
padding: 0; padding: 0;
display: none; display: none;
.box-flyout {
position: absolute;
display: block;
height: auto;
bottom: 25px;
margin-left: 0;
.chat-head {
font-size: 100%;
border-radius: 4px;
padding: 3px 0 0 5px;
margin: 0 0 1px 0;
box-shadow: 1px 3px 5px 3px rgba(0, 0, 0, 0.4);
height: 24px;
width: 130px;
}
}
} }
#toggle-minimized-chats { #toggle-minimized-chats {
...@@ -328,11 +336,11 @@ ...@@ -328,11 +336,11 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
color: #0f0f0f; color: #0f0f0f;
}
#toggle-minimized-chats .unread-message-count { .unread-message-count {
right: 5px; right: 5px;
bottom: 5px; bottom: 5px;
}
} }
.toggle-controlbox, .toggle-controlbox,
...@@ -354,43 +362,32 @@ ...@@ -354,43 +362,32 @@
height: 289px; height: 289px;
@include calc(height, '100% - #{$chat-head-height}'); @include calc(height, '100% - #{$chat-head-height}');
border-top: 0; border-top: 0;
} p {
font-size: $font-size;
.chatroom .chat-area { color: $text-color;
float: left; padding: 5px;
height: 100%; margin: 0;
width: 200px; }
}
.chatroom .participants {
float: right;
background-color: white;
overflow-y: auto;
overflow-x: hidden;
border-left: 1px solid #AAA;
border-bottom-right-radius: 4px;
width: 100px;
height: 100%;
} }
.tt-highlight { .tt-highlight {
background-color: #00230F; background-color: #00230F;
} }
div.tt-suggestion p:hover .tt-highlight { .tt-suggestion {
background-color: #00230F; p {
background: #27774A; color: white;
} text-shadow: rgba(0, 0, 0, 0.51) 0 -1px 0;
cursor: pointer;
div.tt-suggestion p:hover { font-size: 11px;
background-color: #00230F; }
} p:hover {
background-color: #00230F;
div.tt-suggestion p { .tt-highlight {
color: white; background-color: #00230F;
text-shadow: rgba(0, 0, 0, 0.51) 0 -1px 0; background: #27774A;
cursor: pointer; }
font-size: 11px; }
} }
.tt-dropdown-menu { .tt-dropdown-menu {
...@@ -405,47 +402,26 @@ ...@@ -405,47 +402,26 @@
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
} }
.chatroom div.participants label { .participants {
font-style: italic; label {
} margin-top: 5px;
display: block;
.chatroom label { }
margin-left: 2px; .participant-list {
font-size: 12px; li {
} overflow: hidden;
text-overflow: ellipsis;
.chatroom .invited-contact { white-space: nowrap;
margin: 0; display: block;
width: 99px; font-size: 12px;
border: 1px solid #999; font-weight: bold;
} padding: 0.5em 0 0 0.5em;
cursor: default;
.chatroom .invited-contact.tt-input { }
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gkBCjE0uzKkOgAAAidJREFUKM+N0k+IEnEUB/D3cyscdagkWpHV0WGWREXm0AgOGkSJ07kh2UXYU5cOewm6Bp0KXG/tpSCv6hyEFQIhMEaE3yERYfwTOoqKGLQxDAbqYadLgu7J7/XxeY/3ez8EACDLsgljfMfj8ZxUKhXXYDAAnueBoqgyAMipVOovXAuSZdnUaDQeDofDs16vFyUIAjRNUwmCoG02G1AUdZ5IJN7GYrHfm3AvEAjcnUwmX0ajUdRqtV74fL6sruufKYoa6bp+fzabPUMI7ZfL5eImNHk8npNerxc1m80XHMe98fv9H3K5XDkSibxjWfb1arWaYoyPMMbCFqxUKi6CIODw8LDmdDq7oigaAACiKK5omv7KcdylpmlIkiTHFlRVFTRNUxVFqa/ROqIoGoqi5A3DgFartfU4Jp7ngSAI2uVyPZIk6dZmUZKk2w6H4xghBPF4HK7vWLbZbDCdTp+rqvpUkiS0RvV6/bTf7x8wDHMViURqm/AGAMgURZ232+1X1Wr102KxuEwmk3lZlo/7/f7BcrkkSZKs2e12tHXH/x/gHsY4jTE+0jQNGYYBCCFgGOaKJMkfjUaDZximGQ6HXzSbzZ+ZTMbY6oIxFgqFgqPT6YAgCMBxXM1ut6N0Op0fj8chi8XyjWXZ98Fg8DuCHZLNZh+USqWP8/n8idvt/hUKhV7u7QK9Xu8fmqanAJBQVXUfAGY7TQQAKBaLN8fjsdDtdh/run72Dzhf7XLe2UevAAAAAElFTkSuQmCC ) no-repeat right 3px center; li.moderator {
} color: #8f2831;
}
.participants label { }
margin-top: 5px;
display: block;
}
.participants ul.participant-list li {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: block;
font-size: 12px;
font-weight: bold;
padding: 0.5em 0 0 0.5em;
cursor: default;
}
ul.participant-list li.moderator {
color: #8f2831;
}
.chatroom .participant-list {
list-style: none;
} }
.chat-blink { .chat-blink {
...@@ -526,44 +502,48 @@ ...@@ -526,44 +502,48 @@
padding-top: 10px; padding-top: 10px;
} }
p.not-implemented { .not-implemented {
margin-top: 3em; margin-top: 3em;
margin-left: 0.3em; margin-left: 0.3em;
color: #808080; color: #808080;
} }
div.mentioned { .mentioned {
font-weight: bold; font-weight: bold;
} }
div.delayed .chat-message-them { .delayed {
color: #FB5D50; .chat-message-them {
} color: #FB5D50;
}
div.delayed .chat-message-me { .chat-message-me {
color: #7EABBB; color: #7EABBB;
} }
input.error {
border: 1px solid red;
} }
.error { .error {
color: red; color: red;
} }
input.error {
#converse-register .provider-title { border: 1px solid red;
font-size: 115%;
}
#converse-register .provider-score {
width: 178px;
margin-bottom: 8px;
} }
#converse-register .form-help .url { #converse-register {
font-weight: bold; .form-errors {
color: $link-color; color: red;
display: none;
}
.provider-title {
font-size: 115%;
}
.provider-score {
width: 178px;
margin-bottom: 8px;
}
.form-help .url {
font-weight: bold;
color: $link-color;
}
} }
.reg-feedback { .reg-feedback {
...@@ -614,29 +594,25 @@ ...@@ -614,29 +594,25 @@
border-top-left-radius: 4px; border-top-left-radius: 4px;
padding: 2px 2px 2px 4px; padding: 2px 2px 2px 4px;
margin: 0; margin: 0;
.avatar {
float: left;
}
} }
.chat-head .avatar {
float: left;
}
.chat-head-chatbox, .chat-head-chatbox,
.chat-head-chatroom { .chat-head-chatroom {
height: $chat-head-height; height: $chat-head-height;
position: relative; position: relative;
padding: 3px; padding: 3px;
} }
.chat-head-chatroom { .chat-head-chatroom {
background-color: $chatroom-head-color; background-color: $chatroom-head-color;
} }
.chat-head-chatbox { .chat-head-chatbox {
background-color: $chat-head-color; background-color: $chat-head-color;
} }
p.user-custom-message, .user-custom-message,
p.chatroom-topic { .chatroom-topic {
color: white; color: white;
font-size: 80%; font-size: 80%;
font-style: italic; font-style: italic;
...@@ -665,30 +641,28 @@ ...@@ -665,30 +641,28 @@
border: 1px solid $light-background-border-color; border: 1px solid $light-background-border-color;
height: 22px; height: 22px;
text-align: left; text-align: left;
}
.fancy-dropdown a.choose-xmpp-status { .choose-xmpp-status {
width: 155px; width: 155px;
} span {
padding-right: 5px;
.fancy-dropdown a.choose-xmpp-status, padding-left: 5px;
.fancy-dropdown a.toggle-xmpp-contact-form { float: left;
text-shadow: 0 1px 0 #ffffff; }
overflow: hidden; }
text-overflow: ellipsis; .choose-xmpp-status,
white-space: nowrap; .toggle-xmpp-contact-form {
display: inline; text-shadow: 0 1px 0 #ffffff;
} overflow: hidden;
text-overflow: ellipsis;
.fancy-dropdown a.toggle-xmpp-contact-form span { white-space: nowrap;
float: left; display: inline;
}
.toggle-xmpp-contact-form span {
float: left;
}
} }
.choose-xmpp-status span {
padding-right: 5px;
padding-left: 5px;
float: left;
}
#fancy-xmpp-status-select a.change-xmpp-status-message { #fancy-xmpp-status-select a.change-xmpp-status-message {
float: right; float: right;
...@@ -708,10 +682,9 @@ ...@@ -708,10 +682,9 @@
margin: 0; margin: 0;
padding-left: 5px; padding-left: 5px;
padding: 0 0 5px 5px; padding: 0 0 5px 5px;
} input {
width: 8em;
form.search-xmpp-contact input { }
width: 8em;
} }
.controlbox-head { .controlbox-head {
...@@ -773,40 +746,32 @@ ...@@ -773,40 +746,32 @@
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
} }
.chat-body p { .chatroom-form {
font-size: 14px; padding: 1em;
color: $text-color; .instructions {
padding: 5px; color: gray;
margin: 0; font-size: 95%;
} }
input {
.chatroom-form legend { width: 100%;
font-size: 14px; padding: 5px;
font-weight: bold; text-align: center;
margin: 5px 0; }
} legend {
font-size: $legend-font-size;
.chatroom-form label { font-weight: bold;
height: 30px; margin: 10px 0 15px 0;
font-weight: bold; }
display: block; label {
clear: both; height: 30px;
} font-weight: bold;
display: block;
.chatroom-form label input, clear: both;
.chatroom-form label select {
float: right; label input, label select {
} float: right;
}
#converse-roster dd.odd { }
background-color: #DCEAC5;
/* Make this difference */
}
#converse-roster dd.current-xmpp-contact span {
font-size: 16px;
float: left;
color: $link-color;
} }
.requesting-xmpp-contact .request-actions { .requesting-xmpp-contact .request-actions {
...@@ -814,15 +779,6 @@ ...@@ -814,15 +779,6 @@
float: right; float: right;
} }
#converse-roster span.req-contact-name {
width: 65%;
}
#converse-roster span.pending-contact-name,
#converse-roster a.open-chat {
width: 80%;
}
#converse-roster { #converse-roster {
text-align: left; text-align: left;
width: 100%; width: 100%;
...@@ -831,55 +787,96 @@ ...@@ -831,55 +787,96 @@
height: 194px; height: 194px;
height: calc(100% - 68px); height: calc(100% - 68px);
overflow: hidden; overflow: hidden;
}
#converse-roster .roster-filter-group {
display: table;
}
#converse-roster .filter-type { .roster-filter-group {
display: table-cell; display: table;
height: 24px; }
padding: 0; .filter-type {
margin: 0 0 0.5em -2px; display: table-cell;
display: inline-block; height: 24px;
width: 85px; padding: 0;
} margin: 0 0 0.5em -2px;
display: inline-block;
#converse-roster .roster-filter { width: 85px;
display: table-cell; font-size: $font-size;
padding: 2px; }
margin: 0 0 0.5em 6px; .roster-filter {
width: 104px; display: table-cell;
height: 24px; padding: 2px;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg== ) no-repeat right -20px center; margin: 0 0 0.5em 6px;
border: 1px solid #999; width: 104px;
display: inline-block; height: 24px;
} background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg== ) no-repeat right -20px center;
border: 1px solid #999;
/* (jQ addClass:) if input has value: */ display: inline-block;
#converse-roster .roster-filter.x { }
background-position: right 3px center; /* (jQ addClass:) if input has value: */
} .roster-filter.x {
background-position: right 3px center;
/* (jQ addClass:) if mouse is over the 'x' input area*/ }
#converse-roster .roster-filter.onX { /* (jQ addClass:) if mouse is over the 'x' input area*/
cursor: pointer; .roster-filter.onX {
} cursor: pointer;
}
#converse-roster .roster-contacts { .roster-contacts {
margin: 0; margin: 0;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
max-height: 195px; max-height: 195px;
max-height: calc(100% - 26px); max-height: calc(100% - 26px);
padding-bottom: 15px; padding-bottom: 15px;
} }
.group-toggle {
#converse-roster .group-toggle { color: $text-color;
color: $text-color; display: block;
display: block; width: 100%;
width: 100%; }
dt {
display: none;
}
dd {
line-height: 16px;
a, span {
text-shadow: 0 1px 0 $link-shadow-color;
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-left: 3px;
}
span {
padding: 0 5px 0 0;
margin-left: 3px;
}
a.decline-xmpp-request {
margin-left: 5px;
}
a.remove-xmpp-contact {
float: right;
width: 22px;
margin: 0;
display: none;
color: $text-color;
}
}
dd:hover a.remove-xmpp-contact {
display: inline-block;
}
dd.odd {
background-color: #DCEAC5;
/* Make this difference */
}
dd.current-xmpp-contact span {
font-size: 16px;
float: left;
color: $link-color;
}
span.req-contact-name {
width: 65%;
}
span.pending-contact-name, a.open-chat {
width: 80%;
}
} }
dd.available-chatroom { dd.available-chatroom {
...@@ -906,10 +903,6 @@ ...@@ -906,10 +903,6 @@
text-shadow: 0 1px 0 $text-shadow-color; text-shadow: 0 1px 0 $text-shadow-color;
} }
#converse-roster dt {
display: none;
}
.room-info { .room-info {
font-size: 11px; font-size: 11px;
font-style: normal; font-style: normal;
...@@ -966,47 +959,12 @@ ...@@ -966,47 +959,12 @@
overflow-y: hidden; overflow-y: hidden;
} }
#converse-roster dd {
line-height: 16px;
}
.roster-group:hover, .roster-group:hover,
dd.available-chatroom:hover, dd.available-chatroom:hover,
#converse-roster dd:hover { #converse-roster dd:hover {
background-color: $highlight-color; background-color: $highlight-color;
} }
#converse-roster dd a,
#converse-roster dd span {
text-shadow: 0 1px 0 $link-shadow-color;
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-left: 3px;
}
#converse-roster dd span {
padding: 0 5px 0 0;
margin-left: 3px;
}
#converse-roster dd a.decline-xmpp-request {
margin-left: 5px;
}
#converse-roster dd a.remove-xmpp-contact {
float: right;
width: 22px;
margin: 0;
display: none;
color: $text-color;
}
#converse-roster dd:hover a.remove-xmpp-contact {
display: inline-block;
}
.chatbox, .chatbox,
.chatroom { .chatroom {
height: 25px; height: 25px;
...@@ -1017,10 +975,91 @@ ...@@ -1017,10 +975,91 @@
.chatbox { .chatbox {
width: 200px; width: 200px;
.box-flyout {
width: 200px;
}
.dropdown {
a {
height: 22px;
width: 148px;
display: inline-block;
line-height: 24px;
}
li {
list-style: none;
padding-left: 0;
}
dd {
ul {
padding: 5px 0 5px 0;
list-style: none;
position: absolute;
left: 0;
top: 0;
border: 1px solid $light-background-border-color;
border-top: 0;
width: 99%;
z-index: 21;
background-color: $light-background-color;
li:hover {
background-color: $highlight-color;
}
}
}
dd.search-xmpp ul li:hover {
background-color: $light-background-color;
}
dt a span {
cursor: pointer;
display: block;
padding: 4px 7px 0 5px;
}
}
} }
.chatroom { .chatroom {
width: 300px; width: 300px;
label {
margin-left: 2px;
font-size: 12px;
}
.box-flyout {
width: 300px;
}
.participant-list {
list-style: none;
}
.chat-textarea {
border-bottom-right-radius: 0;
}
.chat-area {
float: left;
height: 100%;
width: 200px;
}
.invited-contact {
margin: 0;
width: 99px;
border: 1px solid #999;
}
.invited-contact.tt-input {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gkBCjE0uzKkOgAAAidJREFUKM+N0k+IEnEUB/D3cyscdagkWpHV0WGWREXm0AgOGkSJ07kh2UXYU5cOewm6Bp0KXG/tpSCv6hyEFQIhMEaE3yERYfwTOoqKGLQxDAbqYadLgu7J7/XxeY/3ez8EACDLsgljfMfj8ZxUKhXXYDAAnueBoqgyAMipVOovXAuSZdnUaDQeDofDs16vFyUIAjRNUwmCoG02G1AUdZ5IJN7GYrHfm3AvEAjcnUwmX0ajUdRqtV74fL6sruufKYoa6bp+fzabPUMI7ZfL5eImNHk8npNerxc1m80XHMe98fv9H3K5XDkSibxjWfb1arWaYoyPMMbCFqxUKi6CIODw8LDmdDq7oigaAACiKK5omv7KcdylpmlIkiTHFlRVFTRNUxVFqa/ROqIoGoqi5A3DgFartfU4Jp7ngSAI2uVyPZIk6dZmUZKk2w6H4xghBPF4HK7vWLbZbDCdTp+rqvpUkiS0RvV6/bTf7x8wDHMViURqm/AGAMgURZ232+1X1Wr102KxuEwmk3lZlo/7/f7BcrkkSZKs2e12tHXH/x/gHsY4jTE+0jQNGYYBCCFgGOaKJMkfjUaDZximGQ6HXzSbzZ+ZTMbY6oIxFgqFgqPT6YAgCMBxXM1ut6N0Op0fj8chi8XyjWXZ98Fg8DuCHZLNZh+USqWP8/n8idvt/hUKhV7u7QK9Xu8fmqanAJBQVXUfAGY7TQQAKBaLN8fjsdDtdh/run72Dzhf7XLe2UevAAAAAElFTkSuQmCC ) no-repeat right 3px center;
}
div.participants {
float: right;
background-color: white;
overflow-y: auto;
overflow-x: hidden;
border-left: 1px solid #AAA;
border-bottom-right-radius: 4px;
width: 100px;
height: 100%;
label {
font-style: italic;
}
}
} }
.chatroom-form, .chatroom-form,
...@@ -1030,23 +1069,25 @@ ...@@ -1030,23 +1069,25 @@
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
border: 0; border: 0;
font-size: 14px; font-size: $font-size;
height: 289px; height: 289px;
@include calc(height, '100% - #{$chat-head-height}'); @include calc(height, '100% - #{$chat-head-height}');
overflow-y: auto; overflow-y: auto;
padding: 5px 0;
position: absolute; position: absolute;
width: 100%; width: 100%;
} }
.controlbox-pane dd { .controlbox-pane {
margin-left: 0; padding: 5px 0;
margin-bottom: 0; dd {
margin-left: 0;
margin-bottom: 0;
}
dd.odd {
background-color: #DCEAC5;
}
} }
.controlbox-pane dd.odd {
background-color: #DCEAC5;
}
#converse-register .title { #converse-register .title {
font-weight: bold; font-weight: bold;
...@@ -1065,11 +1106,6 @@ ...@@ -1065,11 +1106,6 @@
font-size: 85%; font-size: 85%;
} }
.chatroom-form .instructions {
color: gray;
font-size: 95%;
}
.form-help:hover, .form-help:hover,
#converse-register .instructions:hover { #converse-register .instructions:hover {
color: $text-color; color: $text-color;
...@@ -1079,36 +1115,31 @@ ...@@ -1079,36 +1115,31 @@
padding-top: 5px; padding-top: 5px;
} }
#converse-register .form-errors {
color: red;
display: none;
}
#converse-register, #converse-register,
#converse-login { #converse-login {
background: white; background: white;
padding: 1em 0.5em; padding: 1em;
} }
#converse-register input, #converse-register input,
#converse-login input { #converse-login input {
width: 178px; width: 100%;
height: 30px; height: 30px;
} }
#converse-register .input-group { #converse-register {
display: table; .input-group {
margin: auto; display: table;
width: 178px; margin: auto;
} width: 178px;
}
#converse-register .input-group span, .input-group span,
#converse-register .input-group input[name=username] { .input-group input[name=username] {
display: table-cell; display: table-cell;
} }
.input-group input[name=username] {
#converse-register .input-group input[name=username] { width: 100%;
width: 100%; }
} }
#converse-register .cancel, #converse-register .cancel,
...@@ -1130,19 +1161,13 @@ ...@@ -1130,19 +1161,13 @@
margin: 5px 3px 5px 3px; margin: 5px 3px 5px 3px;
} }
.chatroom-form input {
width: 80%;
padding: 5px;
text-align: center;
}
.chatroom-form label, .chatroom-form label,
.controlbox-pane label, .controlbox-pane label,
#converse-register label, #converse-register label,
#converse-login label { #converse-login label {
height: auto; height: auto;
font-size: 14px; font-size: $font-size;
margin-top: 2px; margin: 4px;
font-weight: bold; font-weight: bold;
} }
...@@ -1150,8 +1175,9 @@ ...@@ -1150,8 +1175,9 @@
#converse-login .login-submit, #converse-login .login-submit,
#converse-register .submit, #converse-register .submit,
#converse-login .submit { #converse-login .submit {
margin-top: 1em;
height: 30px; height: 30px;
padding: 0px;
font-size: $font-size;
} }
form.set-xmpp-status { form.set-xmpp-status {
...@@ -1163,17 +1189,16 @@ ...@@ -1163,17 +1189,16 @@
form.add-chatroom { form.add-chatroom {
background: none; background: none;
padding: 8px; padding: 8px;
}
form.add-chatroom input[type=button], input[type=button],
form.add-chatroom input[type=submit], input[type=submit],
form.add-chatroom input[type=text] { input[type=text] {
margin: 3px 0; margin: 3px 0;
width: 100%; width: 100%;
} }
input[type=submit] {
form.add-chatroom input[type=submit] { color: $save-button-color;
color: $save-button-color; }
} }
select#select-xmpp-status { select#select-xmpp-status {
...@@ -1182,53 +1207,53 @@ ...@@ -1182,53 +1207,53 @@
} }
/* @group Tabs */ /* @group Tabs */
.chat-head #controlbox-tabs { .chat-head {
text-align: center; #controlbox-tabs {
display: inline; text-align: center;
overflow: hidden; display: inline;
font-size: 12px; overflow: hidden;
list-style-type: none; font-size: 12px;
} list-style-type: none;
/* single tab */ a.current,
.chat-head #controlbox-tabs li { a.current:hover {
float: left; box-shadow: none;
list-style: none; border-bottom: 0;
padding-left: 0; height: $chat-head-height;
text-shadow: white 0 1px 0; cursor: default;
width: 38%; color: $text-color;
} }
ul#controlbox-tabs li a { /* single tab */
display: block; li {
font-size: 12px; float: left;
height: $chat-head-height - 1px; list-style: none;
line-height: $chat-head-height - 1px; padding-left: 0;
margin: 0; text-shadow: white 0 1px 0;
text-align: center; width: 38%;
text-decoration: none;
border-top-right-radius: 4px; a {
border-top-left-radius: 4px; background-color: white;
color: #888; border-bottom: 1px solid $border-color;
} border-top-left-radius: 4px;
border-top-right-radius: 4px;
box-shadow: inset 0 4px 12px rgba(0, 0, 0, 0.3);
color: #888;
display: block;
font-size: 12px;
height: $chat-head-height - 1px;
line-height: $chat-head-height - 1px;
margin: 0;
text-align: center;
text-decoration: none;
}
a:hover {
color: $text-color;
}
}
.chat-head #controlbox-tabs li a:hover {
color: $text-color;
}
.chat-head #controlbox-tabs li a { }
background-color: white;
box-shadow: inset 0 4px 12px rgba(0, 0, 0, 0.3);
border-bottom: 1px solid $border-color;
}
ul#controlbox-tabs a.current,
ul#controlbox-tabs a.current:hover {
box-shadow: none;
border-bottom: 0;
height: $chat-head-height;
cursor: default;
color: $text-color;
} }
div#chatrooms { div#chatrooms {
...@@ -1263,79 +1288,101 @@ ...@@ -1263,79 +1288,101 @@
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
resize: none; resize: none;
height: 59px;
} }
.chatroom .chat-textarea { .chat-toolbar {
border-bottom-right-radius: 0; font-size: $font-size;
}
ul.chat-toolbar {
font-size: 14px;
margin: 0; margin: 0;
padding: 0 5px 0 0; padding: 0 5px 0 0;
height: 20px; height: 20px;
display: block; display: block;
}
.chat-toolbar .toggle-participants,
.chat-toolbar .toggle-clear,
.chat-toolbar .toggle-otr {
float: right;
}
.chat-toolbar a { a {
color: $text-color; color: $link-color;
} }
.chat-toolbar ul { .unencrypted a,
display: none; .unencrypted {
font-size: 12px; color: #8f2831;
position: absolute; }
bottom: 100%;
margin: 0 0 1px 0;
right: 0;
background: #fff;
box-shadow: 0 -1px 2px 0 rgba(0, 0, 0, 0.4);
}
.chat-toolbar ul li { .unverified a,
position: relative; .unverified {
list-style: none; color: #cf5300;
cursor: pointer; }
}
.chat-toolbar ul li a:hover { .private a,
color: #8f2831; .private {
} color: #4b7003;
}
.chat-toolbar .toggle-smiley { .toggle-participants,
padding-left: 5px; .toggle-clear,
} .toggle-otr {
float: right;
}
.chat-toolbar .toggle-smiley ul li { li {
font-size: 14px; display: inline-block;
padding: 5px; list-style: none;
z-index: 98; padding: 0 3px 0 3px;
} cursor: pointer;
margin-top: 1px;
}
li:hover {
cursor: pointer;
}
.chat-toolbar .toggle-otr ul li { ul {
background-color: white; background: #fff;
display: block; bottom: 100%;
z-index: 99; box-shadow: 0 -1px 2px 0 rgba(0, 0, 0, 0.4);
} display: none;
font-size: 12px;
margin: 0 0 1px 0;
position: absolute;
right: 0;
li {
cursor: pointer;
list-style: none;
position: relative;
a:hover {
color: #8f2831;
}
}
}
.chat-toolbar ul li:hover { .toggle-smiley {
background-color: $highlight-color; padding-left: 5px;
} ul {
li {
font-size: $font-size;
padding: 5px;
z-index: 98;
}
li:hover {
background-color: $highlight-color;
}
}
}
.chat-toolbar .toggle-otr ul li a { .toggle-otr {
transition: background-color 0.2s ease-in-out; ul {
-webkit-transition: background-color 0.2s ease-in-out; li {
-moz-transition: background-color 0.2s ease-in-out; background-color: white;
display: block; display: block;
padding: 1px; z-index: 99;
text-decoration: none; a {
-moz-transition: background-color 0.2s ease-in-out;
-webkit-transition: background-color 0.2s ease-in-out;
transition: background-color 0.2s ease-in-out;
display: block;
padding: 1px;
text-decoration: none;
}
}
}
}
} }
.chat-toolbar-text { .chat-toolbar-text {
...@@ -1343,33 +1390,6 @@ ...@@ -1343,33 +1390,6 @@
padding-right: 3px; padding-right: 3px;
} }
.unencrypted a,
.unencrypted {
color: #8f2831;
}
.unverified a,
.unverified {
color: #cf5300;
}
.private a,
.private {
color: #4b7003;
}
ul.chat-toolbar li {
display: inline-block;
list-style: none;
padding: 0 3px 0 3px;
cursor: pointer;
margin-top: 1px;
}
ul.chat-toolbar li:hover {
cursor: pointer;
}
form#set-custom-xmpp-status { form#set-custom-xmpp-status {
float: left; float: left;
padding: 0; padding: 0;
...@@ -1391,16 +1411,20 @@ ...@@ -1391,16 +1411,20 @@
#controlbox { #controlbox {
display: none; display: none;
} div.xmpp-status {
display: inline;
#controlbox div.xmpp-status { }
display: inline;
} }
/* status dropdown styles */ /* status dropdown styles */
.chatbox dl.dropdown { .chatbox {
margin: 0.5em; .dropdown {
background-color: $light-background-color; margin: 0.5em;
background-color: $light-background-color;
dd {
position: relative;
}
}
} }
.chatbox .dropdown dd, .chatbox .dropdown dd,
...@@ -1410,83 +1434,35 @@ ...@@ -1410,83 +1434,35 @@
padding: 0; padding: 0;
} }
.chatbox .dropdown dd { .custom-xmpp-status {
position: relative;
}
input.custom-xmpp-status {
width: 124px; width: 124px;
} }
form.add-xmpp-contact { .add-xmpp-contact {
background: none; background: none;
padding: 5px; padding: 5px;
} input {
margin: 0 0 1rem;
form.add-xmpp-contact input { }
margin: 0 0 1rem; button {
} width: 100%;
}
form.add-xmpp-contact button {
width: 100%;
}
.chatbox .dropdown dt a span {
cursor: pointer;
display: block;
padding: 4px 7px 0 5px;
}
.chatbox .dropdown dd ul {
padding: 5px 0 5px 0;
list-style: none;
position: absolute;
left: 0;
top: 0;
border: 1px solid $light-background-border-color;
border-top: 0;
width: 99%;
z-index: 21;
background-color: $light-background-color;
}
.chatbox .dropdown li {
list-style: none;
padding-left: 0;
}
.chatbox .dropdown a {
height: 22px;
width: 148px;
display: inline-block;
line-height: 24px;
}
.chatbox .dropdown dd ul li:hover {
background-color: $highlight-color;
}
.chatbox .dropdown dd.search-xmpp ul li:hover {
background-color: $light-background-color;
} }
.xmpp-status-menu { .xmpp-status-menu {
text-align: left; text-align: left;
li a {
width: 100%;
span {
padding: 0 5px 0 5px;
}
}
} }
.xmpp-status-menu li a {
width: 100%;
}
.xmpp-status-menu li a.logout, .xmpp-status-menu li a.logout,
.xmpp-status-menu li a.logout span { .xmpp-status-menu li a.logout span {
color: $warning-color; color: $warning-color;
} }
.xmpp-status-menu li a span {
padding: 0 5px 0 5px;
}
.set-xmpp-status .dropdown dd ul { .set-xmpp-status .dropdown dd ul {
z-index: 22; z-index: 22;
} }
...@@ -1509,28 +1485,19 @@ ...@@ -1509,28 +1485,19 @@
position: absolute; position: absolute;
height: auto; height: auto;
width: 130px; width: 130px;
}
.chat-head-chatroom,
.chat-head {
border-radius: 4px;
width: 130px;
height: 25px;
margin-bottom: 1px;
}
}
.minimized-chats-flyout.minimized { .minimized-chats-flyout.minimized {
height: auto; height: auto;
} }
.minimized-chats-flyout .chat-head-chatroom,
.minimized-chats-flyout .chat-head {
border-radius: 4px;
width: 130px;
height: 25px;
margin-bottom: 1px;
}
.chatbox .box-flyout {
width: 200px;
}
.chatroom .box-flyout {
width: 300px;
}
.dragresize { .dragresize {
position: absolute; position: absolute;
width: 200px; width: 200px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7