diff --git a/demo/anonymous.html b/demo/anonymous.html index 46bc035a2..83fca9b41 100644 --- a/demo/anonymous.html +++ b/demo/anonymous.html @@ -16,7 +16,7 @@ - + diff --git a/demo/embedded.html b/demo/embedded.html index 84f809d3e..c819103bd 100644 --- a/demo/embedded.html +++ b/demo/embedded.html @@ -17,7 +17,7 @@ - + diff --git a/demo/index.html b/demo/index.html index c5f441b9d..9ea5c4f26 100644 --- a/demo/index.html +++ b/demo/index.html @@ -16,7 +16,7 @@ - + diff --git a/demo/without_bundled_dependencies.html b/demo/without_bundled_dependencies.html index de5179daa..abd6e1fe2 100644 --- a/demo/without_bundled_dependencies.html +++ b/demo/without_bundled_dependencies.html @@ -51,7 +51,7 @@ - +
diff --git a/docs/source/_static/style.css b/docs/source/_static/style.css index ee83ce46d..a0ca19391 100644 --- a/docs/source/_static/style.css +++ b/docs/source/_static/style.css @@ -47,7 +47,7 @@ h5 { } .bs-sidenav .nav .nav .nav > li > a { font-size: 90%; - color: gray; + color: gray; } /* diff --git a/sass/_chatrooms.scss b/sass/_chatrooms.scss index 121ede5d5..66ce4b154 100644 --- a/sass/_chatrooms.scss +++ b/sass/_chatrooms.scss @@ -165,10 +165,10 @@ &.occupant { cursor: pointer; .occupant-status { - display: inline-block; + display: inline-block; margin-right: 0.5em; - width: 0.5em; - height: 0.5em; + width: 0.5em; + height: 0.5em; &.occupant-online, &.occupant-chat { background-color: #1A9707; diff --git a/sass/_core.scss b/sass/_core.scss index c75691581..e183c88d0 100644 --- a/sass/_core.scss +++ b/sass/_core.scss @@ -28,18 +28,18 @@ width: 100vw; } - ::-webkit-input-placeholder { /* Chrome/Opera/Safari */ + ::-webkit-input-placeholder { /* Chrome/Opera/Safari */ color: $subdued-color; - } - ::-moz-placeholder { /* Firefox 19+ */ + } + ::-moz-placeholder { /* Firefox 19+ */ color: $subdued-color; - } - :-ms-input-placeholder { /* IE 10+ */ + } + :-ms-input-placeholder { /* IE 10+ */ color: $subdued-color; - } - :-moz-placeholder { /* Firefox 18- */ + } + :-moz-placeholder { /* Firefox 18- */ color: $subdued-color; - } + } ::placeholder { color: $subdued-color; } @@ -61,33 +61,33 @@ } @keyframes colorchange-chatmessage { - 0% {background-color: rgba(141, 216, 174, 1);} - 25% {background-color: rgba(141, 216, 174, 0.75);} - 50% {background-color: rgba(141, 216, 174, 0.5);} - 75% {background-color: rgba(141, 216, 174, 0.25);} - 100% {background-color: transparent;} + 0% {background-color: rgba(141, 216, 174, 1);} + 25% {background-color: rgba(141, 216, 174, 0.75);} + 50% {background-color: rgba(141, 216, 174, 0.5);} + 75% {background-color: rgba(141, 216, 174, 0.25);} + 100% {background-color: transparent;} } @-webkit-keyframes colorchange-chatmessage { - 0% {background-color: rgba(141, 216, 174, 1);} - 25% {background-color: rgba(141, 216, 174, 0.75);} - 50% {background-color: rgba(141, 216, 174, 0.5);} - 75% {background-color: rgba(141, 216, 174, 0.25);} - 100% {background-color: transparent;} + 0% {background-color: rgba(141, 216, 174, 1);} + 25% {background-color: rgba(141, 216, 174, 0.75);} + 50% {background-color: rgba(141, 216, 174, 0.5);} + 75% {background-color: rgba(141, 216, 174, 0.25);} + 100% {background-color: transparent;} } @keyframes colorchange-chatmessage-muc { - 0% {background-color: rgba(255, 181, 162, 1);} - 25% {background-color: rgba(255, 181, 162, 0.75);} - 50% {background-color: rgba(255, 181, 162, 0.5);} - 75% {background-color: rgba(255, 181, 162, 0.25);} - 100% {background-color: transparent;} + 0% {background-color: rgba(255, 181, 162, 1);} + 25% {background-color: rgba(255, 181, 162, 0.75);} + 50% {background-color: rgba(255, 181, 162, 0.5);} + 75% {background-color: rgba(255, 181, 162, 0.25);} + 100% {background-color: transparent;} } @-webkit-keyframes colorchange-chatmessage-muc { - 0% {background-color: rgba(255, 181, 162, 1);} - 25% {background-color: rgba(255, 181, 162, 0.75);} - 50% {background-color: rgba(255, 181, 162, 0.5);} - 75% {background-color: rgba(255, 181, 162, 0.25);} - 100% {background-color: transparent;} + 0% {background-color: rgba(255, 181, 162, 1);} + 25% {background-color: rgba(255, 181, 162, 0.75);} + 50% {background-color: rgba(255, 181, 162, 0.5);} + 75% {background-color: rgba(255, 181, 162, 0.25);} + 100% {background-color: transparent;} } diff --git a/sass/_fonts.scss b/sass/_fonts.scss index 144ee92f5..ef854734b 100644 --- a/sass/_fonts.scss +++ b/sass/_fonts.scss @@ -29,84 +29,84 @@ #converse-embedded-chat, #conversejs { - .icon-address-book:before { content: "\270f"; } - .icon-attachment:before { content: "\e032"; } - .icon-away:before { content: "\25fb"; } - .icon-blocked:before { content: "\2718"; } - .icon-bold:before { content: "\e04d"; } - .icon-bubbles2:before { content: "\e016"; } - .icon-bubbles3:before { content: "\e017"; } - .icon-bubbles:before { content: "\e015"; } - .icon-busy:before { content: "\e004"; } - .icon-dnd:before { content: "\e004"; } - .icon-cancel-circle:before { content: "\e058"; } - .icon-checkmark:before { content: "\2713"; } - .icon-close:before { content: "\2715"; } - .icon-closed:before { content: "\25ba"; } - .icon-cog:before { content: "\e02f"; } - .icon-cogs:before { content: "\e022"; } - .icon-conversejs:before { content: "\e600"; } - .icon-database:before { content: "\f1c0"; } - .icon-envelope:before { content: "\f003"; } - .icon-exit:before { content: "\e601"; } - .icon-eye-blocked:before { content: "\e031"; } - .icon-eye:before { content: "\e030"; } - .icon-github:before { content: "\eab0"; } - .icon-globe:before { content: "\f0ac"; } - .icon-google2:before { content: "\ea89"; } - .icon-group:before { content: "\f0c0"; } - .icon-happy:before { content: "\263b"; } - .icon-heart2:before { content: "\f004"; } - .icon-heart:before { content: "\2764"; } - .icon-heart_empty:before { content: "\f08a"; } - .icon-hide-users:before { content: "\e01c"; } - .icon-home:before { content: "\e000"; } - .icon-idcard-dark:before { content: "\f2c2"; } - .icon-idcard:before { content: "\f2c3"; } - .icon-image:before { content: "\2b14"; } - .icon-info:before { content: "\2360"; } - .icon-italic:before { content: "\e04f"; } - .icon-key:before { content: "\e028"; } - .icon-legal:before { content: "\f0e3"; } - .icon-lock-2:before { content: "\e027"; } - .icon-minus:before { content: "\e05a"; } - .icon-music:before { content: "\266b"; } - .icon-newtab:before { content: "\e053"; } - .icon-notebook:before { content: "\2710"; } - .icon-notification:before { content: "\e01f"; } - .icon-offline:before { content: "\e002"; } - .icon-logout:before { content: "\e002"; } - .icon-online:before { content: "\25fc"; } - .icon-opened:before { content: "\25bc"; } - .icon-pencil:before { content: "\270e"; } - .icon-phone-hang-up:before { content: "\260e"; } - .icon-phone:before { content: "\260f"; } - .icon-plus:before { content: "\271a"; } - .icon-pushpin:before { content: "\e012"; } - .icon-quotes-left:before { content: "\e01d"; } - .icon-reddit:before { content: "\eac6"; } - .icon-remove:before { content: "\e02d"; } - .icon-room-info:before { content: "\e059"; } - .icon-save:before { content: "\f0c7"; } - .icon-search:before { content: "\e021"; } - .icon-show-users:before { content: "\e01e"; } - .icon-smiley:before { content: "\263a"; } - .icon-snowflake:before { content: "\f2dc"; } - .icon-spell-check:before { content: "\e045"; } - .icon-spinner:before { content: "\231b"; } - .icon-star:before { content: "\f005"; } - .icon-star_empty:before { content: "\f006"; } - .icon-strikethrough:before { content: "\e050"; } - .icon-twitter:before { content: "\ea96"; } - .icon-underline:before { content: "\e04e"; } - .icon-unlocked:before { content: "\e025"; } - .icon-user:before { content: "\e01a"; } - .icon-users:before { content: "\e01b"; } - .icon-warning:before { content: "\26a0"; } - .icon-wrench:before { content: "\e024"; } - .icon-xa:before { content: "\e602"; } - .icon-zoomin:before { content: "\e02b"; } - .icon-zoomout:before { content: "\e02a"; } + .icon-address-book:before { content: "\270f"; } + .icon-attachment:before { content: "\e032"; } + .icon-away:before { content: "\25fb"; } + .icon-blocked:before { content: "\2718"; } + .icon-bold:before { content: "\e04d"; } + .icon-bubbles2:before { content: "\e016"; } + .icon-bubbles3:before { content: "\e017"; } + .icon-bubbles:before { content: "\e015"; } + .icon-busy:before { content: "\e004"; } + .icon-dnd:before { content: "\e004"; } + .icon-cancel-circle:before { content: "\e058"; } + .icon-checkmark:before { content: "\2713"; } + .icon-close:before { content: "\2715"; } + .icon-closed:before { content: "\25ba"; } + .icon-cog:before { content: "\e02f"; } + .icon-cogs:before { content: "\e022"; } + .icon-conversejs:before { content: "\e600"; } + .icon-database:before { content: "\f1c0"; } + .icon-envelope:before { content: "\f003"; } + .icon-exit:before { content: "\e601"; } + .icon-eye-blocked:before { content: "\e031"; } + .icon-eye:before { content: "\e030"; } + .icon-github:before { content: "\eab0"; } + .icon-globe:before { content: "\f0ac"; } + .icon-google2:before { content: "\ea89"; } + .icon-group:before { content: "\f0c0"; } + .icon-happy:before { content: "\263b"; } + .icon-heart2:before { content: "\f004"; } + .icon-heart:before { content: "\2764"; } + .icon-heart_empty:before { content: "\f08a"; } + .icon-hide-users:before { content: "\e01c"; } + .icon-home:before { content: "\e000"; } + .icon-idcard-dark:before { content: "\f2c2"; } + .icon-idcard:before { content: "\f2c3"; } + .icon-image:before { content: "\2b14"; } + .icon-info:before { content: "\2360"; } + .icon-italic:before { content: "\e04f"; } + .icon-key:before { content: "\e028"; } + .icon-legal:before { content: "\f0e3"; } + .icon-lock-2:before { content: "\e027"; } + .icon-minus:before { content: "\e05a"; } + .icon-music:before { content: "\266b"; } + .icon-newtab:before { content: "\e053"; } + .icon-notebook:before { content: "\2710"; } + .icon-notification:before { content: "\e01f"; } + .icon-offline:before { content: "\e002"; } + .icon-logout:before { content: "\e002"; } + .icon-online:before { content: "\25fc"; } + .icon-opened:before { content: "\25bc"; } + .icon-pencil:before { content: "\270e"; } + .icon-phone-hang-up:before { content: "\260e"; } + .icon-phone:before { content: "\260f"; } + .icon-plus:before { content: "\271a"; } + .icon-pushpin:before { content: "\e012"; } + .icon-quotes-left:before { content: "\e01d"; } + .icon-reddit:before { content: "\eac6"; } + .icon-remove:before { content: "\e02d"; } + .icon-room-info:before { content: "\e059"; } + .icon-save:before { content: "\f0c7"; } + .icon-search:before { content: "\e021"; } + .icon-show-users:before { content: "\e01e"; } + .icon-smiley:before { content: "\263a"; } + .icon-snowflake:before { content: "\f2dc"; } + .icon-spell-check:before { content: "\e045"; } + .icon-spinner:before { content: "\231b"; } + .icon-star:before { content: "\f005"; } + .icon-star_empty:before { content: "\f006"; } + .icon-strikethrough:before { content: "\e050"; } + .icon-twitter:before { content: "\ea96"; } + .icon-underline:before { content: "\e04e"; } + .icon-unlocked:before { content: "\e025"; } + .icon-user:before { content: "\e01a"; } + .icon-users:before { content: "\e01b"; } + .icon-warning:before { content: "\26a0"; } + .icon-wrench:before { content: "\e024"; } + .icon-xa:before { content: "\e602"; } + .icon-zoomin:before { content: "\e02b"; } + .icon-zoomout:before { content: "\e02a"; } [data-icon]:before { content: attr(data-icon); diff --git a/src/templates/registration_request.html b/src/templates/registration_request.html index a21d05201..6d8d84152 100644 --- a/src/templates/registration_request.html +++ b/src/templates/registration_request.html @@ -1,5 +1,5 @@

{{{o.__("Hold tight, we're fetching the registration form…")}}}

{[ if (o.cancel) { ]} - + {[ } ]}