rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-02-07 05:54:15 +01:00
Code Issues Releases Activity

Merge branch 'master' of github.com:DataTables/DataTablesSrc

Browse Source
This commit is contained in:
Allan Jardine 2015-02-16 16:00:55 +00:00
parent 455121839a
commit 6217b1aaae
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.datatables-commit-sync
View File

@ -1 +1 @@
64775f289e2a76f1e298bcd9c35fbab1a9333e51 c5463ee0439594f43315ab43092cb14ca8cf2c21

2
examples/styling/bootstrap.html
View File

@ -29,7 +29,7 @@ $(document).ready(function() {
</script> </script>
</head> </head>
<body class="dt-example"> <body class="dt-example bootstrap">
<div class="container"> <div class="container">
<section> <section>
<h1>DataTables example <span>Bootstrap</span></h1> <h1>DataTables example <span>Bootstrap</span></h1>

16
package.json
View File

@ -33,5 +33,19 @@
"type": "git", "type": "git",
"url": "https://github.com/DataTables/DataTables.git" "url": "https://github.com/DataTables/DataTables.git"
}, },
"homepage": "http://datatables.net" "homepage": "http://datatables.net",
"jspm": {
"css": "^0.1.5",
"dependencies": {
"jquery": "*"
},
"registry": "jspm",
"shim": {
"media/js/jquery.dataTables": {
"deps": ["jquery", "../css/jquery.dataTables.css!"],
"exports": "$"
}
}
}
} }