CSS tweaks.

This commit is contained in:
JC Brand 2015-03-06 11:46:13 +01:00
parent 7473f458eb
commit f73b74a8e3
3 changed files with 70 additions and 44 deletions

View File

@ -73,7 +73,7 @@
#conversejs input[type=text], #conversejs input[type=password], #conversejs input[type=text], #conversejs input[type=password],
#conversejs button { #conversejs button {
font-size: 14px; font-size: 14px;
padding: 0.5em; padding: 0.25em;
min-height: 0; } min-height: 0; }
#conversejs strong { #conversejs strong {
font-weight: 700; } font-weight: 700; }
@ -296,6 +296,10 @@
user-select: none; } user-select: none; }
#conversejs .emoticon { #conversejs .emoticon {
font-size: 14px; } font-size: 14px; }
#conversejs .left {
float: left; }
#conversejs .right {
float: right; }
#conversejs .hidden { #conversejs .hidden {
display: none; } display: none; }
#conversejs .locked { #conversejs .locked {
@ -372,8 +376,11 @@
padding: 10px 8px 0 8px; } padding: 10px 8px 0 8px; }
#conversejs .toggle-controlbox span { #conversejs .toggle-controlbox span {
color: white; } color: white; }
#conversejs .button-group,
#conversejs .input-button-group { #conversejs .input-button-group {
display: table; } display: table; }
#conversejs .button-group {
width: 100%; }
#conversejs .input-button-group button, #conversejs .input-button-group button,
#conversejs .input-button-group input { #conversejs .input-button-group input {
display: table-cell; } display: table-cell; }
@ -716,7 +723,9 @@
#conversejs #converse-roster dt { #conversejs #converse-roster dt {
display: none; } display: none; }
#conversejs #converse-roster dd { #conversejs #converse-roster dd {
line-height: 16px; } line-height: 16px;
padding: 4px 2px 0 4px;
height: 24px; }
#conversejs #converse-roster dd a, #conversejs #converse-roster dd span { #conversejs #converse-roster dd a, #conversejs #converse-roster dd span {
text-shadow: 0 1px 0 #FAFAFA; text-shadow: 0 1px 0 #FAFAFA;
display: inline-block; display: inline-block;
@ -750,13 +759,6 @@
#conversejs #converse-roster span.req-contact-name { #conversejs #converse-roster span.req-contact-name {
width: 69%; width: 69%;
padding: 0; } padding: 0; }
#conversejs dd.available-chatroom {
display: inline-block;
overflow-x: hidden;
text-overflow: ellipsis;
white-space: nowrap; }
#conversejs dd.available-chatroom a.open-room {
width: 148px; }
#conversejs #available-chatrooms { #conversejs #available-chatrooms {
text-align: left; } text-align: left; }
#conversejs #available-chatrooms dt, #conversejs #available-chatrooms dt,
@ -764,7 +766,7 @@
font-weight: normal; font-weight: normal;
color: #6C4C44; color: #6C4C44;
border: none; border: none;
padding: 5px; padding: 0.5em;
text-shadow: 0 1px 0 #FAFAFA; } text-shadow: 0 1px 0 #FAFAFA; }
#conversejs .room-info { #conversejs .room-info {
font-size: 11px; font-size: 11px;
@ -781,9 +783,7 @@
display: block; display: block;
white-space: normal; } white-space: normal; }
#conversejs a.room-info { #conversejs a.room-info {
width: 22px; width: 15px;
height: 22px;
float: right;
display: none; display: none;
clear: right; } clear: right; }
#conversejs a.open-room { #conversejs a.open-room {
@ -791,20 +791,25 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow-x: hidden; } overflow-x: hidden; }
#conversejs dd.available-chatroom {
display: inline-block;
overflow-x: hidden;
text-overflow: ellipsis;
padding: 0.25em 0.5em;
white-space: nowrap; }
#conversejs dd.available-chatroom a.open-room {
width: 150px; }
#conversejs dd.available-chatroom:hover a.room-info { #conversejs dd.available-chatroom:hover a.room-info {
display: inline-block; display: inline-block;
margin-top: 3px; font-size: 14px; }
font-size: 15px; }
#conversejs dd.available-chatroom, #conversejs dd.available-chatroom,
#conversejs #converse-roster dd { #conversejs #converse-roster dd {
font-weight: bold; font-weight: bold;
border: none; border: none;
display: block; display: block;
padding: 4px 2px 0 4px;
color: #6C4C44; color: #6C4C44;
text-shadow: 0 1px 0 #FAFAFA; text-shadow: 0 1px 0 #FAFAFA;
clear: both; clear: both;
height: 24px;
overflow-y: hidden; } overflow-y: hidden; }
#conversejs .roster-group:hover, #conversejs .roster-group:hover,
#conversejs dd.available-chatroom:hover, #conversejs dd.available-chatroom:hover,
@ -991,15 +996,20 @@
margin: 1em 0; } margin: 1em 0; }
#conversejs form.add-chatroom { #conversejs form.add-chatroom {
background: none; background: none;
padding: 8px; } padding: 0.5em; }
#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: 0; margin: 0;
width: 100%; width: 100%;
padding: 5px; } padding: 0.25em; }
#conversejs form.add-chatroom span.spinner,
#conversejs form.add-chatroom input[type=button],
#conversejs form.add-chatroom input[type=submit] {
margin-top: 0.5em;
display: table-cell;
width: auto; }
#conversejs form.add-chatroom input[type=submit] { #conversejs form.add-chatroom input[type=submit] {
margin: 5px 0;
color: #436F64; } color: #436F64; }
#conversejs select#select-xmpp-status { #conversejs select#select-xmpp-status {
float: right; float: right;

View File

@ -83,7 +83,7 @@
input[type=text], input[type=password], input[type=text], input[type=password],
button { button {
font-size: $font-size; font-size: $font-size;
padding: 0.5em; padding: 0.25em;
min-height: 0; min-height: 0;
} }
@ -232,6 +232,12 @@
font-size: $font-size; font-size: $font-size;
} }
.left {
float: left;
}
.right {
float: right;
}
.hidden { .hidden {
display: none; display: none;
} }
@ -293,9 +299,13 @@
} }
} }
.button-group,
.input-button-group { .input-button-group {
display: table; display: table;
} }
.button-group {
width: 100%;
}
.input-button-group button, .input-button-group button,
.input-button-group input { .input-button-group input {
display: table-cell; display: table-cell;
@ -766,6 +776,8 @@
} }
dd { dd {
line-height: 16px; line-height: 16px;
padding: 4px 2px 0 4px;
height: 24px;
a, span { a, span {
text-shadow: 0 1px 0 $link-shadow-color; text-shadow: 0 1px 0 $link-shadow-color;
display: inline-block; display: inline-block;
@ -818,16 +830,6 @@
} }
} }
dd.available-chatroom {
display: inline-block;
overflow-x: hidden;
text-overflow: ellipsis;
white-space: nowrap;
a.open-room {
width: 148px;
}
}
#available-chatrooms { #available-chatrooms {
text-align: left; text-align: left;
} }
@ -837,7 +839,7 @@
font-weight: normal; font-weight: normal;
color: $text-color; color: $text-color;
border: none; border: none;
padding: 5px; padding: 0.5em;
text-shadow: 0 1px 0 $text-shadow-color; text-shadow: 0 1px 0 $text-shadow-color;
} }
@ -865,9 +867,7 @@
a { a {
&.room-info { &.room-info {
width: 22px; width: 15px;
height: 22px;
float: right;
display: none; display: none;
clear: right; clear: right;
} }
@ -879,10 +879,20 @@
} }
} }
dd.available-chatroom {
display: inline-block;
overflow-x: hidden;
text-overflow: ellipsis;
padding: 0.25em 0.5em;
white-space: nowrap;
a.open-room {
width: 150px;
}
}
dd.available-chatroom:hover a.room-info { dd.available-chatroom:hover a.room-info {
display: inline-block; display: inline-block;
margin-top: 3px; font-size: 14px;
font-size: 15px;
} }
dd.available-chatroom, dd.available-chatroom,
@ -890,11 +900,9 @@
font-weight: bold; font-weight: bold;
border: none; border: none;
display: block; display: block;
padding: 4px 2px 0 4px;
color: $text-color; color: $text-color;
text-shadow: 0 1px 0 $text-shadow-color; text-shadow: 0 1px 0 $text-shadow-color;
clear: both; clear: both;
height: 24px;
overflow-y: hidden; overflow-y: hidden;
} }
@ -1152,17 +1160,23 @@
form.add-chatroom { form.add-chatroom {
background: none; background: none;
padding: 8px; padding: 0.5em;
input[type=button], input[type=button],
input[type=submit], input[type=submit],
input[type=text] { input[type=text] {
margin: 0; margin: 0;
width: 100%; width: 100%;
padding: 5px; padding: 0.25em;
}
span.spinner,
input[type=button],
input[type=submit] {
margin-top: 0.5em;
display: table-cell;
width: auto;
} }
input[type=submit] { input[type=submit] {
margin: 5px 0;
color: $save-button-color; color: $save-button-color;
} }
} }

View File

@ -8,7 +8,9 @@
<label>{{label_server}}</label> <label>{{label_server}}</label>
<input type="{{server_input_type}}" name="server" class="new-chatroom-server" <input type="{{server_input_type}}" name="server" class="new-chatroom-server"
placeholder="{{label_server}}"/> placeholder="{{label_server}}"/>
<input type="submit" name="join" value="{{label_join}}"/> <div class="button-group">
<input type="button" name="show" id="show-rooms" value="{{label_show_rooms}}"/> <input type="submit" class="left" name="join" value="{{label_join}}"/>
<input type="button" class="right" name="show" id="show-rooms" value="{{label_show_rooms}}"/>
</div>
</form> </form>
<dl id="available-chatrooms"></dl> <dl id="available-chatrooms"></dl>