Commit 15e5df74 authored by JC Brand's avatar JC Brand

Merge branch 'icomoon-xa-icon' of https://github.com/thierrytiti/converse.js...

Merge branch 'icomoon-xa-icon' of https://github.com/thierrytiti/converse.js into thierrytiti-icomoon-xa-icon
parents 7481fab0 85915a64
...@@ -288,7 +288,8 @@ ...@@ -288,7 +288,8 @@
content: "\2369"; } content: "\2369"; }
#conversejs .icon-wrench:before { #conversejs .icon-wrench:before {
content: "\e024"; } content: "\e024"; }
#conversejs .icon-xa:before, #conversejs .icon-xa:before {
content: "\e602"; }
#conversejs .icon-unavailable:before, #conversejs .icon-unavailable:before,
#conversejs .icon-offline:before { #conversejs .icon-offline:before {
content: "\e002"; } content: "\e002"; }
......
This diff is collapsed.
This diff is collapsed.
...@@ -20,6 +20,7 @@ Changelog ...@@ -20,6 +20,7 @@ Changelog
* Add automatic Away mode and XEP-0352 support [thierrytiti] * Add automatic Away mode and XEP-0352 support [thierrytiti]
* MUC: missing toggle Call handler and function [thierrytiti] * MUC: missing toggle Call handler and function [thierrytiti]
* Updated documentation about call [thierrytiti] * Updated documentation about call [thierrytiti]
* Add icon for XA status [thierrytiti]
0.9.3 (2015-05-01) 0.9.3 (2015-05-01)
------------------ ------------------
......
...@@ -108,9 +108,6 @@ p { ...@@ -108,9 +108,6 @@ p {
.pvs, .pts { .pvs, .pts {
padding-top: .25em; padding-top: .25em;
} }
.clearfix {
zoom: 1;
}
.unit { .unit {
float: left; float: left;
} }
...@@ -141,6 +138,7 @@ p { ...@@ -141,6 +138,7 @@ p {
height: 1.5em; height: 1.5em;
} }
#testDrive { #testDrive {
display: block;
padding-top: 24px; padding-top: 24px;
line-height: 1.5; line-height: 1.5;
} }
......
This diff is collapsed.
...@@ -98,4 +98,5 @@ ...@@ -98,4 +98,5 @@
<glyph unicode="&#xe05a;" d="M0 272v-96c0-8.836 7.164-16 16-16h480c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16h-480c-8.836 0-16-7.164-16-16z" /> <glyph unicode="&#xe05a;" d="M0 272v-96c0-8.836 7.164-16 16-16h480c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16h-480c-8.836 0-16-7.164-16-16z" />
<glyph unicode="&#xe600;" d="M39.349 399.017c-17.206 0-31.051-13.844-31.051-31.051v-361.923c0-17.207 13.845-31.068 31.051-31.068h323.589c17.207 0 31.068 13.861 31.068 31.068v361.923c0 17.207-13.861 31.051-31.068 31.051h-323.589zM46.803 392.288h309.317c16.698 0 30.151-13.454 30.151-30.151v-118.928l-46.498-52.778h-269.841l-5.207-4.325-47.364-54.733-0.761 83.5 0.242 2.526c-0.109 1.043-0.173 2.092-0.173 3.166v141.571c0 16.698 13.437 30.152 30.134 30.152zM274.731 341.379c-27.38 0-49.578-22.182-49.578-49.561s22.198-49.578 49.578-49.578c27.38 0 49.578 22.198 49.578 49.578s-22.199 49.561-49.578 49.561zM125.65 133.691c0.425 0.010 0.853 0 1.28 0 27.38 0 49.56-22.181 49.56-49.56s-22.181-49.578-49.56-49.578c-27.38 0-49.578 22.199-49.578 49.578 0 26.952 21.51 48.882 48.298 49.56z" horiz-adv-x="410" /> <glyph unicode="&#xe600;" d="M39.349 399.017c-17.206 0-31.051-13.844-31.051-31.051v-361.923c0-17.207 13.845-31.068 31.051-31.068h323.589c17.207 0 31.068 13.861 31.068 31.068v361.923c0 17.207-13.861 31.051-31.068 31.051h-323.589zM46.803 392.288h309.317c16.698 0 30.151-13.454 30.151-30.151v-118.928l-46.498-52.778h-269.841l-5.207-4.325-47.364-54.733-0.761 83.5 0.242 2.526c-0.109 1.043-0.173 2.092-0.173 3.166v141.571c0 16.698 13.437 30.152 30.134 30.152zM274.731 341.379c-27.38 0-49.578-22.182-49.578-49.561s22.198-49.578 49.578-49.578c27.38 0 49.578 22.198 49.578 49.578s-22.199 49.561-49.578 49.561zM125.65 133.691c0.425 0.010 0.853 0 1.28 0 27.38 0 49.56-22.181 49.56-49.56s-22.181-49.578-49.56-49.578c-27.38 0-49.578 22.199-49.578 49.578 0 26.952 21.51 48.882 48.298 49.56z" horiz-adv-x="410" />
<glyph unicode="&#xe601;" d="M384 160v64h-160v64h160v64l96-96zM352 192v-128h-160v-96l-192 96v416h352v-160h-32v128h-256l128-64v-288h128v96z" /> <glyph unicode="&#xe601;" d="M384 160v64h-160v64h160v64l96-96zM352 192v-128h-160v-96l-192 96v416h352v-160h-32v128h-256l128-64v-288h128v96z" />
<glyph unicode="&#xe602;" d="M353.825-31.334c-7.731 0.603-18.904 2.467-26.955 4.5-31.274 7.894-61.113 27.811-80.623 53.813l-4.316 5.753-6.785 0.453c-3.732 0.249-9.418 0.76-12.637 1.137l-5.853 0.684-4.602-4.351c-42.045-39.748-93.922-58.769-167.866-61.551l-11.84-0.445v14.216l3.395 1.834c13.346 7.21 24.137 15.128 33.861 24.846 12.21 12.202 19.795 24.279 23.617 37.604 2.056 7.17 3.198 16.551 2.683 22.043-0.975 10.388-0.341 9.2-7.671 14.407-17.231 12.243-36.264 30.14-47.508 44.673-15.707 20.301-27.456 42.712-33.645 64.178-10.544 36.57-8.728 76.714 5.058 111.801 35.493 90.334 141.651 150.144 257.076 144.836 36.486-1.678 67.24-8.061 98.589-20.464 70.337-27.826 121.201-80.164 138.156-142.162 4.647-16.993 6.614-33.061 6.051-49.422-0.656-19.032-3.22-33.797-8.839-50.891l-2.351-7.154 1.998-5.519c12.073-33.353 12.431-69.262 1.027-103.235-3.092-9.213-11.693-26.695-17.157-34.877-14.281-21.379-32.64-38.055-55.062-50.013-23.134-12.337-52.597-18.66-77.8-16.696v0zM377.786 8.294c11.009 1.305 24.373 5.429 35.034 10.81 19.764 9.974 38.827 29.211 48.958 49.404 25.974 51.769 9.822 114.569-37.703 146.593-11.748 7.916-25.447 13.569-40.299 16.629-10.827 2.231-29.448 2.262-40.399 0.069-73.502-14.72-112.105-95.584-78.077-163.556 12.747-25.462 36.724-46.281 63.726-55.334 15.912-5.334 30.803-6.743 48.76-4.614v0zM375.29 80.832l-30.783 31.428v84.055h37.938v-67.702l24.959-25.536c13.728-14.045 24.952-25.75 24.943-26.012s-5.924-6.592-13.145-14.067l-13.13-13.591-30.783 31.428zM168.934 79.403c2.823 2.651 7.016 6.212 9.318 7.912 9.934 7.339 23.738 12.284 34.286 12.284h3.566l-0.527 5.169c-0.906 8.889-0.505 29.149 0.744 37.519 4.928 33.042 18.965 61.7 41.608 84.95 12.924 13.27 25.206 22.282 40.984 30.072 19.443 9.6 37.712 14.121 59.903 14.825 29.371 0.931 55.94-6.053 81.034-21.303l7.155-4.348v2.429c-0.006 3.828-1.878 14.427-3.697 20.908-6.327 22.552-20.584 44.728-39.897 62.057-30.675 27.524-68.606 44.101-116.477 50.902-10.048 1.428-39.526 2.019-50.95 1.022-46.279-4.039-86.225-19.189-119.439-45.298-6.522-5.127-21.262-20.093-26.063-26.464-27.791-36.876-33.073-78.923-14.783-117.696 10.785-22.863 29.244-43.615 53.472-60.116 10.876-7.408 18.928-16.449 24.006-26.957 3.623-7.498 5.441-14.452 6.362-24.327 0.394-4.229 0.855-8.399 1.024-9.265 0.303-1.552 0.329-1.557 1.774-0.336 0.806 0.682 3.776 3.409 6.599 6.060h-0.002z" />
</font></defs></svg> </font></defs></svg>
\ No newline at end of file
This diff is collapsed.
@font-face { @font-face {
font-family: 'icomoon'; font-family: 'icomoon';
src:url('fonts/icomoon.eot?-mnoxh0'); src:url('fonts/icomoon.eot?dvaucx');
src:url('fonts/icomoon.eot?#iefix-mnoxh0') format('embedded-opentype'), src:url('fonts/icomoon.eot?#iefixdvaucx') format('embedded-opentype'),
url('fonts/icomoon.woff?-mnoxh0') format('woff'), url('fonts/icomoon.ttf?dvaucx') format('truetype'),
url('fonts/icomoon.ttf?-mnoxh0') format('truetype'), url('fonts/icomoon.woff?dvaucx') format('woff'),
url('fonts/icomoon.svg?-mnoxh0#icomoon') format('svg'); url('fonts/icomoon.svg?dvaucx#icomoon') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
...@@ -23,276 +23,279 @@ ...@@ -23,276 +23,279 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
#conversejs .icon-conversejs:before { .icon-xa:before {
content: "\e602";
}
.icon-conversejs:before {
content: "\e600"; content: "\e600";
} }
#conversejs .icon-closed:before { .icon-closed:before {
content: "\25ba"; content: "\25ba";
} }
#conversejs .icon-opened:before { .icon-opened:before {
content: "\25bc"; content: "\25bc";
} }
#conversejs .icon-checkmark:before { .icon-checkmark:before {
content: "\2713"; content: "\2713";
} }
#conversejs .icon-home:before { .icon-home:before {
content: "\e000"; content: "\e000";
} }
#conversejs .icon-pencil:before { .icon-pencil:before {
content: "\270e"; content: "\270e";
} }
#conversejs .icon-camera:before { .icon-camera:before {
content: "\e003"; content: "\e003";
} }
#conversejs .icon-camera-2:before { .icon-camera-2:before {
content: "\2616"; content: "\2616";
} }
#conversejs .icon-play:before { .icon-play:before {
content: "\25d9"; content: "\25d9";
} }
#conversejs .icon-music:before { .icon-music:before {
content: "\266b"; content: "\266b";
} }
#conversejs .icon-headphones:before { .icon-headphones:before {
content: "\266c"; content: "\266c";
} }
#conversejs .icon-phone:before { .icon-phone:before {
content: "\260f"; content: "\260f";
} }
#conversejs .icon-phone-hang-up:before { .icon-phone-hang-up:before {
content: "\260e"; content: "\260e";
} }
#conversejs .icon-address-book:before { .icon-address-book:before {
content: "\270f"; content: "\270f";
} }
#conversejs .icon-notebook:before { .icon-notebook:before {
content: "\2710"; content: "\2710";
} }
#conversejs .icon-envelop:before { .icon-envelop:before {
content: "\2709"; content: "\2709";
} }
#conversejs .icon-pushpin:before { .icon-pushpin:before {
content: "\e012"; content: "\e012";
} }
#conversejs .icon-online:before { .icon-online:before {
content: "\25fc"; content: "\25fc";
} }
#conversejs .icon-away:before { .icon-away:before {
content: "\25fb"; content: "\25fb";
} }
#conversejs .icon-bubbles:before { .icon-bubbles:before {
content: "\e015"; content: "\e015";
} }
#conversejs .icon-bubbles2:before { .icon-bubbles2:before {
content: "\e016"; content: "\e016";
} }
#conversejs .icon-bubbles3:before { .icon-bubbles3:before {
content: "\e017"; content: "\e017";
} }
#conversejs .icon-user:before { .icon-user:before {
content: "\e01a"; content: "\e01a";
} }
#conversejs .icon-hide-users:before { .icon-hide-users:before {
content: "\e01c"; content: "\e01c";
} }
#conversejs .icon-show-users:before { .icon-show-users:before {
content: "\e01e"; content: "\e01e";
} }
#conversejs .icon-users:before { .icon-users:before {
content: "\e01b"; content: "\e01b";
} }
#conversejs .icon-quotes-left:before { .icon-quotes-left:before {
content: "\e01d"; content: "\e01d";
} }
#conversejs .icon-spinner:before { .icon-spinner:before {
content: "\231b"; content: "\231b";
} }
#conversejs .icon-search:before { .icon-search:before {
content: "\e021"; content: "\e021";
} }
#conversejs .icon-cogs:before { .icon-cogs:before {
content: "\e022"; content: "\e022";
} }
#conversejs .icon-wrench:before { .icon-wrench:before {
content: "\e024"; content: "\e024";
} }
#conversejs .icon-unlocked:before { .icon-unlocked:before {
content: "\e025"; content: "\e025";
} }
#conversejs .icon-lock:before { .icon-lock:before {
content: "\e026"; content: "\e026";
} }
#conversejs .icon-lock-2:before { .icon-lock-2:before {
content: "\e027"; content: "\e027";
} }
#conversejs .icon-key:before { .icon-key:before {
content: "\e028"; content: "\e028";
} }
#conversejs .icon-key-2:before { .icon-key-2:before {
content: "\e029"; content: "\e029";
} }
#conversejs .icon-zoomout:before { .icon-zoomout:before {
content: "\e02a"; content: "\e02a";
} }
#conversejs .icon-zoomin:before { .icon-zoomin:before {
content: "\e02b"; content: "\e02b";
} }
#conversejs .icon-cog:before { .icon-cog:before {
content: "\e02f"; content: "\e02f";
} }
#conversejs .icon-remove:before { .icon-remove:before {
content: "\e02d"; content: "\e02d";
} }
#conversejs .icon-eye:before { .icon-eye:before {
content: "\e030"; content: "\e030";
} }
#conversejs .icon-eye-blocked:before { .icon-eye-blocked:before {
content: "\e031"; content: "\e031";
} }
#conversejs .icon-attachment:before { .icon-attachment:before {
content: "\e032"; content: "\e032";
} }
#conversejs .icon-globe:before { .icon-globe:before {
content: "\e033"; content: "\e033";
} }
#conversejs .icon-heart:before { .icon-heart:before {
content: "\2764"; content: "\2764";
} }
#conversejs .icon-happy:before { .icon-happy:before {
content: "\263b"; content: "\263b";
} }
#conversejs .icon-thumbs-up:before { .icon-thumbs-up:before {
content: "\261d"; content: "\261d";
} }
#conversejs .icon-smiley:before { .icon-smiley:before {
content: "\263a"; content: "\263a";
} }
#conversejs .icon-tongue:before { .icon-tongue:before {
content: "\e038"; content: "\e038";
} }
#conversejs .icon-sad:before { .icon-sad:before {
content: "\2639"; content: "\2639";
} }
#conversejs .icon-wink:before { .icon-wink:before {
content: "\e03a"; content: "\e03a";
} }
#conversejs .icon-wondering:before { .icon-wondering:before {
content: "\2369"; content: "\2369";
} }
#conversejs .icon-confused:before { .icon-confused:before {
content: "\2368"; content: "\2368";
} }
#conversejs .icon-shocked:before { .icon-shocked:before {
content: "\2364"; content: "\2364";
} }
#conversejs .icon-evil:before { .icon-evil:before {
content: "\261f"; content: "\261f";
} }
#conversejs .icon-angry:before { .icon-angry:before {
content: "\e03f"; content: "\e03f";
} }
#conversejs .icon-cool:before { .icon-cool:before {
content: "\e040"; content: "\e040";
} }
#conversejs .icon-grin:before { .icon-grin:before {
content: "\e041"; content: "\e041";
} }
#conversejs .icon-info:before { .icon-info:before {
content: "\2360"; content: "\2360";
} }
#conversejs .icon-notification:before { .icon-notification:before {
content: "\e01f"; content: "\e01f";
} }
#conversejs .icon-warning:before { .icon-warning:before {
content: "\26a0"; content: "\26a0";
} }
#conversejs .icon-spell-check:before { .icon-spell-check:before {
content: "\e045"; content: "\e045";
} }
#conversejs .icon-volume-high:before { .icon-volume-high:before {
content: "\e046"; content: "\e046";
} }
#conversejs .icon-volume-medium:before { .icon-volume-medium:before {
content: "\e047"; content: "\e047";
} }
#conversejs .icon-volume-low:before { .icon-volume-low:before {
content: "\e048"; content: "\e048";
} }
#conversejs .icon-volume-mute:before { .icon-volume-mute:before {
content: "\e049"; content: "\e049";
} }
#conversejs .icon-volume-mute2:before { .icon-volume-mute2:before {
content: "\e04a"; content: "\e04a";
} }
#conversejs .icon-volume-decrease:before { .icon-volume-decrease:before {
content: "\e04b"; content: "\e04b";
} }
#conversejs .icon-volume-increase:before { .icon-volume-increase:before {
content: "\e04c"; content: "\e04c";
} }
#conversejs .icon-bold:before { .icon-bold:before {
content: "\e04d"; content: "\e04d";
} }
#conversejs .icon-underline:before { .icon-underline:before {
content: "\e04e"; content: "\e04e";
} }
#conversejs .icon-italic:before { .icon-italic:before {
content: "\e04f"; content: "\e04f";
} }
#conversejs .icon-strikethrough:before { .icon-strikethrough:before {
content: "\e050"; content: "\e050";
} }
#conversejs .icon-newtab:before { .icon-newtab:before {
content: "\e053"; content: "\e053";
} }
#conversejs .icon-youtube:before { .icon-youtube:before {
content: "\e055"; content: "\e055";
} }
#conversejs .icon-close:before { .icon-close:before {
content: "\2715"; content: "\2715";
} }
#conversejs .icon-blocked:before { .icon-blocked:before {
content: "\2718"; content: "\2718";
} }
#conversejs .icon-cancel-circle:before { .icon-cancel-circle:before {
content: "\e058"; content: "\e058";
} }
#conversejs .icon-minus:before { .icon-minus:before {
content: "\e05a"; content: "\e05a";
} }
#conversejs .icon-plus:before { .icon-plus:before {
content: "\271a"; content: "\271a";
} }
#conversejs .icon-checkbox-checked:before { .icon-checkbox-checked:before {
content: "\2611"; content: "\2611";
} }
#conversejs .icon-checkbox-unchecked:before { .icon-checkbox-unchecked:before {
content: "\2b27"; content: "\2b27";
} }
#conversejs .icon-checkbox-partial:before { .icon-checkbox-partial:before {
content: "\2b28"; content: "\2b28";
} }
#conversejs .icon-radio-checked:before { .icon-radio-checked:before {
content: "\2b26"; content: "\2b26";
} }
#conversejs .icon-radio-unchecked:before { .icon-radio-unchecked:before {
content: "\2b25"; content: "\2b25";
} }
#conversejs .icon-room-info:before { .icon-room-info:before {
content: "\e059"; content: "\e059";
} }
#conversejs .icon-newspaper:before { .icon-newspaper:before {
content: "\e001"; content: "\e001";
} }
#conversejs .icon-image:before { .icon-image:before {
content: "\2b14"; content: "\2b14";
} }
#conversejs .icon-offline:before { .icon-offline:before {
content: "\e002"; content: "\e002";
} }
#conversejs .icon-busy:before { .icon-busy:before {
content: "\e004"; content: "\e004";
} }
#conversejs .icon-exit:before { .icon-exit:before {
content: "\e601"; content: "\e601";
} }
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
.icon-wink:before { content: "\e03a"; } .icon-wink:before { content: "\e03a"; }
.icon-wondering:before { content: "\2369"; } .icon-wondering:before { content: "\2369"; }
.icon-wrench:before { content: "\e024"; } .icon-wrench:before { content: "\e024"; }
.icon-xa:before, .icon-xa:before { content: "\e602"; }
.icon-unavailable:before, .icon-unavailable:before,
.icon-offline:before { content: "\e002"; } .icon-offline:before { content: "\e002"; }
.icon-youtube:before { content: "\e055"; } .icon-youtube:before { content: "\e055"; }
......
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