Skip to content

Commit

Permalink
feature 2916: font icons
Browse files Browse the repository at this point in the history 
* new icon for users
* icon for Batch Manager
* icon for Synchronize
* icon for Site Manager
* new icon for History
* new icon for Maintenance
* icon for Updates
* icon for Options
* icon for Menus
* icon for Templates
* new icon for Languages
* icon for Themes


git-svn-id: http://piwigo.org/svn/trunk@23357 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
@plegall
plegall committed Jun 18, 2013
1 parent 2e9265e commit 68b4a77
Show file tree
Hide file tree
Showing 13 changed files with 203 additions and 51 deletions.
18 changes: 18 additions & 0 deletions admin/themes/default/fontello/LICENSE.txt
View file
Expand Up @@ -10,6 +10,15 @@ Font license info
Homepage: http://fortawesome.github.com/Font-Awesome/


## Entypo

Copyright (C) 2012 by Daniel Bruce

Author: Daniel Bruce
License: CC BY-SA (http://creativecommons.org/licenses/by-sa/2.0/)
Homepage: http://www.entypo.com


## Elusive

Copyright (C) 2013 by Aristeides Stathopoulos
Expand All @@ -28,3 +37,12 @@ Font license info
Homepage: http://typicons.com/


## MFG Labs

Copyright (C) 2012 by Daniel Bruce

Author: MFG Labs
License: SIL (http://scripts.sil.org/OFL)
Homepage: http://www.mfglabs.com/


72 changes: 66 additions & 6 deletions admin/themes/default/fontello/config.json
View file
Expand Up @@ -33,12 +33,6 @@
"code": 128100,
"src": "fontawesome"
},
{
"uid": "31972e4e9d080eaa796290349ae6c1fd",
"css": "users",
"code": 128101,
"src": "fontawesome"
},
{
"uid": "381da2c2f7fd51f8de877c044d7f439d",
"css": "picture",
Expand Down Expand Up @@ -81,6 +75,12 @@
"code": 59149,
"src": "fontawesome"
},
{
"uid": "7034e4d22866af82bef811f52fb1ba46",
"css": "code",
"code": 59402,
"src": "fontawesome"
},
{
"uid": "d35a1d35efeb784d1dc9ac18b9b6c2b6",
"css": "pencil",
Expand All @@ -99,6 +99,12 @@
"code": 59177,
"src": "fontawesome"
},
{
"uid": "c95735c17a10af81448c7fed98a04546",
"css": "folder-open",
"code": 59398,
"src": "fontawesome"
},
{
"uid": "e99461abfef3923546da8d745372c995",
"css": "cog",
Expand Down Expand Up @@ -135,12 +141,30 @@
"code": 128683,
"src": "fontawesome"
},
{
"uid": "a73c5deb486c8d66249811642e5d719a",
"css": "arrows-cw",
"code": 59396,
"src": "fontawesome"
},
{
"uid": "37c5ab63f10d7ad0b84d0978dcd0c7a8",
"css": "shuffle",
"code": 128256,
"src": "fontawesome"
},
{
"uid": "6020aff067fc3c119cdd75daa5249220",
"css": "exchange",
"code": 59397,
"src": "fontawesome"
},
{
"uid": "d407a4707f719b042ed2ad28d2619d7e",
"css": "signal",
"code": 59393,
"src": "fontawesome"
},
{
"uid": "09bdae120f85e79f2db16145a9e1f6d8",
"css": "crop",
Expand All @@ -165,12 +189,48 @@
"code": 61672,
"src": "fontawesome"
},
{
"uid": "2cfb3f2b46b34a1790aec0aa846297b6",
"css": "menu",
"code": 59401,
"src": "entypo"
},
{
"uid": "6a7b9d4863bb7e6c79e9457a72d689b6",
"css": "tools",
"code": 59395,
"src": "entypo"
},
{
"uid": "39c4d0e225a1263a398a47523cb5b9bd",
"css": "brush",
"code": 59399,
"src": "entypo"
},
{
"uid": "ddecf5ad7935e3fb1b70dac6ed00d06a",
"css": "language",
"code": 59392,
"src": "entypo"
},
{
"uid": "4bcb3aaa98736be3027bef7c76c55021",
"css": "flow-branch",
"code": 59400,
"src": "entypo"
},
{
"uid": "xoidjr6q3rzi7tpw6hci1k6srz15g11l",
"css": "puzzle",
"code": 59318,
"src": "typicons"
},
{
"uid": "05ef9b5e8742971aa85b23cfcbe71594",
"css": "users",
"code": 59394,
"src": "mfglabs"
},
{
"uid": "10fdd98fb50c590b805a3ad6ff9c55f5",
"css": "asl",
Expand Down
14 changes: 12 additions & 2 deletions admin/themes/default/fontello/css/fontello-codes.css
View file
Expand Up @@ -4,26 +4,36 @@
.icon-home:before { content: '\2302'; } /* '⌂' */
.icon-star:before { content: '\2605'; } /* '★' */
.icon-star-empty:before { content: '\2606'; } /* '☆' */
.icon-menu:before { content: '\e809'; } /* '' */
.icon-tools:before { content: '\e803'; } /* '' */
.icon-cog:before { content: '\2699'; } /* '⚙' */
.icon-cog-alt:before { content: '\26ef'; } /* '⛯' */
.icon-mail:before { content: '\2709'; } /* '✉' */
.icon-pencil:before { content: '\270e'; } /* '✎' */
.icon-plus-circled:before { content: '\2795'; } /* '➕' */
.icon-asl:before { content: '\e0ad'; } /* '' */
.icon-puzzle:before { content: '\e7b6'; } /* '' */
.icon-eye:before { content: '\e70a'; } /* '' */
.icon-tags:before { content: '\e70d'; } /* '' */
.icon-chat:before { content: '\e720'; } /* '' */
.icon-trash:before { content: '\e729'; } /* '' */
.icon-basket:before { content: '\e73d'; } /* '' */
.icon-puzzle:before { content: '\e7b6'; } /* '' */
.icon-language:before { content: '\e800'; } /* '' */
.icon-arrows-cw:before { content: '\e804'; } /* '' */
.icon-flow-branch:before { content: '\e808'; } /* '' */
.icon-brush:before { content: '\e807'; } /* '' */
.icon-users:before { content: '\e802'; } /* '' */
.icon-tasks:before { content: '\f0ae'; } /* '' */
.icon-filter:before { content: '\f0b0'; } /* '' */
.icon-mail-alt:before { content: '\f0e0'; } /* '' */
.icon-sitemap:before { content: '\f0e8'; } /* '' */
.icon-exchange:before { content: '\e805'; } /* '' */
.icon-code:before { content: '\e80a'; } /* '' */
.icon-crop:before { content: '\f125'; } /* '' */
.icon-picture:before { content: '🌄'; } /* '\1f304' */
.icon-user:before { content: '👤'; } /* '\1f464' */
.icon-users:before { content: '👥'; } /* '\1f465' */
.icon-folder-open:before { content: '\e806'; } /* '' */
.icon-signal:before { content: '\e801'; } /* '' */
.icon-shuffle:before { content: '🔀'; } /* '\1f500' */
.icon-lock:before { content: '🔒'; } /* '\1f512' */
.icon-link:before { content: '🔗'; } /* '\1f517' */
Expand Down
26 changes: 18 additions & 8 deletions admin/themes/default/fontello/css/fontello-embedded.css
View file

Large diffs are not rendered by default.

14 changes: 12 additions & 2 deletions admin/themes/default/fontello/css/fontello-ie7-codes.css
View file
Expand Up @@ -2,26 +2,36 @@
.icon-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '⌂ '); }
.icon-star { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '★ '); }
.icon-star-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '☆ '); }
.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tools { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '⚙ '); }
.icon-cog-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '⛯ '); }
.icon-mail { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '✉ '); }
.icon-pencil { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '✎ '); }
.icon-plus-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '➕ '); }
.icon-asl { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-puzzle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-eye { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tags { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-chat { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-trash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-basket { *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-arrows-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-flow-branch { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-brush { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-users { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tasks { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-filter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-mail-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-sitemap { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-exchange { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-code { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-crop { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-picture { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🌄 '); }
.icon-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '👤 '); }
.icon-users { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '👥 '); }
.icon-folder-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-signal { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-shuffle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔀 '); }
.icon-lock { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔒 '); }
.icon-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔗 '); }
Expand Down
14 changes: 12 additions & 2 deletions admin/themes/default/fontello/css/fontello-ie7.css
View file
Expand Up @@ -13,26 +13,36 @@
.icon-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '⌂ '); }
.icon-star { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '★ '); }
.icon-star-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '☆ '); }
.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tools { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cog { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '⚙ '); }
.icon-cog-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '⛯ '); }
.icon-mail { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '✉ '); }
.icon-pencil { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '✎ '); }
.icon-plus-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '➕ '); }
.icon-asl { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-puzzle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-eye { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tags { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-chat { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-trash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-basket { *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-arrows-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-flow-branch { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-brush { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-users { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tasks { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-filter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-mail-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-sitemap { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-exchange { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-code { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-crop { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-picture { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🌄 '); }
.icon-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '👤 '); }
.icon-users { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '👥 '); }
.icon-folder-open { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-signal { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-shuffle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔀 '); }
.icon-lock { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔒 '); }
.icon-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔗 '); }
Expand Down
26 changes: 18 additions & 8 deletions admin/themes/default/fontello/css/fontello.css
View file
Expand Up @@ -2,11 +2,11 @@

@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?12579475');
src: url('../font/fontello.eot?12579475#iefix') format('embedded-opentype'),
url('../font/fontello.woff?12579475') format('woff'),
url('../font/fontello.ttf?12579475') format('truetype'),
url('../font/fontello.svg?12579475#fontello') format('svg');
src: url('../font/fontello.eot?77331641');
src: url('../font/fontello.eot?77331641#iefix') format('embedded-opentype'),
url('../font/fontello.woff?77331641') format('woff'),
url('../font/fontello.ttf?77331641') format('truetype'),
url('../font/fontello.svg?77331641#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
Expand All @@ -16,7 +16,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
src: url('../font/fontello.svg?12579475#fontello') format('svg');
src: url('../font/fontello.svg?77331641#fontello') format('svg');
}
}
*/
Expand Down Expand Up @@ -55,26 +55,36 @@
.icon-home:before { content: '\2302'; } /* '⌂' */
.icon-star:before { content: '\2605'; } /* '★' */
.icon-star-empty:before { content: '\2606'; } /* '☆' */
.icon-menu:before { content: '\e809'; } /* '' */
.icon-tools:before { content: '\e803'; } /* '' */
.icon-cog:before { content: '\2699'; } /* '⚙' */
.icon-cog-alt:before { content: '\26ef'; } /* '⛯' */
.icon-mail:before { content: '\2709'; } /* '✉' */
.icon-pencil:before { content: '\270e'; } /* '✎' */
.icon-plus-circled:before { content: '\2795'; } /* '➕' */
.icon-asl:before { content: '\e0ad'; } /* '' */
.icon-puzzle:before { content: '\e7b6'; } /* '' */
.icon-eye:before { content: '\e70a'; } /* '' */
.icon-tags:before { content: '\e70d'; } /* '' */
.icon-chat:before { content: '\e720'; } /* '' */
.icon-trash:before { content: '\e729'; } /* '' */
.icon-basket:before { content: '\e73d'; } /* '' */
.icon-puzzle:before { content: '\e7b6'; } /* '' */
.icon-language:before { content: '\e800'; } /* '' */
.icon-arrows-cw:before { content: '\e804'; } /* '' */
.icon-flow-branch:before { content: '\e808'; } /* '' */
.icon-brush:before { content: '\e807'; } /* '' */
.icon-users:before { content: '\e802'; } /* '' */
.icon-tasks:before { content: '\f0ae'; } /* '' */
.icon-filter:before { content: '\f0b0'; } /* '' */
.icon-mail-alt:before { content: '\f0e0'; } /* '' */
.icon-sitemap:before { content: '\f0e8'; } /* '' */
.icon-exchange:before { content: '\e805'; } /* '' */
.icon-code:before { content: '\e80a'; } /* '' */
.icon-crop:before { content: '\f125'; } /* '' */
.icon-picture:before { content: '🌄'; } /* '\1f304' */
.icon-user:before { content: '👤'; } /* '\1f464' */
.icon-users:before { content: '👥'; } /* '\1f465' */
.icon-folder-open:before { content: '\e806'; } /* '' */
.icon-signal:before { content: '\e801'; } /* '' */
.icon-shuffle:before { content: '🔀'; } /* '\1f500' */
.icon-lock:before { content: '🔒'; } /* '\1f512' */
.icon-link:before { content: '🔗'; } /* '\1f517' */
Expand Down

0 comments on commit 68b4a77

Please sign in to comment.