Skip to content

Commit

Permalink
Merge pull request #33 from FlyingDR/master
Browse files Browse the repository at this point in the history
Bower component
  • Loading branch information
samdark committed Mar 4, 2014
2 parents c15e287 + ddfce96 commit 03b822d
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 10 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ nbproject
.settings

# windows thumbnail cache
Thumbs.db
Thumbs.db

# Bower components cache
bower_components
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Usage
In order to use this plugin you need the following in the `head` section of your HTML:

```html
<script type="text/javascript" src="jquery-1.7.2.min.js"></script>
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script type="text/javascript" src="jquery.the-modal.js"></script>
<link rel="stylesheet" type="text/css" href="the-modal.css" media="all" />
```
Expand Down
18 changes: 18 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "the-modal",
"version": "1.0.0",
"homepage": "https://github.com/samdark/the-modal/",
"authors": [
"Alexander Makarov <[email protected]>"
],
"description": "Proper modal boxes",
"main": "jquery.the-modal.js",
"keywords": [
"jquery",
"modal"
],
"license": "BSD",
"dependencies": {
"jquery": "*"
}
}
File renamed without changes.
8 changes: 4 additions & 4 deletions demo.html → demo/demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<head>
<meta charset="utf-8" />
<title>The modal demo</title>
<script type="text/javascript" src="jquery-1.7.2.min.js"></script>
<script type="text/javascript" src="jquery.the-modal.js"></script>
<link rel="stylesheet" type="text/css" href="the-modal.css" media="all">
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script type="text/javascript" src="../jquery.the-modal.js"></script>
<link rel="stylesheet" type="text/css" href="../the-modal.css" media="all">
<link rel="stylesheet" type="text/css" href="demo-modals.css" media="all">
</head>
<body>
Expand Down Expand Up @@ -237,4 +237,4 @@ <h1>Hi, I'm the modal demo.</h1>
});
</script>
</body>
</html>
</html>
4 changes: 0 additions & 4 deletions jquery-1.7.2.min.js

This file was deleted.

0 comments on commit 03b822d

Please sign in to comment.