Skip to content

Commit

Permalink
Merge pull request #63 from Wisembly/icons-modifiers
Browse files Browse the repository at this point in the history
Icons modifiers
  • Loading branch information
AlexandreBroudin committed Jun 10, 2015
2 parents 25dff55 + e26340a commit 5d97c92
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 10 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tapestry",
"version": "0.13.2",
"version": "0.14.0",
"homepage": "https://github.com/Wisembly/tapestry",
"description": "Wisembly - UI Elements",
"keywords": [
Expand Down
8 changes: 7 additions & 1 deletion dist/app.css

Large diffs are not rendered by default.

Binary file modified dist/fonts/icons.eot
Binary file not shown.
12 changes: 6 additions & 6 deletions dist/fonts/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 dist/fonts/icons.ttf
Binary file not shown.
Binary file modified dist/fonts/icons.woff
Binary file not shown.
8 changes: 8 additions & 0 deletions src/scss/components/icons/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@
font-size: $base-fz * .8;
}

.Icon--l {
font-size: $fz--l;
}

.Icon--xl {
font-size: $fz--xl;
}


%Icon--actionItem {
content: "\e001";
Expand Down
10 changes: 9 additions & 1 deletion src/scss/components/icons/icons.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
<i class="Icon Icon--wisembly"></i>
```

## Sizes

```html
<i class="Icon Icon--like Icon--s"></i>
<i class="Icon Icon--like Icon--l"></i>
<i class="Icon Icon--like Icon--xl"></i>
```

## List
```esc
Expand Down Expand Up @@ -990,4 +998,4 @@
</div>
</div>
```
```
8 changes: 8 additions & 0 deletions src/scss/components/icons/templates/_base.scss.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@
font-size: $base-fz * .8;
}

.<%= className %>--l {
font-size: $fz--l;
}

.<%= className %>--xl {
font-size: $fz--xl;
}

<% _.each(glyphs, function(glyph) { %>
%<%= className %>--<%= glyph.name %> {
content: "\<%= glyph.codepoint.toString(16) %>";
Expand Down
11 changes: 10 additions & 1 deletion src/scss/components/icons/templates/_icons.md.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
<i class="Icon Icon--wisembly"></i>
```

## Sizes

```html
<i class="Icon Icon--like Icon--s"></i>
<i class="Icon Icon--like Icon--l"></i>
<i class="Icon Icon--like Icon--xl"></i>
```

## List
```esc
<% _.each(glyphs, function (glyph) { %>
Expand All @@ -18,4 +26,5 @@
</div>
</div>
<% }); %>
```
```

0 comments on commit 5d97c92

Please sign in to comment.