Skip to content

Commit

Permalink
Added new glyphs, changelog, bumped version
Browse files Browse the repository at this point in the history
  • Loading branch information
mlijanto committed Nov 11, 2016
1 parent fc9fc86 commit 11fb355
Show file tree
Hide file tree
Showing 18 changed files with 82 additions and 11 deletions.
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "Winstrap",
"version": "0.5.10",
"version": "0.5.11",
"main": [
"src/scss/winstrap.scss"
],
Expand Down
17 changes: 16 additions & 1 deletion dist/css/winstrap-optional.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/winstrap-optional.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/winstrap-optional.min.css

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion dist/css/winstrap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/winstrap.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/winstrap.min.css

Large diffs are not rendered by default.

Binary file modified dist/fonts/glyphs/winjs-symbols.eot
Binary file not shown.
Binary file modified dist/fonts/glyphs/winjs-symbols.ttf
Binary file not shown.
Binary file modified dist/fonts/glyphs/winjs-symbols.woff
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -5,7 +5,7 @@
"type": "git",
"url": "git+https://github.com/winjs/winstrap.git"
},
"version": "0.5.10",
"version": "0.5.11",
"author": "Microsoft",
"contributors": [
"Frederic Perrin",
Expand Down
12 changes: 11 additions & 1 deletion src/doc/data/glyphs.json
Expand Up @@ -319,7 +319,7 @@
}, {
"name": "contact-2"
}, {
"name": "folder"
"name": "folder-fill"
}, {
"name": "audio"
}, {
Expand Down Expand Up @@ -466,12 +466,18 @@
"name": "checkbox-composite"
}, {
"name": "checkbox-indeterminate"
}, {
"name": "erase-tool"
}, {
"name": "warning"
}, {
"name": "shopping-cart"
}, {
"name": "flag-2"
}, {
"name": "folder-open"
}, {
"name": "folder"
}, {
"name": "completed"
}, {
Expand Down Expand Up @@ -508,6 +514,10 @@
"name": "subscriptions"
}, {
"name": "subscriptions-mirrored"
}, {
"name": "folder-horizontal-open"
}, {
"name": "folder-horizontal"
}
]
}
11 changes: 11 additions & 0 deletions src/doc/partials/changelog.hbs
Expand Up @@ -9,6 +9,17 @@
</div>
<div class="modal-body">
<dl>
<dt class="m-t-sm">0.5.11</dt>
<dd>
<ul class="list-unstyled">
<li>Added 5 new glyphs to the symbols font.</li>
<li>Updated Bootstrap to v3.3.7.</li>
<li>Added <a href="components.html#entity-list">Entity list</a> and <a href="controls.html#putbox">Put box.</a></li>
<li>Added <code>!important</code> to spacer classes.</li>
<li>Bug fixes.</li>
</ul>
</dd>

<dt class="m-t-sm">0.5.8</dt>
<dd>
<ul class="list-unstyled">
Expand Down
2 changes: 1 addition & 1 deletion src/doc/partials/glyphs.hbs
Expand Up @@ -7,7 +7,7 @@

<div class="row">
<div class="col-xs-24">
<p>There are 254 free and open source glyphs included in Winstrap. Here are the available glyphs with their respective names. To display a glyph, add the <code>glyph</code> base class and the individual <code>glyph-*</code> class.</p>
<p>There are 259 free and open source glyphs included in Winstrap. Here are the available glyphs with their respective names. To display a glyph, add the <code>glyph</code> base class and the individual <code>glyph-*</code> class.</p>

{{#markdown}}
```xml
Expand Down
Binary file modified src/fonts/glyphs/winjs-symbols.eot
Binary file not shown.
Binary file modified src/fonts/glyphs/winjs-symbols.ttf
Binary file not shown.
Binary file modified src/fonts/glyphs/winjs-symbols.woff
Binary file not shown.
22 changes: 21 additions & 1 deletion src/scss/win/_glyphs.scss
Expand Up @@ -655,7 +655,7 @@ $glyphs: (
unicode: "\E187",
original-name: "contact2Legacy"
),
folder: (
folder-fill: (
unicode: "\E188",
original-name: "folderLegacy"
),
Expand Down Expand Up @@ -951,6 +951,10 @@ $glyphs: (
unicode: "\E73C",
original-name: "checkboxIndeterminate"
),
erase-tool: (
unicode: "\E75C",
original-name: "eraseTool"
),
warning: (
unicode: "\E7BA",
original-name: "warning"
Expand All @@ -963,6 +967,14 @@ $glyphs: (
unicode: "\E7C1",
original-name: "flag2"
),
folder-open: (
unicode: "\E838",
original-name: "folderOpen"
),
folder: (
unicode: "\E8B7",
original-name: "folder"
),
completed: (
unicode: "\E930",
original-name: "completed"
Expand Down Expand Up @@ -1034,6 +1046,14 @@ $glyphs: (
subscriptions-mirrored: (
unicode: "\ED12",
original-name: "subscriptionsMirrored"
),
folder-horizontal-open: (
unicode: "\ED25",
original-name: "openFolderHorizontal"
),
folder-horizontal: (
unicode: "\F12B",
original-name: "folderHorizontal"
)
);

Expand Down

0 comments on commit 11fb355

Please sign in to comment.