Skip to content

merge #1

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

Merged
rengokantai merged 6 commits into from
May 22, 2015
Merged

merge #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b4afa2c
Performance: Fix "astrisk" [sic] typo in boostrap
cvrebert Mar 23, 2015
96ce18f
Performance: Upgrade Bootstrap: v3.3.1 => v3.3.4
cvrebert Mar 23, 2015
4b9af40
Performance: Add Kendo-ui buttons to performance tests
prasunanand Mar 15, 2015
206014c
Build: Updated grunt-sass to 0.18.1
alexeiTruhin Mar 18, 2015
b1fe03e
Build: Add normalize.css and include in default build
arschmitz Mar 30, 2015
64a51ac
Typography: Initial typographic styles
MichaelArestad Mar 15, 2015
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
Prev Previous commit
Next Next commit
Performance: Add Kendo-ui buttons to performance tests 
Closes jquery-archivegh-55
  • Loading branch information
@prasunanand @arschmitz
prasunanand authored and arschmitz committed Apr 7, 2015
commit 4b9af402e5c468f7682c3ef43f96b20e21b0cf87
38 changes: 38 additions & 0 deletions performance/frameworks/kendo-ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
module.exports = {
css: [ "//cdn.kendostatic.com/2014.1.318/styles/kendo.common.min.css",
"//cdn.kendostatic.com/2014.1.318/styles/kendo.default.min.css",
"//cdn.kendostatic.com/2014.1.318/styles/kendo.dataviz.min.css",
"//cdn.kendostatic.com/2014.1.318/styles/kendo.dataviz.default.min.css",
"//cdn.kendostatic.com/2012.1.318/styles/kendo.mobile.all.min.css"
],
button: {
generator: function( options ) {
var button = "<button class='" + options.type + " " + options.state + " " +
options.disabled + "' >";
if ( options.icon ) {
button = button + "<span class='k-sprite k-icon " + options.icon + "'></span>";
}
return button + " Button </button>";
},
variations: {
type: [
"k-button",
"km-button"
],
state: [
"",
"k-primary"
],
disabled: [
"",
"k-state-disabled"
],
icon: [
false,
"k-i-funnel",
"k-i-funnel-clear",
"k-i-refresh"
]
}
}
};
4 changes: 3 additions & 1 deletion tasks/options/perfjankie.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ module.exports = {
"http://localhost:4200/framework/semantic-ui/component/button/count/1000/" +
"semantic-ui:button",
"http://localhost:4200/framework/dojo/component/button/count/1000/" +
"dojo:button"
"dojo:button",
"http://localhost:4200/framework/kendo-ui/component/button/count/1000/" +
"kendo-ui:button"
]
}
}
Expand Down