use an updated font to include an hourglass glyph #482

Merged
merged 3 commits into from Mar 14, 2015
View
@@ -59,6 +59,10 @@ body {
vertical-align: middle;
}
+.bgStatus .currentBG.icon-hourglass {
+ font-size: 90px;
+}
+
.bgStatus .currentDirection {
font-weight: normal;
text-decoration: none;
@@ -259,6 +263,10 @@ div.tooltip {
line-height: 80px;
}
+ .bgStatus .currentBG.icon-hourglass {
+ font-size: 70px;
+ }
+
.bgStatus .currentDirection {
font-size: 70px;
line-height: 70px;
@@ -297,6 +305,10 @@ div.tooltip {
line-height: 60px;
}
+ .bgStatus .currentBG.icon-hourglass {
+ font-size: 50px;
+ }
+
.bgStatus .currentDirection {
font-size: 50px;
line-height: 50px;
@@ -345,6 +357,10 @@ div.tooltip {
line-height: 70px;
}
+ .bgStatus .currentBG.icon-hourglass {
+ font-size: 60px;
+ }
+
.bgStatus .currentDirection {
font-size: 60px;
line-height: 60px;
@@ -435,6 +451,10 @@ div.tooltip {
line-height: 80px;
}
+ .bgStatus .currentBG.icon-hourglass {
+ font-size: 70px;
+ }
+
.bgStatus .currentDirection {
font-size: 70px;
line-height: 70px;
@@ -462,6 +482,10 @@ div.tooltip {
line-height: 60px;
}
+ .bgStatus .currentBG.icon-hourglass {
+ font-size: 60px;
+ }
+
.bgStatus .currentDirection {
font-size: 50px;
line-height: 50px;
@@ -25,6 +25,12 @@
"src": "entypo"
},
{
+ "uid": "7f6916533c0842b6cec699fd773693d3",
+ "css": "hourglass",
+ "code": 59404,
+ "src": "entypo"
+ },
+ {
"uid": "jh3jpcb1t1bcm80gidkadilh080aq79h",
"css": "menu",
"code": 59395,
@@ -10,4 +10,5 @@
.icon-battery-100:before { content: '\e808'; } /* '' */
.icon-cancel-circled:before { content: '\e809'; } /* '' */
.icon-volume:before { content: '\e80a'; } /* '' */
-.icon-plus:before { content: '\e80b'; } /* '' */
+.icon-plus:before { content: '\e80b'; } /* '' */
+.icon-hourglass:before { content: '\e80c'; } /* '' */

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -10,4 +10,5 @@
.icon-battery-100 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cancel-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-volume { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
-.icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-hourglass { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
@@ -21,4 +21,5 @@
.icon-battery-100 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cancel-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-volume { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
-.icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
+.icon-hourglass { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
@@ -1,10 +1,10 @@
@font-face {
font-family: 'fontello';
- src: url('../font/fontello.eot?48374311');
- src: url('../font/fontello.eot?48374311#iefix') format('embedded-opentype'),
- url('../font/fontello.woff?48374311') format('woff'),
- url('../font/fontello.ttf?48374311') format('truetype'),
- url('../font/fontello.svg?48374311#fontello') format('svg');
+ src: url('../font/fontello.eot?46427953');
+ src: url('../font/fontello.eot?46427953#iefix') format('embedded-opentype'),
+ url('../font/fontello.woff?46427953') format('woff'),
+ url('../font/fontello.ttf?46427953') format('truetype'),
+ url('../font/fontello.svg?46427953#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -14,7 +14,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
- src: url('../font/fontello.svg?48374311#fontello') format('svg');
+ src: url('../font/fontello.svg?46427953#fontello') format('svg');
}
}
*/
@@ -61,4 +61,5 @@
.icon-battery-100:before { content: '\e808'; } /* '' */
.icon-cancel-circled:before { content: '\e809'; } /* '' */
.icon-volume:before { content: '\e80a'; } /* '' */
-.icon-plus:before { content: '\e80b'; } /* '' */
+.icon-plus:before { content: '\e80b'; } /* '' */
+.icon-hourglass:before { content: '\e80c'; } /* '' */
View
@@ -272,6 +272,9 @@
<div title="Code: 0xe80a" class="the-icons span3"><i class="icon-volume"></i> <span class="i-name">icon-volume</span><span class="i-code">0xe80a</span></div>
<div title="Code: 0xe80b" class="the-icons span3"><i class="icon-plus"></i> <span class="i-name">icon-plus</span><span class="i-code">0xe80b</span></div>
</div>
+ <div class="row">
+ <div title="Code: 0xe80c" class="the-icons span3"><i class="icon-hourglass"></i> <span class="i-name">icon-hourglass</span><span class="i-code">0xe80c</span></div>
+ </div>
</div>
<div class="container footer">Generated by <a href="http://fontello.com">fontello.com</a></div>
</body>
Binary file not shown.
@@ -1,14 +1,14 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2014 by original authors @ fontello.com</metadata>
+<metadata>Copyright (C) 2015 by original authors @ fontello.com</metadata>
<defs>
<font id="fontello" horiz-adv-x="1000" >
<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
<missing-glyph horiz-adv-x="1000" />
<glyph glyph-name="help-circled" unicode="&#xe800;" d="m0 350q0 95 37 182t100 149 149 100 183 37q95 0 182-37t149-100 100-149 37-182q0-95-37-182t-100-150-149-100-182-37q-96 0-183 37t-149 100-100 150-37 182z m117 0q0-71 28-137t75-112 112-75 137-28 136 28 112 75 75 112 28 137q0 95-47 176t-128 128-176 47-177-47-128-128-47-176z m216 176l31-101q45 29 93 29 49 0 49-23 0-4-2-8t-3-5-6-5-7-5-8-4l-8-4-40-21q-22-12-28-25t-6-37v-37h117v16q0 7 0 10t3 6 6 5q1 1 11 5t17 8 19 11 18 13q19 17 29 37t11 55q0 49-42 83t-106 34q-83 0-148-37z m48-334q0-32 21-49t55-17q33 0 54 17t20 49-20 49-54 18q-35 0-55-18t-21-49z" horiz-adv-x="937.5" />
-<glyph glyph-name="angle-double-up" unicode="&#xe801;" d="m43 118q0 7 6 13l260 260q5 5 12 5t13-5l260-260q6-6 6-13t-6-13l-28-28q-5-5-12-5t-13 5l-220 219-219-219q-5-5-13-5t-13 5l-27 28q-6 6-6 13z m0 214q0 7 6 13l260 260q5 6 12 6t13-6l260-260q6-6 6-13t-6-13l-28-28q-5-5-12-5t-13 5l-220 220-219-220q-5-5-13-5t-13 5l-27 28q-6 6-6 13z" horiz-adv-x="642.9" />
-<glyph glyph-name="angle-double-down" unicode="&#xe802;" d="m43 368q0 7 6 13l27 28q6 5 13 5t13-5l219-220 220 220q5 5 13 5t12-5l28-28q6-6 6-13t-6-13l-260-260q-5-6-13-6t-12 6l-260 260q-6 6-6 13z m0 214q0 7 6 13l27 28q6 5 13 5t13-5l219-220 220 220q5 5 13 5t12-5l28-28q6-6 6-13t-6-13l-260-260q-5-5-13-5t-12 5l-260 260q-6 6-6 13z" horiz-adv-x="642.9" />
+<glyph glyph-name="angle-double-up" unicode="&#xe801;" d="m600 118q0-7-6-13l-28-28q-5-5-12-5t-13 5l-220 219-219-219q-5-5-13-5t-13 5l-27 28q-6 6-6 13t6 13l260 260q5 5 12 5t13-5l260-260q6-6 6-13z m0 214q0-7-6-13l-28-28q-5-5-12-5t-13 5l-220 220-219-220q-5-5-13-5t-13 5l-27 28q-6 6-6 13t6 13l260 260q5 6 12 6t13-6l260-260q6-6 6-13z" horiz-adv-x="642.9" />
+<glyph glyph-name="angle-double-down" unicode="&#xe802;" d="m600 368q0-7-6-13l-260-260q-5-6-13-6t-12 6l-260 260q-6 6-6 13t6 13l27 28q6 5 13 5t13-5l219-220 220 220q5 5 13 5t12-5l28-28q6-6 6-13z m0 214q0-7-6-13l-260-260q-5-5-13-5t-12 5l-260 260q-6 6-6 13t6 13l27 28q6 5 13 5t13-5l219-220 220 220q5 5 13 5t12-5l28-28q6-6 6-13z" horiz-adv-x="642.9" />
<glyph glyph-name="menu" unicode="&#xe803;" d="m834 90q42 0 73-30t31-75q0-42-30-73t-74-31l-730 0q-44 0-74 31t-30 73q0 44 31 75t73 30l730 0z m0 364q44 0 74-31t30-73-30-73-74-30l-730 0q-44 0-74 30t-30 73 30 73 74 31l730 0z m0 365q44 0 74-31t30-73q0-43-31-74t-73-31l-730 0q-43 0-73 31t-31 74q0 43 30 73t74 31l730 0z" horiz-adv-x="938" />
<glyph glyph-name="battery-25" unicode="&#xe804;" d="m209 194q-21 0-37 15t-16 37l0 209q0 21 16 36t37 15 36-15 15-36l0-209q0-21-15-37t-36-15z m676 312q44 0 74-30t31-73l0-104q0-44-31-75t-74-30q0-65-46-111t-110-45l-573 0q-65 0-110 45t-46 111l0 312q0 65 46 111t110 46l573 0q65 0 110-46t46-111z m-104-312l0 312q0 22-15 37t-37 16l-573 0q-21 0-37-16t-15-37l0-312q0-21 15-36t37-15l573 0q21 0 37 15t15 36z" horiz-adv-x="990" />
<glyph glyph-name="battery-50" unicode="&#xe805;" d="m365 194q-21 0-37 15t-15 37l0 209q0 21 15 36t37 15 36-15 15-36l0-209q0-21-15-37t-36-15z m-156 0q-21 0-37 15t-16 37l0 209q0 21 16 36t37 15 36-15 15-36l0-209q0-21-15-37t-36-15z m676 312q44 0 74-30t31-73l0-104q0-44-31-75t-74-30q0-65-46-111t-110-45l-573 0q-65 0-110 45t-46 111l0 312q0 65 46 111t110 46l573 0q65 0 110-46t46-111z m-104-312l0 312q0 22-15 37t-37 16l-573 0q-21 0-37-16t-15-37l0-312q0-21 15-36t37-15l573 0q21 0 37 15t15 36z" horiz-adv-x="990" />
@@ -18,6 +18,7 @@
<glyph glyph-name="cancel-circled" unicode="&#xe809;" d="m420 770q174 0 297-123t123-297-123-297-297-123-297 123-123 297 123 297 297 123z m86-420l154 154-86 86-154-152-152 152-88-86 154-154-154-152 88-86 152 152 154-152 86 86z" horiz-adv-x="840" />
<glyph glyph-name="volume" unicode="&#xe80a;" d="m0 142l0 416 236 0 354 289 0-994-354 289-236 0z m652 35q73 74 73 176t-73 178l71 74q105-106 107-254 0-145-107-246z m118-119q123 119 123 295t-123 299l76 74q154-154 154-372t-154-372z" horiz-adv-x="1000" />
<glyph glyph-name="plus" unicode="&#xe80b;" d="m0 209l0 282 359 0 0 359 282 0 0-359 359 0 0-282-359 0 0-359-282 0 0 359-359 0z" horiz-adv-x="1000" />
+<glyph glyph-name="hourglass" unicode="&#xe80c;" d="m560 622q0-44-48-96t-97-99-49-77 49-76 97-97 48-97l0-118q0-34-86-73t-194-39-194 39-86 73l0 118q0 46 48 97t97 97 49 76-49 77-97 99-48 96l0 118q0 32 87 71t193 39 193-39 87-71l0-118z m-482 112l-18-14q-4-8 4-14 92-52 216-52 132 0 220 50 14 10-16 30-96 54-202 54-120 0-204-54z m228-384q0 18 4 33t18 33 20 25 31 31 29 28q92 92 92 122l2 50q-100-54-222-54t-222 54l4-50q0-32 90-122 6-6 22-21t23-22l19-19t17-21 11-20 9-23 3-24q0-10-1-19t-6-18-8-16-11-17l-12-15t-15-16-16-15-18-16-17-16q-90-90-90-122l0-66q8 4 66 23t92 43 34 58q0 30 26 30t26-30q0-34 33-58t94-43 67-23l0 66q0 30-92 122-4 4-21 20t-22 21-18 19-18 22-12 20-9 23-2 23z" horiz-adv-x="560" />
</font>
</defs>
</svg>
Binary file not shown.
Binary file not shown.
View
@@ -315,8 +315,10 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
function updateCurrentSGV(value) {
- if (value < 39) {
- currentBG.html(errorCodeToDisplay(value)).toggleClass('error-code');
+ if (value == 9) {
+ currentBG.text('');
+ } else if (value < 39) {
+ currentBG.html(errorCodeToDisplay(value));
} else if (value < 40) {
currentBG.text('LOW');
} else if (value > 400) {
@@ -330,6 +332,7 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
bgButton.addClass(sgvToColoredRange(value));
}
+ currentBG.toggleClass('icon-hourglass', value == 9);
currentBG.toggleClass('error-code', value < 39);
currentBG.toggleClass('bg-limit', value == 39 || value > 400);
}