diff --git a/admin/themes/default/fontello/LICENSE.txt b/admin/themes/default/fontello/LICENSE.txt index 48e3b2041..6dd3f7199 100644 --- a/admin/themes/default/fontello/LICENSE.txt +++ b/admin/themes/default/fontello/LICENSE.txt @@ -1,15 +1,6 @@ Font license info -## Typicons - - (c) Stephen Hutchings 2012 - - Author: Stephen Hutchings - License: SIL (http://scripts.sil.org/OFL) - Homepage: http://typicons.com/ - - ## Entypo Copyright (C) 2012 by Daniel Bruce @@ -19,6 +10,15 @@ Font license info Homepage: http://www.entypo.com +## Typicons + + (c) Stephen Hutchings 2012 + + Author: Stephen Hutchings + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://typicons.com/ + + ## Font Awesome Copyright (C) 2016 by Dave Gandy diff --git a/admin/themes/default/fontello/config.json b/admin/themes/default/fontello/config.json index ec7d0b4a6..227edf63c 100644 --- a/admin/themes/default/fontello/config.json +++ b/admin/themes/default/fontello/config.json @@ -591,7 +591,7 @@ { "uid": "0d6ab2d08779e9f9d2b9199270b95909", "css": "user-minus", - "code": 59451, + "code": 59501, "src": "custom_icons", "selected": true, "svg": { @@ -815,7 +815,7 @@ { "uid": "7411608e7611ffd477aeec7d239f87e9", "css": "dice", - "code": 59401, + "code": 59500, "src": "custom_icons", "selected": false, "svg": { diff --git a/admin/themes/default/fontello/css/fontello-codes.css b/admin/themes/default/fontello/css/fontello-codes.css index c4ed07ad9..d4b729957 100644 --- a/admin/themes/default/fontello/css/fontello-codes.css +++ b/admin/themes/default/fontello/css/fontello-codes.css @@ -1,4 +1,5 @@ +.icon-home:before { content: '\2302'; } /* '⌂' */ .icon-puzzle:before { content: '\e7b6'; } /* '' */ .icon-language:before { content: '\e800'; } /* '' */ .icon-signal:before { content: '\e801'; } /* '' */ diff --git a/admin/themes/default/fontello/css/fontello-embedded.css b/admin/themes/default/fontello/css/fontello-embedded.css index c9bf465a2..5f4acd41b 100644 --- a/admin/themes/default/fontello/css/fontello-embedded.css +++ b/admin/themes/default/fontello/css/fontello-embedded.css @@ -57,6 +57,7 @@ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ } +.icon-home:before { content: '\2302'; } /* '⌂' */ .icon-puzzle:before { content: '\e7b6'; } /* '' */ .icon-language:before { content: '\e800'; } /* '' */ .icon-signal:before { content: '\e801'; } /* '' */ diff --git a/admin/themes/default/fontello/css/fontello-ie7-codes.css b/admin/themes/default/fontello/css/fontello-ie7-codes.css index b4eeda1aa..1319a611d 100644 --- a/admin/themes/default/fontello/css/fontello-ie7-codes.css +++ b/admin/themes/default/fontello/css/fontello-ie7-codes.css @@ -1,4 +1,5 @@ +.icon-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '⌂ '); } .icon-puzzle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-language { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-signal { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } diff --git a/admin/themes/default/fontello/css/fontello-ie7.css b/admin/themes/default/fontello/css/fontello-ie7.css index 411953158..801c71e39 100644 --- a/admin/themes/default/fontello/css/fontello-ie7.css +++ b/admin/themes/default/fontello/css/fontello-ie7.css @@ -10,6 +10,7 @@ /* font-size: 120%; */ } +.icon-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '⌂ '); } .icon-puzzle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-language { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-signal { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } diff --git a/admin/themes/default/fontello/css/fontello.css b/admin/themes/default/fontello/css/fontello.css index d194ca9fd..4614d19b8 100644 --- a/admin/themes/default/fontello/css/fontello.css +++ b/admin/themes/default/fontello/css/fontello.css @@ -54,6 +54,7 @@ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ } +.icon-home:before { content: '\2302'; } /* '⌂' */ .icon-puzzle:before { content: '\e7b6'; } /* '' */ .icon-language:before { content: '\e800'; } /* '' */ .icon-signal:before { content: '\e801'; } /* '' */ diff --git a/admin/themes/default/fontello/demo.html b/admin/themes/default/fontello/demo.html index 6d8b987a5..88d459f2a 100644 --- a/admin/themes/default/fontello/demo.html +++ b/admin/themes/default/fontello/demo.html @@ -211,6 +211,9 @@
+
+ icon-home0x2302 +
icon-puzzle0xe7b6
@@ -220,11 +223,11 @@
icon-signal0xe801
+
+
icon-users0xe802
-
-
icon-tools0xe803
@@ -234,11 +237,11 @@
icon-exchange0xe805
+
+
icon-folder-open0xe806
-
-
icon-brush0xe807
@@ -248,9 +251,6 @@
icon-menu0xe809
-
- icon-code0xe80a -
@@ -422,7 +422,7 @@
- icon-user-minus0xe83b + icon-heart0xe83b
icon-home0xe83c @@ -539,90 +539,91 @@
icon-th-list-10xe85c
+
icon-user-10xe86c
icon-hdd0xf0a0
-
-
icon-tasks0xf0ae
icon-filter0xf0b0
+
+
icon-docs0xf0c5
icon-list-bullet0xf0ca
-
-
icon-mail-alt0xf0e0
icon-sitemap0xf0e8
+
+
icon-bell0xf0f3
icon-circle-empty0xf10c
-
-
icon-crop0xf125
icon-ellipsis0xf141
+
+
icon-ellipsis-vert0xf142
icon-sort-name-up0xf15d
-
-
icon-sort-alt-up0xf160
icon-sort-alt-down0xf161
+
+
icon-sort-number-up0xf162
icon-right0xf178
-
-
icon-dot-circled0xf192
icon-database0xf1c0
+
+
icon-file-image0xf1c5
icon-file-code0xf1c9
-
-
icon-lifebuoy0xf1cd
icon-toggle-off0xf204
+
+
icon-toggle-on0xf205
diff --git a/admin/themes/default/fontello/font/fontello.svg b/admin/themes/default/fontello/font/fontello.svg index 20ae0bc7d..9840dbdc6 100644 --- a/admin/themes/default/fontello/font/fontello.svg +++ b/admin/themes/default/fontello/font/fontello.svg @@ -6,6 +6,8 @@ + + @@ -126,7 +128,7 @@ - +