Commit 350796d1 authored by yPhil's avatar yPhil

Merge branch 'current'

parents d607ec9f 0499e5c6
Pipeline #89613 passed with stage
in 3 minutes and 40 seconds
@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?70380129');
src: url('../font/fontello.eot?70380129#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?70380129') format('woff2'),
url('../font/fontello.woff?70380129') format('woff'),
url('../font/fontello.ttf?70380129') format('truetype'),
url('../font/fontello.svg?70380129#fontello') format('svg');
src: url('../font/fontello.eot?41517794');
src: url('../font/fontello.eot?41517794#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?41517794') format('woff2'),
url('../font/fontello.woff?41517794') format('woff'),
url('../font/fontello.ttf?41517794') format('truetype'),
url('../font/fontello.svg?41517794#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
......@@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
src: url('../font/fontello.svg?70380129#fontello') format('svg');
src: url('../font/fontello.svg?41517794#fontello') format('svg');
}
}
*/
......@@ -83,4 +83,5 @@
.icon-export:before { content: '\f02e'; } /* '' */
.icon-uncheck:before { content: '\f096'; } /* '' */
.icon-rzz:before { content: '\f143'; } /* '' */
.icon-bomb:before { content: '\f1e2'; } /* '' */
\ No newline at end of file
.icon-bomb:before { content: '\f1e2'; } /* '' */
.icon-search:before { content: '\f50d'; } /* '' */
\ No newline at end of file
No preview for this file type
......@@ -63,6 +63,8 @@
<glyph glyph-name="rzz" unicode="&#xf143;" d="M286 136q0 29-21 50t-51 21-50-21-21-50 21-51 50-21 51 21 21 51z m196-53q-8 130-99 222t-221 98q-8 1-14-5t-5-13v-71q0-7 5-12t12-6q86-6 147-68t67-147q1-7 6-12t12-5h72q7 0 13 6t5 13z m214 0q-3 86-31 166t-78 145-115 114-145 78-166 31q-7 1-13-5-5-5-5-13v-71q0-7 5-12t12-6q114-4 211-62t156-155 62-211q0-8 5-13t13-5h71q7 0 13 6 6 5 5 13z m161 535v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" />
<glyph glyph-name="bomb" unicode="&#xf1e2;" d="M319 521q-6 14-19 20t-28 0q-60-25-106-71t-71-107q-6-14 0-27t19-19q8-3 14-3 23 0 33 23 19 47 55 83t83 54q14 7 20 20t0 27z m525 199l26-26-136-135 38-38q10-11 10-26t-10-25l-36-36q50-90 50-191 0-80-31-153t-84-125-125-84-153-31-153 31-125 84-84 125-31 153 31 153 84 125 125 84 153 31q101 0 191-50l36 36q11 10 25 10t26-10l38-38z m5 31q-6-5-12-5-8 0-13 5l-51 51q-5 5-5 12t5 13q6 5 13 5t13-5l50-51q5-5 5-12t-5-13z m128-128q-6-5-13-5t-12 5l-51 51q-5 5-5 12t5 13q5 5 13 5t12-5l51-50q5-6 5-13t-5-13z m23 102q0-8-5-13t-13-5h-53q-8 0-13 5t-5 13 5 13 13 5h53q8 0 13-5t5-13z m-107 107v-53q0-8-5-13t-13-5-13 5-5 13v53q0 8 5 13t13 5 13-5 5-13z m84-30l-51-51q-5-5-12-5-7 0-13 5-5 5-5 13t5 12l51 51q5 5 12 5t13-5q5-5 5-13t-5-12z" horiz-adv-x="1000" />
<glyph glyph-name="search" unicode="&#xf50d;" d="M11 375q-23 87 0 173t87 150q48 49 110 74t128 25q65 0 127-25t110-74q52-52 77-119t21-137-36-132q28-8 49-29l174-173q35-35 35-85t-35-85q-35-35-85-35t-85 35l-173 174q-22 20-30 49-70-35-149-35-66 0-128 25t-110 73q-64 64-87 151z m101 86q0-93 65-158 66-65 159-65 92 0 157 65t66 158-66 158q-66 66-157 66-92 0-159-66-65-65-65-158z" horiz-adv-x="892.6" />
</font>
</defs>
</svg>
\ No newline at end of file
No preview for this file type
......@@ -207,7 +207,7 @@ PTL.dialog = {
$guessButton.click(function() {
$guessSpinner
.removeClass('icon-ok icon-cancel-circled icon-flashlight ui-state-success ui-state-error')
.removeClass('icon-ok icon-cancel-circled icon-search ui-state-success ui-state-error')
.addClass('spin icon-cog');
$guessButton.removeClass('icon-ok ui-state-success ui-state-error');
......
......@@ -16,7 +16,7 @@
data-title="Find the feed for this URL, or build a new one from the search query"
class="shrink translate"
type="button">
<i class="icon-flashlight"></i>
<i class="icon-search"></i>
</button>
</div>
......@@ -160,7 +160,6 @@
</span>
</p>
<h3 class="translate"
data-title="What is a group?"
data-content="Why didn't I have to register? Where are my groups and feeds saved?">Why didn't I have to register? Where are my groups and feeds saved?</h3>
<p>
<span class="translate"
......@@ -169,7 +168,6 @@
</span>
</p>
<h4 class="translate"
data-title="How can I view the same feeds on all my devices (like my phone)?"
data-content="How can I view the same feeds on all my devices (like my phone)?">How can I view the same feeds on all my devices (like my phone)?</h4>
<p>
<span class="translate"
......
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