Skip to content

Commit 6bdd13e

Browse files
committed
Remove icomoon font.
1 parent 271c456 commit 6bdd13e

File tree

9 files changed

+19
-1794
lines changed

9 files changed

+19
-1794
lines changed

CHANGES.rst

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
- Update dependencies.
1515

16+
- Remove ``icomoon`` font.
17+
1618

1719
1.7.5 2016-08-04
1820
----------------

bower.json

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"dependencies": {
55
"angular-translate": "~2.13",
66
"angular-translate-interpolation-messageformat": "~2.13",
7-
"icomoon": "~0.1.0",
87
"ionic": "~1.3",
98
"mopidy": "mopidy/mopidy.js#0.5.0"
109
}

gulpfile.js

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ gulp.task('dist', ['sass', 'bundle'], function() {
6969
'www/app/**/*.gif',
7070
'www/app/**/*.png',
7171
'www/lib/ionic/release/fonts/**',
72-
'www/lib/icomoon/fonts/**'
7372
], {base: 'www'})
7473
.pipe(gulp.dest(paths.dist));
7574
});

scss/_icomoon.scss

-1,753
This file was deleted.

scss/_style.scss

+9
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,15 @@ i {
8383
@extend .icon
8484
}
8585

86+
button {
87+
svg {
88+
fill: currentColor;
89+
height: 40px;
90+
vertical-align: middle;
91+
padding-bottom: 4px;
92+
}
93+
}
94+
8695
/* wider popup if generated from template */
8796
.popup-container.mopidy-mobile-popup .popup {
8897
width: 80% !important;

scss/ionic-dark.scss

-13
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,6 @@ $mopidy-mobile-thumbnail-artist-bg: url("#{$sprites-path}?v=#{$sprites-versi
1515
$mopidy-mobile-thumbnail-directory-bg: url("#{$sprites-path}?v=#{$sprites-version}") -128px 0;
1616
$mopidy-mobile-thumbnail-track-bg: url("#{$sprites-path}?v=#{$sprites-version}") -192px 0;
1717

18-
/* include icomoon icons */
19-
@import "icomoon";
20-
21-
/* everybody *loves* pacman */
22-
$mopidy-mobile-icon-consume: icomoon-pacman !default;
23-
24-
/* HACK: preload icomoon font */
25-
body:after {
26-
content: ' ';
27-
visibility: hidden;
28-
font-family: $icomoon-font-family;
29-
}
30-
3118
/* setup custom "dark" color scheme */
3219
$light: #fff !default;
3320
$stable: #ccc !default;

scss/ionic-light.scss

-13
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,6 @@ $mopidy-mobile-thumbnail-artist-bg: url("#{$sprites-path}?v=#{$sprites-versi
1515
$mopidy-mobile-thumbnail-directory-bg: url("#{$sprites-path}?v=#{$sprites-version}") -128px 0;
1616
$mopidy-mobile-thumbnail-track-bg: url("#{$sprites-path}?v=#{$sprites-version}") -192px 0;
1717

18-
/* include icomoon icons */
19-
@import "icomoon";
20-
21-
/* everybody *loves* pacman */
22-
$mopidy-mobile-icon-consume: icomoon-pacman !default;
23-
24-
/* HACK: preload icomoon font */
25-
body:after {
26-
content: ' ';
27-
visibility: hidden;
28-
font-family: $icomoon-font-family;
29-
}
30-
3118
/* FIXME: Ionic v1.3.2 sets button-clear color to transparent */
3219
$button-default-border: #b2b2b2 !default;
3320

www/app/settings/licenses.html

-12
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,6 @@ <h3>
6262
</h3>
6363
</div>
6464

65-
<div class="item">
66-
<h2>
67-
<a href="http://icomoon.io/" target="_system">IcoMoon-Free</a>
68-
</h2>
69-
<h3>Copyright &copy; 2014 Keyamoon.</h3>
70-
<h3>
71-
<a href="https://github.com/Keyamoon/IcoMoon-Free/blob/master/License.txt" target="_system">
72-
CC BY 4.0
73-
</a>
74-
</h3>
75-
</div>
76-
7765
<div class="item" ng-if="platform.isWebView()">
7866
<h2>
7967
<a href="http://cordova.apache.org/" target="_system">Apache Cordova</a>

www/app/tracklist/menu.html

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@
22
<ion-content scroll="false">
33
<ion-list>
44
<div class="item button-bar">
5-
<button class="button button-clear button-icon icon mopidy-mobile-icon-consume"
5+
<button class="button button-clear"
66
ng-class="{'button-positive': options.consume}"
77
ng-click="toggleConsume()"
88
>
9+
<svg viewBox="0 0 96 96">
10+
<g>
11+
<path d="M58.3,48l21.1-21.1c1.5-1.5,1.5-3.8,0-5.3c-7.1-7.1-16.5-11-26.4-11
12+
c-20.7,0-37.5,16.8-37.5,37.5S32.3,85.5,53,85.5c9.9,0,19.3-3.9,26.4-11c1.5-1.5,1.5-3.8,0-5.3L58.3,48z M47.3,36.8
13+
c-3.1,0-5.6-2.5-5.6-5.6s2.5-5.6,5.6-5.6c3.1,0,5.6,2.5,5.6,5.6S50.4,36.8,47.3,36.8z" />
14+
</g>
15+
</svg>
916
</button>
1017
<button class="button button-clear button-icon icon mopidy-mobile-icon-random"
1118
ng-class="{'button-positive': options.random}"

0 commit comments

Comments
 (0)