Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove templates #152

Merged
merged 18 commits into from
Nov 1, 2018
Merged

Remove templates #152

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a708c76
first draft of removing templates in favor of formats. Some tests fai…
Oct 3, 2018
1872bdc
better logic test for fonts template
Oct 3, 2018
bae7eb8
redid formats documentation page with a fine-tooth comb
Oct 4, 2018
19a1b49
fixing didoos issues. dropping number of error messages sent. fixing …
Oct 5, 2018
34f3059
fixing didoos issues. dropping number of error messages sent. fixing …
Oct 5, 2018
e9fa7df
updated format documentation per didoos comments on not needing to sh…
Oct 5, 2018
bd3adbb
updated typos and whitespace problems per didoos comments
Oct 5, 2018
54bea77
merge with updated develop branch
Oct 5, 2018
b52434a
Fixing documentation (#182)
dbanksdesign Oct 26, 2018
94cc558
merge try 1
Oct 26, 2018
e005f2a
Merge branch 'remove-templates' of github.com:amzn/style-dictionary i…
Oct 26, 2018
0aa676d
merge try 2
Oct 26, 2018
ddaf438
updated snapshots
Oct 29, 2018
defe485
group template deprecation warnings
Oct 30, 2018
839748a
Fixing snapshots (#183)
dbanksdesign Oct 30, 2018
eab64c5
only save messages once. Updated format of messaging and specificity.
Oct 31, 2018
16ea34b
Fixing formats.md and console formatting (#184)
dbanksdesign Oct 31, 2018
b95b99c
slightly updated messages
Oct 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/common/templates/css/fonts.css.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% _.forIn(properties.asset.font, function(font) {
<% _.forIn(properties && properties.asset && properties.asset.font, function(font) {
var fileFormatArr = [];
if (font.eot) {
fileFormatArr.push("url('../" + font.eot.value + "');\n\tsrc: url('../" + font.eot.value + "?#iefix') format('embedded-opentype')");
Expand All @@ -25,4 +25,4 @@
font-style: <%= font.style.value %>;<% } if (font.weight) { %>
font-weight: <%= font.weight.value %>;<% } %>
}
<% }); %>
<% }); %>
27 changes: 26 additions & 1 deletion test/formats/all.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,34 @@ var file = {
};

var dictionary = {
"allProperties": [{
value: '#FF0000',
original: { value: '#FF0000' },
name: 'color_red',
attributes: {
category: 'color',
type: 'red',
item: undefined,
subitem: undefined,
state: undefined
},
path: ['color','red']
}],
"properties": {
"color": {
"red": {"value": "#FF0000"}
"red": {
value: '#FF0000',
original: { value: '#FF0000' },
name: 'color_red',
attributes: {
category: 'color',
type: 'red',
item: undefined,
subitem: undefined,
state: undefined
},
path: ['color','red']
}
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this change correct?

}
};
Expand Down