Skip to content

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

Remove the pulse entirely. 

Couldn't get it to look/work satisfactorily
parent f07cb97d
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 222 deletions
css/converse.css
View file @ 336dc740
...@@ -1260,74 +1260,6 @@ ...@@ -1260,74 +1260,6 @@
-ms-transform: rotate(359deg); -ms-transform: rotate(359deg);
-o-transform: rotate(359deg); -o-transform: rotate(359deg);
transform: rotate(359deg); } } transform: rotate(359deg); } }
@-webkit-keyframes pulse {
0% {
-webkit-transform: scale(0);
opacity: 0.0; }
25% {
-webkit-transform: scale(0);
opacity: 0.1; }
50% {
-webkit-transform: scale(0.1);
opacity: 0.3; }
75% {
-webkit-transform: scale(0.5);
opacity: 0.5; }
100% {
-webkit-transform: scale(1);
opacity: 0.0; } }
@-moz-keyframes pulse {
0% {
-moz-transform: scale(0);
opacity: 0.0; }
25% {
-moz-transform: scale(0);
opacity: 0.1; }
50% {
-moz-transform: scale(0.1);
opacity: 0.3; }
75% {
-moz-transform: scale(0.5);
opacity: 0.5; }
100% {
-moz-transform: scale(1);
opacity: 0.0; } }
@keyframes pulse {
0% {
-webkit-transform: scale(0);
-moz-transform: scale(0);
-ms-transform: scale(0);
-o-transform: scale(0);
transform: scale(0);
opacity: 0.0; }
25% {
-webkit-transform: scale(0);
-moz-transform: scale(0);
-ms-transform: scale(0);
-o-transform: scale(0);
transform: scale(0);
opacity: 0.1; }
50% {
-webkit-transform: scale(0.1);
-moz-transform: scale(0.1);
-ms-transform: scale(0.1);
-o-transform: scale(0.1);
transform: scale(0.1);
opacity: 0.3; }
75% {
-webkit-transform: scale(0.5);
-moz-transform: scale(0.5);
-ms-transform: scale(0.5);
-o-transform: scale(0.5);
transform: scale(0.5);
opacity: 0.5; }
100% {
-webkit-transform: scale(1);
-moz-transform: scale(1);
-ms-transform: scale(1);
-o-transform: scale(1);
transform: scale(1);
opacity: 0.0; } }
#converse-embedded-chat .spinner, #converse-embedded-chat .spinner,
#conversejs .spinner { #conversejs .spinner {
-webkit-animation: spin 2s infinite, linear; -webkit-animation: spin 2s infinite, linear;
...@@ -1928,11 +1860,10 @@ ...@@ -1928,11 +1860,10 @@
#conversejs #controlbox form.search-xmpp-contact input { #conversejs #controlbox form.search-xmpp-contact input {
width: 8em; } width: 8em; }
#conversejs #controlbox .msgs-indicator { #conversejs #controlbox .msgs-indicator {
opacity: 0.6; border-radius: 3px;
background-color: #D24E2B; background-color: #E77051;
color: white; color: white;
font-size: 12px; font-size: 12px;
float: right;
font-weight: normal; font-weight: normal;
padding: 0 4px; padding: 0 4px;
text-shadow: none; } text-shadow: none; }
...@@ -2125,11 +2056,14 @@ ...@@ -2125,11 +2056,14 @@
#conversejs #controlbox #controlbox-tabs li a.rooms-tab .msgs-indicator { #conversejs #controlbox #controlbox-tabs li a.rooms-tab .msgs-indicator {
background-color: #E77051; } background-color: #E77051; }
#conversejs #controlbox #controlbox-tabs li a .msgs-indicator { #conversejs #controlbox #controlbox-tabs li a .msgs-indicator {
border-top-right-radius: 5px; } border: solid white 2px;
opacity: 0.8;
border-top-right-radius: 5px;
float: right; }
#conversejs #controlbox #controlbox-tabs li a:hover { #conversejs #controlbox #controlbox-tabs li a:hover {
color: #818479; } color: #818479; }
#conversejs #controlbox #controlbox-tabs li a:hover .msgs-indicator { #conversejs #controlbox #controlbox-tabs li a:hover .msgs-indicator {
opacity: 0.8; } opacity: 1; }
#conversejs #controlbox #controlbox-tabs li a.current, #conversejs #controlbox #controlbox-tabs li a.current:hover { #conversejs #controlbox #controlbox-tabs li a.current, #conversejs #controlbox #controlbox-tabs li a.current:hover {
box-shadow: none; box-shadow: none;
border-bottom: 0; border-bottom: 0;
...@@ -2245,9 +2179,6 @@ ...@@ -2245,9 +2179,6 @@
height: -webkit-calc(100% - 55px); height: -webkit-calc(100% - 55px);
height: calc(100% - 55px); } height: calc(100% - 55px); }
#conversejs #controlbox .available-chatroom .pulse {
padding: 0;
margin: 0; }
#conversejs #controlbox .available-chatroom.unread-msgs .msgs-indicator { #conversejs #controlbox .available-chatroom.unread-msgs .msgs-indicator {
border-radius: 10%; border-radius: 10%;
opacity: 1; } opacity: 1; }
...@@ -2339,7 +2270,7 @@ ...@@ -2339,7 +2270,7 @@
height: 24px; height: 24px;
overflow-y: hidden; overflow-y: hidden;
text-shadow: 0 1px 0 #FAFAFA; text-shadow: 0 1px 0 #FAFAFA;
line-height: 16px; line-height: 14px;
width: 100%; width: 100%;
height: 30px; height: 30px;
margin: 0; margin: 0;
...@@ -2350,37 +2281,15 @@ ...@@ -2350,37 +2281,15 @@
margin: auto; margin: auto;
padding: 0; padding: 0;
width: 85%; } width: 85%; }
#conversejs #converse-roster .roster-contacts dd .open-chat .pulse {
padding: 0;
margin: 0; }
#conversejs #converse-roster .roster-contacts dd .open-chat.unread-msgs { #conversejs #converse-roster .roster-contacts dd .open-chat.unread-msgs {
font-weight: bold; } font-weight: bold; }
#conversejs #converse-roster .roster-contacts dd .open-chat.unread-msgs .contact-name { #conversejs #converse-roster .roster-contacts dd .open-chat.unread-msgs .contact-name {
width: 70%; } width: 70%; }
#conversejs #converse-roster .roster-contacts dd .open-chat.unread-msgs .avatar .pulse {
border: 0.7em solid #578EA9;
background: transparent;
border-radius: 60px;
height: 30px;
width: 30px;
-webkit-animation: pulse 3s ease-out;
-moz-animation: pulse 3s ease-out;
animation: pulse 3s ease-out;
-webkit-animation-iteration-count: infinite;
-moz-animation-iteration-count: infinite;
animation-iteration-count: infinite;
margin: 0;
padding: 0;
margin-top: -7px;
margin-left: -31px;
z-index: 1;
opacity: 0; }
#conversejs #converse-roster .roster-contacts dd .open-chat.unread-msgs .avatar.avatar-online .pulse {
border: 0.7em solid #578EA9; }
#conversejs #converse-roster .roster-contacts dd .open-chat .msgs-indicator { #conversejs #converse-roster .roster-contacts dd .open-chat .msgs-indicator {
opacity: 1; opacity: 1;
margin-left: -3em; border-radius: 10%;
border-radius: 10%; } padding: 0 0.2em;
font-size: 12px; }
#conversejs #converse-roster .roster-contacts dd .open-chat .contact-name { #conversejs #converse-roster .roster-contacts dd .open-chat .contact-name {
padding: 0; padding: 0;
margin: 0; margin: 0;
...@@ -2391,8 +2300,6 @@ ...@@ -2391,8 +2300,6 @@
float: left; float: left;
display: inline-block; display: inline-block;
height: 60px; } height: 60px; }
#conversejs #converse-roster .roster-contacts dd .open-chat .avatar .status-icon {
color: #578EA9; }
#conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .request-actions { #conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .request-actions {
padding: 0 0 0 0.3em; padding: 0 0 0 0.3em;
float: right; } float: right; }
...@@ -2405,7 +2312,7 @@ ...@@ -2405,7 +2312,7 @@
width: 69%; width: 69%;
padding: 0; } padding: 0; }
#conversejs #converse-roster .roster-contacts dd.current-xmpp-contact span { #conversejs #converse-roster .roster-contacts dd.current-xmpp-contact span {
font-size: 16px; font-size: 14px;
float: left; float: left;
margin-right: 0.5em; } margin-right: 0.5em; }
#conversejs #converse-roster .roster-contacts dd.odd { #conversejs #converse-roster .roster-contacts dd.odd {
......
css/inverse.css
View file @ 336dc740
...@@ -1260,61 +1260,6 @@ ...@@ -1260,61 +1260,6 @@
-ms-transform: rotate(359deg); -ms-transform: rotate(359deg);
-o-transform: rotate(359deg); -o-transform: rotate(359deg);
transform: rotate(359deg); } } transform: rotate(359deg); } }
@-webkit-keyframes pulse {
0% {
-webkit-transform: scale(0);
opacity: 0.0; }
50% {
-webkit-transform: scale(0.5);
opacity: 0.0; }
75% {
-webkit-transform: scale(0.8);
opacity: 0.5; }
100% {
-webkit-transform: scale(1);
opacity: 0.0; } }
@-moz-keyframes pulse {
0% {
-moz-transform: scale(0);
opacity: 0.0; }
50% {
-moz-transform: scale(0.5);
opacity: 0.0; }
75% {
-moz-transform: scale(0.8);
opacity: 0.5; }
100% {
-moz-transform: scale(1);
opacity: 0.0; } }
@keyframes pulse {
0% {
-webkit-transform: scale(0);
-moz-transform: scale(0);
-ms-transform: scale(0);
-o-transform: scale(0);
transform: scale(0);
opacity: 0.0; }
50% {
-webkit-transform: scale(0.5);
-moz-transform: scale(0.5);
-ms-transform: scale(0.5);
-o-transform: scale(0.5);
transform: scale(0.5);
opacity: 0.0; }
75% {
-webkit-transform: scale(0.8);
-moz-transform: scale(0.8);
-ms-transform: scale(0.8);
-o-transform: scale(0.8);
transform: scale(0.8);
opacity: 0.5; }
100% {
-webkit-transform: scale(1);
-moz-transform: scale(1);
-ms-transform: scale(1);
-o-transform: scale(1);
transform: scale(1);
opacity: 0.0; } }
#converse-embedded-chat .spinner, #converse-embedded-chat .spinner,
#conversejs .spinner { #conversejs .spinner {
-webkit-animation: spin 2s infinite, linear; -webkit-animation: spin 2s infinite, linear;
...@@ -2455,28 +2400,10 @@ body { ...@@ -2455,28 +2400,10 @@ body {
margin: auto; margin: auto;
padding: 0; padding: 0;
width: 85%; } width: 85%; }
#conversejs #converse-roster .roster-contacts dd .open-chat .pulse {
border: 0.5em solid #E77051;
background: transparent;
height: 16px;
width: 24px;
-webkit-animation: pulse 3s ease-out;
-moz-animation: pulse 3s ease-out;
animation: pulse 3s ease-out;
-webkit-animation-iteration-count: infinite;
-moz-animation-iteration-count: infinite;
animation-iteration-count: infinite;
margin: 0;
padding: 0;
margin-left: -26px;
z-index: 1;
opacity: 0; }
#conversejs #converse-roster .roster-contacts dd .open-chat.unread-msgs { #conversejs #converse-roster .roster-contacts dd .open-chat.unread-msgs {
font-weight: bold; } font-weight: bold; }
#conversejs #converse-roster .roster-contacts dd .open-chat.unread-msgs .contact-name { #conversejs #converse-roster .roster-contacts dd .open-chat.unread-msgs .contact-name {
width: 70%; } width: 70%; }
#conversejs #converse-roster .roster-contacts dd .open-chat.unread-msgs .avatar.avatar-online .pulse {
border: 0.7em solid #578EA9; }
#conversejs #converse-roster .roster-contacts dd .open-chat .msgs-indicator { #conversejs #converse-roster .roster-contacts dd .open-chat .msgs-indicator {
opacity: 1; opacity: 1;
border-radius: 10%; border-radius: 10%;
......
sass/_core.scss
View file @ 336dc740
...@@ -91,25 +91,6 @@ ...@@ -91,25 +91,6 @@
} }
} }
@include keyframes(pulse) {
0% {
@include transform(scale(0));
opacity: 0.0;
}
50% {
@include transform(scale(0.5));
opacity: 0.0;
}
75% {
@include transform(scale(0.8));
opacity: 0.5;
}
100% {
@include transform(scale(1));
opacity: 0.0;
}
}
.spinner { .spinner {
@include animation(spin 2s infinite, linear); @include animation(spin 2s infinite, linear);
display: block; display: block;
......
sass/_roomslist.scss
View file @ 336dc740
#conversejs { #conversejs {
#controlbox { #controlbox {
.available-chatroom { .available-chatroom {
.pulse {
padding: 0;
margin: 0;
}
&.unread-msgs { &.unread-msgs {
.msgs-indicator { .msgs-indicator {
border-radius: 10%; border-radius: 10%;
......
sass/_roster.scss
View file @ 336dc740
...@@ -122,31 +122,11 @@ ...@@ -122,31 +122,11 @@
margin: auto; margin: auto;
padding: 0; padding: 0;
width: 85%; width: 85%;
.pulse {
border: 0.5em solid $red;
background: transparent;
height: $font-size;
width: 1.5*$font-size;
@include animation(pulse 3s ease-out);
@include animation-iteration-count(infinite);
margin: 0;
padding: 0;
margin-left: -26px;
z-index: 1;
opacity: 0;
}
&.unread-msgs { &.unread-msgs {
font-weight: bold; font-weight: bold;
.contact-name { .contact-name {
width: 70%; width: 70%;
} }
.avatar {
&.avatar-online {
.pulse {
border: 0.7em solid $link-color;
}
}
}
} }
.msgs-indicator { .msgs-indicator {
......
src/templates/roster_item.html
View file @ 336dc740
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<span class="contact-name unread-msgs">{{{fullname}}}</span> <span class="contact-name unread-msgs">{{{fullname}}}</span>
{[ if (num_unread) { ]} {[ if (num_unread) { ]}
<span class="msgs-indicator">{{{ num_unread }}}</span> <span class="msgs-indicator">{{{ num_unread }}}</span>
<span class="pulse"></span>
{[ } ]} {[ } ]}
</a> </a>
{[ if (allow_contact_removal) { ]} {[ if (allow_contact_removal) { ]}
......
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