Skip to content

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

updates #1068 

- For roster contacts, only show remove icons on hover.
- Show light background color when hovering over an item in the
controlbox.

Ideally this background color will be 100% of the controlbox width, but
I'm not opening that can of worms now...
parent 1d8a45ff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 311 additions and 270 deletions
css/converse.css
View file @ 73807959
This diff is collapsed.
css/inverse.css
View file @ 73807959
This diff is collapsed.
sass/_controlbox.scss
View file @ 73807959
...@@ -226,21 +226,6 @@ ...@@ -226,21 +226,6 @@
} }
} }
.list-container {
.items-list {
.list-item {
border: none;
clear: both;
color: $text-color;
display: block;
height: 2em;
overflow: hidden;
text-shadow: 0 1px 0 $text-shadow-color;
word-wrap: break-word;
}
}
}
#chatrooms { #chatrooms {
padding: 0; padding: 0;
...@@ -253,67 +238,6 @@ ...@@ -253,67 +238,6 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.rooms-list-container {
.rooms-toggle {
display: block;
color: $text-color;
padding: 0 0 0.5rem 0;
&:hover {
color: $dark-gray-color;
}
}
.rooms-list {
margin: 0.5em 0;
text-align: left;
.available-chatroom,
.open-chatroom {
a:hover {
color: $dark-link-color;
}
a.fa:hover {
color: $gray-color;
}
&.unread-msgs {
.available-room,
.open-room {
width: 100%;
font-weight: bold;
}
}
a {
&.room-info {
&:before {
font-size: 15px;
}
}
&.open-room {
width: 68%;
float: left;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
padding-right: 0.5em;
}
&.available-room {
width: 85%;
}
}
.add-bookmark,
.remove-bookmark {
&.button-on {
color: $link-color;
&:hover {
color: $dark-link-color;
}
}
color: $subdued-color;
}
}
}
}
} }
.controlbox-section { .controlbox-section {
......
sass/_core.scss
View file @ 73807959
...@@ -229,11 +229,6 @@ body.reset { ...@@ -229,11 +229,6 @@ body.reset {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.list-container {
text-align: left;
margin: 0.3em 0;
}
.btn { .btn {
color: #fff; color: #fff;
.fa { .fa {
......
sass/_roomslist.scss
View file @ 73807959
#conversejs { #conversejs {
.list-container {
text-align: left;
padding: 0.3em 0;
.rooms-toggle {
display: block;
color: $text-color;
padding: 0 0 0.5rem 0;
&:hover {
color: $dark-gray-color;
}
}
.items-list {
text-align: left;
.list-item {
border: none;
clear: both;
color: $text-color;
display: block;
height: 2em;
overflow: hidden;
padding-top: 0.5em;
text-shadow: 0 1px 0 $text-shadow-color;
word-wrap: break-word;
}
.available-chatroom,
.open-headline,
.open-chatroom {
&:hover {
background-color: lighten($controlbox-head-color, 45%);
}
&.unread-msgs {
.msgs-indicator {
border-radius: 10%;
opacity: 1;
}
.available-room,
.open-room {
width: 100%;
font-weight: bold;
}
}
a {
&:hover {
color: $dark-link-color;
}
&.room-info {
&:before {
font-size: 15px;
}
}
&.open-room {
width: 68%;
float: left;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
padding-right: 0.5em;
}
&.available-room {
width: 85%;
}
}
.add-bookmark,
.remove-bookmark {
&.button-on {
color: $link-color;
&:hover {
color: $dark-link-color;
}
}
color: $subdued-color;
}
}
}
}
}
#conversejs.fullscreen {
#controlbox { #controlbox {
.available-chatroom { #chatrooms {
&.unread-msgs { .bookmarks-list {
.msgs-indicator { dl.rooms-list.bookmarks {
border-radius: 10%; dd.available-chatroom {
opacity: 1; a {
&.open-room {
width: 80%;
}
}
}
} }
} }
} }
......
sass/_roster.scss
View file @ 73807959
...@@ -77,12 +77,12 @@ ...@@ -77,12 +77,12 @@
clear: both; clear: both;
color: $text-color; color: $text-color;
display: block; display: block;
height: 24px;
overflow-y: hidden; overflow-y: hidden;
text-shadow: 0 1px 0 $text-shadow-color; text-shadow: 0 1px 0 $text-shadow-color;
line-height: $font-size; line-height: $font-size;
width: 100%; width: 100%;
margin-top: 0.5em; height: 2em;
padding-top: 0.5em;
&.requesting-xmpp-contact { &.requesting-xmpp-contact {
a { a {
...@@ -95,11 +95,13 @@ ...@@ -95,11 +95,13 @@
padding: 0 0.2em 0 0; padding: 0 0.2em 0 0;
} }
} }
a:hover { a {
color: $dark-link-color; &:hover {
} color: $dark-link-color;
a.fa:hover { }
color: $gray-color; .fa:hover {
color: white;
}
} }
.open-chat { .open-chat {
...@@ -159,19 +161,23 @@ ...@@ -159,19 +161,23 @@
span { span {
padding: 0; padding: 0;
} }
a { .decline-xmpp-request {
&.decline-xmpp-request { margin-left: 5px;
margin-left: 5px; }
.remove-xmpp-contact {
font-size: $font-size-tiny;
margin: 0;
padding: 0;
width: 2em;
display: none;
&:before {
font-size: $font-size;
} }
&.remove-xmpp-contact { }
font-size: $font-size-tiny; &:hover {
float: right; background-color: lighten($controlbox-head-color, 45%);
margin: 0; .remove-xmpp-contact {
padding: 0; display: inline-block;
width: 2em;
&:before {
font-size: $font-size;
}
} }
} }
} }
......
sass/_variables.scss
View file @ 73807959
...@@ -96,6 +96,8 @@ $message-font-size: 14px !default; ...@@ -96,6 +96,8 @@ $message-font-size: 14px !default;
$font-size-tiny: 10px !default; $font-size-tiny: 10px !default;
$controlbox-width: 250px !default; $controlbox-width: 250px !default;
$controlbox-head-color: $light-blue !default;
$chat-gutter: 0.5em !default; $chat-gutter: 0.5em !default;
$minimized-chats-width: 130px !default; $minimized-chats-width: 130px !default;
......
sass/inverse.scss
View file @ 73807959
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
@import "controlbox"; @import "controlbox";
@import "inverse/controlbox"; @import "inverse/controlbox";
@import "roster"; @import "roster";
@import "roomslist";
@import "inverse/roster"; @import "inverse/roster";
@import "bookmarks"; @import "bookmarks";
@import "inverse/bookmarks";
@import "chatrooms"; @import "chatrooms";
@import "inverse/chatrooms"; @import "inverse/chatrooms";
@import "headline"; @import "headline";
......
sass/inverse/_bookmarks.scss deleted 100644 → 0
View file @ 1d8a45ff
#conversejs.fullscreen {
#controlbox {
#chatrooms {
.bookmarks-list {
dl.rooms-list.bookmarks {
dd.available-chatroom {
a {
&.open-room {
width: 80%;
}
}
}
}
}
}
}
}
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