Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
0e42170a
Commit
0e42170a
authored
May 27, 2014
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the fonticon spinner. Fixes #165
parent
1a92db89
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
99 additions
and
19 deletions
+99
-19
css/converse.css
css/converse.css
+47
-9
less/converse.less
less/converse.less
+52
-10
No files found.
css/converse.css
View file @
0e42170a
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
* Converse.js (Web-based XMPP instant messaging client)
* Converse.js (Web-based XMPP instant messaging client)
* http://conversejs.org
* http://conversejs.org
*
*
* Copyright (c) 2012, Jan-Carel Brand <jc@opkode.com>
* Copyright (c) 2012
-2014
, Jan-Carel Brand <jc@opkode.com>
*
Dual licensed under the MIT and GPL Licenses
*
Licensed under the Mozilla Public License
*/
*/
@font-face
{
@font-face
{
font-family
:
'Converse-js'
;
font-family
:
'Converse-js'
;
...
@@ -504,11 +504,53 @@ you can use the generic selector below, but it's slower:
...
@@ -504,11 +504,53 @@ you can use the generic selector below, but it's slower:
#conversejs
.locked
{
#conversejs
.locked
{
padding-right
:
22px
;
padding-right
:
22px
;
}
}
@-moz-keyframes
spin
{
0
%
{
-moz-transform
:
rotate
(
0deg
);
}
100
%
{
-moz-transform
:
rotate
(
359deg
);
}
}
@-webkit-keyframes
spin
{
0
%
{
-webkit-transform
:
rotate
(
0deg
);
}
100
%
{
-webkit-transform
:
rotate
(
359deg
);
}
}
@-o-keyframes
spin
{
0
%
{
-o-transform
:
rotate
(
0deg
);
}
100
%
{
-o-transform
:
rotate
(
359deg
);
}
}
@keyframes
spin
{
0
%
{
-webkit-transform
:
rotate
(
0deg
);
transform
:
rotate
(
0deg
);
}
100
%
{
-webkit-transform
:
rotate
(
359deg
);
transform
:
rotate
(
359deg
);
}
}
span
.spinner
:before
{
font-size
:
24px
;
font-family
:
'Converse-js'
!important
;
content
:
"\231b"
;
}
span
.spinner
{
span
.spinner
{
background
:
url(images/spinner.gif)
no-repeat
center
;
-webkit-animation
:
spin
2s
infinite
linear
;
height
:
22px
;
-moz-animation
:
spin
2s
infinite
linear
;
padding
:
0
2px
0
2px
;
-o-animation
:
spin
2s
infinite
linear
;
animation
:
spin
2s
infinite
linear
;
width
:
100%
;
display
:
block
;
display
:
block
;
text-align
:
center
;
}
}
span
.spinner.centered
{
span
.spinner.centered
{
text-align
:
center
;
text-align
:
center
;
...
@@ -554,10 +596,6 @@ span.spinner.hor_centered {
...
@@ -554,10 +596,6 @@ span.spinner.hor_centered {
#conversejs
#toggle-controlbox
{
#conversejs
#toggle-controlbox
{
float
:
right
;
float
:
right
;
}
}
#conversejs
#connecting-to-chat
{
background
:
url(images/spinner.gif)
no-repeat
left
;
padding-left
:
1.4em
;
}
#conversejs
.chat-head
{
#conversejs
.chat-head
{
color
:
#ffffff
;
color
:
#ffffff
;
font-size
:
100%
;
font-size
:
100%
;
...
...
less/converse.less
View file @
0e42170a
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
* Converse.js (Web-based XMPP instant messaging client)
* Converse.js (Web-based XMPP instant messaging client)
* http://conversejs.org
* http://conversejs.org
*
*
* Copyright (c) 2012, Jan-Carel Brand <jc@opkode.com>
* Copyright (c) 2012
-2014
, Jan-Carel Brand <jc@opkode.com>
*
Dual licensed under the MIT and GPL Licenses
*
Licensed under the Mozilla Public License
*/
*/
@import "variables.less";
@import "variables.less";
...
@@ -525,11 +525,58 @@ you can use the generic selector below, but it's slower:
...
@@ -525,11 +525,58 @@ you can use the generic selector below, but it's slower:
padding-right: 22px;
padding-right: 22px;
}
}
@-moz-keyframes spin {
0% {
-moz-transform: rotate(0deg);
}
100% {
-moz-transform: rotate(359deg);
}
}
@-webkit-keyframes spin {
0% {
-webkit-transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
}
}
@-o-keyframes spin {
0% {
-o-transform: rotate(0deg);
}
100% {
-o-transform: rotate(359deg);
}
}
@keyframes spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
transform: rotate(359deg);
}
}
span.spinner:before {
font-size: 24px;
font-family: 'Converse-js' !important;
content: "\231b";
}
span.spinner {
span.spinner {
background: url(images/spinner.gif) no-repeat center;
-webkit-animation: spin 2s infinite linear;
height: 22px;
-moz-animation: spin 2s infinite linear;
padding: 0 2px 0 2px;
-o-animation: spin 2s infinite linear;
animation: spin 2s infinite linear;
width: 100%;
display: block;
display: block;
text-align: center;
}
}
span.spinner.centered {
span.spinner.centered {
...
@@ -584,11 +631,6 @@ span.spinner.hor_centered {
...
@@ -584,11 +631,6 @@ span.spinner.hor_centered {
float: right;
float: right;
}
}
#conversejs #connecting-to-chat {
background: url(images/spinner.gif) no-repeat left;
padding-left: 1.4em;
}
#conversejs .chat-head {
#conversejs .chat-head {
color: #ffffff;
color: #ffffff;
font-size: 100%;
font-size: 100%;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment