Skip to content
This repository has been archived by the owner on Dec 12, 2024. It is now read-only.

Commit

Permalink
merge wip to master
Browse files Browse the repository at this point in the history
  • Loading branch information
wylkon committed Nov 25, 2014
2 parents 79a9f62 + bdd1ec8 commit baecfee
Show file tree
Hide file tree
Showing 13 changed files with 792 additions and 670 deletions.
Binary file modified source/assets/stylesheets/fonts/locastyle-panel-icons.eot
Binary file not shown.
64 changes: 48 additions & 16 deletions source/assets/stylesheets/fonts/locastyle-panel-icons.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,36 @@
{
"IcoMoonType": "selection",
"icons": [
{
"icon": {
"paths": [
"M330.731 341.205h-55.488v176.704h50.027c31.275 0 55.211-7.701 71.744-23.168 16.555-15.488 24.832-37.781 24.832-66.859 0-27.328-7.979-48.576-23.936-63.829-15.936-15.232-38.315-22.848-67.179-22.848zM328.811 486.955h-16.085v-115.051h19.968c33.515 0 50.283 18.987 50.283 56.939-0.021 38.763-18.069 58.112-54.165 58.112zM888.427 177.813h-754.368c-19.2 0-34.752 15.552-34.752 34.709v476.395c0 19.179 15.552 34.773 34.752 34.773h268.352v60.181h-84.011c-35.371 0-64.085 26.688-64.085 62.101h515.712c0-35.413-28.715-62.101-64.085-62.101h-77.696v-60.181h260.16c19.2 0 34.773-15.573 34.773-34.773v-476.395c0-19.157-15.552-34.709-34.752-34.709zM863.915 581.248c0 19.179-15.573 34.752-34.795 34.752h-636.885c-19.179 0-34.731-15.552-34.731-34.752v-309.12c0-19.179 15.552-34.773 34.731-34.773h636.885c19.2 0 34.795 15.573 34.795 34.773v309.12zM574.080 424.853c0 9.493 0.576 25.749 1.813 48.704h-0.832l-76.779-132.373h-47.275v176.704h33.472v-83.115c0-10.091-0.747-26.923-2.283-50.539h1.088l76.885 133.653h47.616v-176.704h-33.707v83.669zM708.587 415.915c-12.501-5.973-20.395-10.091-23.765-12.395-3.349-2.304-5.76-4.672-7.275-7.125-1.536-2.453-2.325-5.355-2.325-8.661 0-5.312 1.92-9.6 5.717-12.907 3.755-3.307 9.259-4.949 16.32-4.949 5.973 0 12.011 0.768 18.176 2.283 6.165 1.536 13.973 4.245 23.424 8.107l12.053-29.141c-9.088-3.947-17.792-6.997-26.176-9.173-8.32-2.197-17.088-3.264-26.261-3.264-18.709 0-33.344 4.459-43.947 13.419-10.624 8.939-15.893 21.248-15.893 36.885 0 8.299 1.6 15.552 4.864 21.739 3.179 6.208 7.552 11.648 12.885 16.32 5.397 4.693 13.525 9.557 24.32 14.635 11.541 5.504 19.115 9.451 22.869 11.989 3.776 2.496 6.656 5.077 8.576 7.787 1.899 2.688 2.923 5.781 2.923 9.259 0 6.208-2.261 10.859-6.635 14.016-4.395 3.115-10.709 4.715-18.923 4.715-6.848 0-14.421-1.088-22.677-3.243-8.256-2.197-18.347-5.952-30.272-11.243v34.752c14.528 7.104 31.232 10.645 50.091 10.645 20.437 0 36.395-4.587 47.893-13.76 11.456-9.195 17.216-21.739 17.216-37.717 0-11.52-3.051-21.248-9.173-29.184s-17.472-15.893-34.005-23.787z"
],
"attrs": [
{
"visibility": false
}
],
"grid": 16,
"tags": [
"dns"
]
},
"attrs": [
{
"visibility": false
}
],
"properties": {
"order": 1,
"id": 5,
"prevSize": 48,
"code": 58885,
"name": "dns"
},
"setIdx": 0,
"iconIdx": 1
},
{
"icon": {
"paths": [
Expand All @@ -12,7 +42,7 @@
"visibility": false
}
],
"grid": 0,
"grid": 16,
"tags": [
"smtp"
]
Expand All @@ -24,15 +54,15 @@
}
],
"properties": {
"order": 6,
"order": 2,
"id": 4,
"prevSize": 48,
"code": 58884,
"name": "smtp",
"ligatures": ""
},
"setIdx": 0,
"iconIdx": 0
"iconIdx": 2
},
{
"icon": {
Expand All @@ -45,7 +75,7 @@
"visibility": false
}
],
"grid": 0,
"grid": 16,
"tags": [
"streaming"
]
Expand All @@ -57,15 +87,15 @@
}
],
"properties": {
"order": 7,
"order": 6,
"id": 3,
"prevSize": 48,
"code": 58880,
"name": "streaming",
"ligatures": ""
},
"setIdx": 0,
"iconIdx": 1
"iconIdx": 3
},
{
"icon": {
Expand All @@ -78,7 +108,7 @@
"visibility": false
}
],
"grid": 0,
"grid": 16,
"tags": [
"hospedagem"
]
Expand All @@ -90,15 +120,15 @@
}
],
"properties": {
"order": 8,
"order": 5,
"id": 2,
"prevSize": 48,
"code": 58881,
"name": "hospedagem",
"ligatures": ""
},
"setIdx": 0,
"iconIdx": 2
"iconIdx": 4
},
{
"icon": {
Expand All @@ -111,7 +141,7 @@
"visibility": false
}
],
"grid": 0,
"grid": 16,
"tags": [
"emkt"
]
Expand All @@ -123,15 +153,15 @@
}
],
"properties": {
"order": 9,
"order": 4,
"id": 1,
"prevSize": 48,
"code": 58882,
"name": "emkt",
"ligatures": ""
},
"setIdx": 0,
"iconIdx": 3
"iconIdx": 5
},
{
"icon": {
Expand All @@ -144,7 +174,7 @@
"visibility": false
}
],
"grid": 0,
"grid": 16,
"tags": [
"cloud"
]
Expand All @@ -156,15 +186,15 @@
}
],
"properties": {
"order": 10,
"order": 3,
"id": 0,
"prevSize": 48,
"code": 58883,
"name": "cloud",
"ligatures": ""
},
"setIdx": 0,
"iconIdx": 4
"iconIdx": 6
}
],
"height": 1024,
Expand Down Expand Up @@ -195,6 +225,8 @@
"showCodes": true,
"search": "",
"gridSize": 16,
"showGrid": true
"showGrid": true,
"showQuickUse2": true,
"showSVGs": true
}
}
1 change: 1 addition & 0 deletions source/assets/stylesheets/fonts/locastyle-panel-icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/assets/stylesheets/fonts/locastyle-panel-icons.ttf
Binary file not shown.
Binary file modified source/assets/stylesheets/fonts/locastyle-panel-icons.woff
Binary file not shown.
Binary file modified source/assets/stylesheets/fonts/locastyle.eot
Binary file not shown.
Loading

0 comments on commit baecfee

Please sign in to comment.