diff --git a/app.js b/app.js index 741cefc58a..ba309dba07 100644 --- a/app.js +++ b/app.js @@ -1048,21 +1048,30 @@ $(document).ready(function () { } }); + var updateTimeout; + var animateTimeout; + $("#reload_roomname").click(function () { + clearTimeout(updateTimeout); + clearTimeout(animateTimeout); + update_roomname(); + }); + function animate(word) { var currentVal = $("#enter_room_field").attr("placeholder"); $("#enter_room_field").attr("placeholder", currentVal + word.substr(0, 1)); - setTimeout(function() { + animateTimeout = setTimeout(function() { animate(word.substring(1, word.length)) - }, 150); + }, 70); } + function update_roomname() { var word = RoomNameGenerator.generateRoomWithoutSeparator(); $("#enter_room_field").attr("room_name", word); $("#enter_room_field").attr("placeholder", ""); animate(word); - setTimeout(update_roomname, 10000); + updateTimeout = setTimeout(update_roomname, 10000); } update_roomname(); diff --git a/css/font.css b/css/font.css index c03b02c0b0..e9fe8c2c7b 100755 --- a/css/font.css +++ b/css/font.css @@ -99,3 +99,7 @@ .icon-hangup:before { content: "\e617"; } + +.icon-reload:before { + content: "\e618"; +} diff --git a/css/welcome_page.css b/css/welcome_page.css index ced9165a64..75a8a55ad9 100644 --- a/css/welcome_page.css +++ b/css/welcome_page.css @@ -64,7 +64,7 @@ #enter_room_field { font-size: 16px; - padding: 15px 5px 10px 10px; + padding: 15px 0px 10px 10px; border: none; -webkit-appearance: none; width: 228px; @@ -99,7 +99,7 @@ #enter_room_container { margin: 70px auto 0px auto; - width:437px; + width:468px; } #enter_room{ @@ -210,4 +210,16 @@ padding-top: 30px; line-height: 22px; font-weight: 200; +} + +#reload_roomname +{ + width: 30px; + height: 19px; + color: #acacac; + margin-top: 22px; + z-index: 3; + float: left; + cursor: pointer; + text-align: center; } \ No newline at end of file diff --git a/fonts/jitsi.eot b/fonts/jitsi.eot index 9aafd530f5..fe5029e8a7 100755 Binary files a/fonts/jitsi.eot and b/fonts/jitsi.eot differ diff --git a/fonts/jitsi.svg b/fonts/jitsi.svg index 2e319a98a7..6f504253b4 100755 --- a/fonts/jitsi.svg +++ b/fonts/jitsi.svg @@ -31,4 +31,5 @@ + \ No newline at end of file diff --git a/fonts/jitsi.ttf b/fonts/jitsi.ttf index dbba4b0984..4dc1cbaf84 100755 Binary files a/fonts/jitsi.ttf and b/fonts/jitsi.ttf differ diff --git a/fonts/jitsi.woff b/fonts/jitsi.woff index 780ff9fa8f..765cb5dd29 100755 Binary files a/fonts/jitsi.woff and b/fonts/jitsi.woff differ diff --git a/fonts/selection.json b/fonts/selection.json index 75f79403b2..fb08aef9e9 100755 --- a/fonts/selection.json +++ b/fonts/selection.json @@ -1,6 +1,40 @@ { "IcoMoonType": "selection", "icons": [ + { + "icon": { + "paths": [ + "", + "M797.086 847.699c-0.059-0.163-0.119-0.328-0.16-0.485-71.399 45.638-151.782 69.931-234.023 69.931-0.013 0-0.021 0-0.028 0-122.52 0-237.501-52.772-315.469-144.741-99.778-117.698-134.252-329.954-73.022-427.789 4.004 1.662 7.875 3.233 11.68 4.773 13.585 5.511 26.413 10.716 42.305 19.096 6.063 3.202 12.338 4.812 18.673 4.812 11.714 0 22.6-5.648 29.848-15.486 7.815-10.617 10.313-24.778 6.538-36.951l-3.525-11.41c-10.687-34.59-21.723-70.354-34.211-105.078-9.983-27.765-22.399-62.327-59.226-62.327-12.057 0-26.037 3.656-46.73 12.204-44.294 18.319-71.058 29.961-114.534 49.81-15.102 6.887-25.234 22.698-25.203 39.343 0.028 15.842 8.992 29.337 23.975 36.115 18.208 8.257 30.536 13.716 43.468 19.447l10.687 4.753c-101.938 259.102 24.803 526.458 211.314 639.212 83.497 50.474 178.5 77.14 274.769 77.14h0.041c102.72 0 205.561-31.099 284.501-85.198-31.729-28.803-45.566-69.167-51.671-87.171z", + "M1098.203 749.91c-18.113-8.577-30.356-14.258-43.221-20.244l-10.496-4.892c106.448-257.268-15.569-526.801-200.067-642.788-85.36-53.663-183.123-82.032-282.716-82.032-104.848 0-206.41 30.593-285.967 86.165l-5.385 3.764c31.597 27.564 45.86 66.788 52.917 86.41 72.926-47.94 155.675-73.409 239.895-73.409 125.407 0 242.142 54.785 320.294 150.316 97.683 119.447 128.439 332.255 65.498 429.015-3.989-1.736-7.815-3.385-11.624-4.998-13.471-5.759-26.204-11.18-41.954-19.821-6.203-3.424-12.645-5.155-19.212-5.155-11.585 0-22.399 5.558-29.69 15.267-7.813 10.434-10.478 24.432-6.966 36.515l3.279 11.301c10.096 34.845 20.531 70.857 32.412 105.842 9.588 28.238 21.514 63.382 59.179 63.382 11.843 0 25.577-3.424 45.881-11.399 44.351-17.439 71.319-28.601 115.409-47.777 15.19-6.623 25.601-22.252 25.859-38.894 0.281-15.822-8.445-29.499-23.325-36.569z" + ], + "attrs": [ + {}, + {}, + {} + ], + "width": 1122, + "grid": 0, + "tags": [ + "reload" + ] + }, + "attrs": [ + {}, + {}, + {} + ], + "properties": { + "order": 25, + "id": 28, + "prevSize": 32, + "code": 58904, + "name": "reload", + "ligatures": "" + }, + "setIdx": 0, + "iconIdx": 0 + }, { "icon": { "paths": [ @@ -27,7 +61,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 0 + "iconIdx": 1 }, { "icon": { @@ -55,7 +89,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 1 + "iconIdx": 2 }, { "icon": { @@ -94,7 +128,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 2 + "iconIdx": 3 }, { "icon": { @@ -117,7 +151,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 3 + "iconIdx": 4 }, { "icon": { @@ -140,7 +174,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 4 + "iconIdx": 5 }, { "icon": { @@ -164,7 +198,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 5 + "iconIdx": 6 }, { "icon": { @@ -189,7 +223,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 6 + "iconIdx": 7 }, { "icon": { @@ -212,7 +246,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 7 + "iconIdx": 8 }, { "icon": { @@ -236,7 +270,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 8 + "iconIdx": 9 }, { "icon": { @@ -260,7 +294,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 9 + "iconIdx": 10 }, { "icon": { @@ -282,7 +316,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 10 + "iconIdx": 11 }, { "icon": { @@ -306,7 +340,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 11 + "iconIdx": 12 }, { "icon": { @@ -330,7 +364,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 12 + "iconIdx": 13 }, { "icon": { @@ -357,7 +391,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 13 + "iconIdx": 14 }, { "icon": { @@ -381,7 +415,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 14 + "iconIdx": 15 }, { "icon": { @@ -405,7 +439,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 15 + "iconIdx": 16 }, { "icon": { @@ -430,7 +464,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 16 + "iconIdx": 17 }, { "icon": { @@ -452,7 +486,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 17 + "iconIdx": 18 }, { "icon": { @@ -475,7 +509,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 18 + "iconIdx": 19 }, { "icon": { @@ -497,7 +531,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 19 + "iconIdx": 20 }, { "icon": { @@ -520,7 +554,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 20 + "iconIdx": 21 }, { "icon": { @@ -543,7 +577,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 21 + "iconIdx": 22 }, { "icon": { @@ -567,7 +601,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 22 + "iconIdx": 23 }, { "icon": { @@ -590,7 +624,7 @@ "ligatures": "" }, "setIdx": 0, - "iconIdx": 23 + "iconIdx": 24 } ], "height": 1024, diff --git a/index.html b/index.html index 24e9c8f51c..87cddd8cd2 100644 --- a/index.html +++ b/index.html @@ -29,7 +29,7 @@ - + @@ -79,7 +79,9 @@
+
+