Skip to content

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

Increase padding in #users pane

parent be6ae092
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 70 deletions
css/converse.css
View file @ 5a7340b3
...@@ -1539,7 +1539,7 @@ ...@@ -1539,7 +1539,7 @@
width: 100%; width: 100%;
margin: 0.5em 0; } margin: 0.5em 0; }
#conversejs #controlbox #users .add-converse-contact { #conversejs #controlbox #users .add-converse-contact {
margin: 0 0.5em 0.75em 0.5em; } margin: 0 1em 0.75em 1em; }
#conversejs #controlbox #chatrooms form.add-chatroom input[type=button], #conversejs #controlbox #chatrooms form.add-chatroom input[type=button],
#conversejs #controlbox #chatrooms form.add-chatroom input[type=submit], #conversejs #controlbox #chatrooms form.add-chatroom input[type=submit],
#conversejs #controlbox #chatrooms form.add-chatroom input[type=text] { #conversejs #controlbox #chatrooms form.add-chatroom input[type=text] {
...@@ -1718,6 +1718,8 @@ ...@@ -1718,6 +1718,8 @@
margin-bottom: 0; } margin-bottom: 0; }
#conversejs #controlbox .controlbox-pane dd.odd { #conversejs #controlbox .controlbox-pane dd.odd {
background-color: #DCEAC5; } background-color: #DCEAC5; }
#conversejs #controlbox #users {
overflow-y: hidden; }
#conversejs #controlbox .add-xmpp-contact { #conversejs #controlbox .add-xmpp-contact {
background: none; background: none;
padding: 1em; } padding: 1em; }
...@@ -1739,7 +1741,7 @@ ...@@ -1739,7 +1741,7 @@
color: #D24E2B; } color: #D24E2B; }
#conversejs #controlbox .set-xmpp-status { #conversejs #controlbox .set-xmpp-status {
background: none; background: none;
padding: 0.75em 0.5em 0.5em 0.5em; } margin: 0.75em 1em 0.5em 1em; }
#conversejs #controlbox .set-xmpp-status .dropdown dd ul { #conversejs #controlbox .set-xmpp-status .dropdown dd ul {
z-index: 22; } z-index: 22; }
#conversejs .toggle-controlbox { #conversejs .toggle-controlbox {
...@@ -1758,40 +1760,43 @@ ...@@ -1758,40 +1760,43 @@
text-align: left; text-align: left;
width: 100%; width: 100%;
position: relative; position: relative;
margin: 0.5em 0 0 0; margin: 1em 0 0 0;
height: 194px; height: 194px;
height: calc(100% - 50px - 20px); height: calc(100% - 50px - 20px);
overflow: hidden; overflow: hidden;
padding-bottom: 3em; padding: 0;
/* (jQ addClass:) if input has value: */ padding-bottom: 3em; }
/* (jQ addClass:) if mouse is over the 'x' input area*/ }
#conversejs #converse-roster.no-contact-requests { #conversejs #converse-roster.no-contact-requests {
height: calc(100% - 25px - 20px); } height: calc(100% - 25px - 20px); }
#conversejs #converse-roster .search-xmpp ul li.chat-info { #conversejs #converse-roster .search-xmpp ul li.chat-info {
padding-left: 10px; } padding-left: 10px; }
#conversejs #converse-roster .filter-type { #conversejs #converse-roster .roster-filter-group {
display: table-cell; margin: 0 1em;
float: right; /* (jQ addClass:) if input has value: */
font-size: calc(14px - 1px); /* (jQ addClass:) if mouse is over the 'x' input area*/ }
height: 25px; #conversejs #converse-roster .roster-filter-group .roster-filter {
padding: 0;
width: 84px;
border-radius: 0;
border: 1px solid; }
#conversejs #converse-roster .roster-filter {
float: left; float: left;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg==) no-repeat right -20px center; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg==) no-repeat right -20px center;
border: 1px solid #999; border: 1px solid #999;
font-size: 14px; font-size: 14px;
height: 25px; height: 25px;
margin: 0 0 0.5em 7px; margin: 0;
padding: 0; padding: 0;
padding-left: 0.4em; padding-left: 0.4em;
width: 103px; } width: 53%; }
#conversejs #converse-roster .roster-filter.x { #conversejs #converse-roster .roster-filter-group .roster-filter.x {
background-position: right 3px center; } background-position: right 3px center; }
#conversejs #converse-roster .roster-filter.onX { #conversejs #converse-roster .roster-filter-group .roster-filter.onX {
cursor: pointer; } cursor: pointer; }
#conversejs #converse-roster .roster-filter-group .filter-type {
display: table-cell;
float: right;
font-size: calc(14px - 2px);
height: 25px;
padding: 0;
width: 47%;
border-radius: 0;
border: 1px solid; }
#conversejs #converse-roster .roster-contacts { #conversejs #converse-roster .roster-contacts {
margin: 0; margin: 0;
height: 100%; height: 100%;
...@@ -1802,7 +1807,8 @@ ...@@ -1802,7 +1807,8 @@
color: #818479; color: #818479;
display: none; display: none;
font-weight: normal; font-weight: normal;
padding: 0.5em; margin-top: 0.5em;
padding: 0.5em 1em;
text-shadow: 0 1px 0 #FAFAFA; } text-shadow: 0 1px 0 #FAFAFA; }
#conversejs #converse-roster .roster-contacts dt.roster-group:hover { #conversejs #converse-roster .roster-contacts dt.roster-group:hover {
background-color: #DCF9F6; } background-color: #DCF9F6; }
...@@ -1818,7 +1824,7 @@ ...@@ -1818,7 +1824,7 @@
height: 24px; height: 24px;
line-height: 16px; line-height: 16px;
overflow-y: hidden; overflow-y: hidden;
padding: 4px 2px 0 4px; padding: 0.5em 1em;
text-shadow: 0 1px 0 #FAFAFA; } text-shadow: 0 1px 0 #FAFAFA; }
#conversejs #converse-roster .roster-contacts dd:hover { #conversejs #converse-roster .roster-contacts dd:hover {
background-color: #DCF9F6; } background-color: #DCF9F6; }
...@@ -1839,10 +1845,9 @@ ...@@ -1839,10 +1845,9 @@
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis; }
margin-left: 3px; }
#conversejs #converse-roster .roster-contacts dd span { #conversejs #converse-roster .roster-contacts dd span {
padding: 0 5px 0 0; } padding: 0 0.5em 0 0; }
#conversejs #converse-roster .roster-contacts dd a.decline-xmpp-request { #conversejs #converse-roster .roster-contacts dd a.decline-xmpp-request {
margin-left: 5px; } margin-left: 5px; }
#conversejs #converse-roster .roster-contacts dd a.remove-xmpp-contact { #conversejs #converse-roster .roster-contacts dd a.remove-xmpp-contact {
......
mockup/controlbox.html
View file @ 5a7340b3
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
</dd> </dd>
</dl> </dl>
<div id="converse-roster"> <div id="converse-roster">
<span class="input-button-group"> <span class="roster-filter-group input-button-group">
<input class="roster-filter" placeholder="Type to filter"> <input class="roster-filter" placeholder="Type to filter">
<select class="filter-type"> <select class="filter-type">
<option value="contacts">Contacts</option> <option value="contacts">Contacts</option>
......
sass/_controlbox.scss
View file @ 5a7340b3
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
} }
#users { #users {
.add-converse-contact { .add-converse-contact {
margin: 0 0.5em 0.75em 0.5em; margin: 0 1em 0.75em 1em;
} }
} }
...@@ -328,6 +328,10 @@ ...@@ -328,6 +328,10 @@
} }
} }
#users {
overflow-y: hidden;
}
.add-xmpp-contact { .add-xmpp-contact {
background: none; background: none;
padding: 1em; padding: 1em;
...@@ -358,7 +362,7 @@ ...@@ -358,7 +362,7 @@
.set-xmpp-status { .set-xmpp-status {
background: none; background: none;
padding: 0.75em 0.5em 0.5em 0.5em; margin: 0.75em 1em 0.5em 1em;
.dropdown dd ul { .dropdown dd ul {
z-index: 22; z-index: 22;
} }
......
sass/_roster.scss
View file @ 5a7340b3
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
text-align: left; text-align: left;
width: 100%; width: 100%;
position: relative; position: relative;
margin: 0.5em 0 0 0; margin: 1em 0 0 0;
height: $roster-height; height: $roster-height;
height: calc(100% - #{$controlbox-dropdown-height*2} - 20px); height: calc(100% - #{$controlbox-dropdown-height*2} - 20px);
overflow: hidden; overflow: hidden;
padding: 0;
padding-bottom: 3em; padding-bottom: 3em;
&.no-contact-requests { &.no-contact-requests {
...@@ -20,26 +21,18 @@ ...@@ -20,26 +21,18 @@
} }
} }
.filter-type { .roster-filter-group {
display: table-cell; margin: 0 1em;
float: right;
font-size: calc(#{$font-size} - 1px);
height: $controlbox-dropdown-height;
padding: 0;
width: 84px;
border-radius: 0;
border: 1px solid;
}
.roster-filter { .roster-filter {
float: left; float: left;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg== ) no-repeat right -20px center; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg== ) no-repeat right -20px center;
border: 1px solid #999; border: 1px solid #999;
font-size: $font-size; font-size: $font-size;
height: $controlbox-dropdown-height; height: $controlbox-dropdown-height;
margin: 0 0 0.5em 7px; margin: 0;
padding: 0; padding: 0;
padding-left: 0.4em; padding-left: 0.4em;
width: 103px; width: 53%;
} }
/* (jQ addClass:) if input has value: */ /* (jQ addClass:) if input has value: */
.roster-filter.x { .roster-filter.x {
...@@ -49,6 +42,17 @@ ...@@ -49,6 +42,17 @@
.roster-filter.onX { .roster-filter.onX {
cursor: pointer; cursor: pointer;
} }
.filter-type {
display: table-cell;
float: right;
font-size: calc(#{$font-size} - 2px);
height: $controlbox-dropdown-height;
padding: 0;
width: 47%;
border-radius: 0;
border: 1px solid;
}
}
.roster-contacts { .roster-contacts {
margin: 0; margin: 0;
...@@ -60,7 +64,8 @@ ...@@ -60,7 +64,8 @@
color: $text-color; color: $text-color;
display: none; display: none;
font-weight: normal; font-weight: normal;
padding: 0.5em; margin-top: 0.5em;
padding: 0.5em 1em;
text-shadow: 0 1px 0 $text-shadow-color; text-shadow: 0 1px 0 $text-shadow-color;
&:hover { &:hover {
background-color: $highlight-color; background-color: $highlight-color;
...@@ -79,7 +84,7 @@ ...@@ -79,7 +84,7 @@
height: 24px; height: 24px;
line-height: 16px; line-height: 16px;
overflow-y: hidden; overflow-y: hidden;
padding: 4px 2px 0 4px; padding: 0.5em 1em;
text-shadow: 0 1px 0 $text-shadow-color; text-shadow: 0 1px 0 $text-shadow-color;
&:hover { &:hover {
background-color: $highlight-color; background-color: $highlight-color;
...@@ -108,10 +113,9 @@ ...@@ -108,10 +113,9 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
margin-left: 3px;
} }
span { span {
padding: 0 5px 0 0; padding: 0 0.5em 0 0;
} }
a { a {
&.decline-xmpp-request { &.decline-xmpp-request {
......
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