diff options
| author | Mark Otto <[email protected]> | 2013-07-26 20:43:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-26 20:43:22 -0700 |
| commit | c3e662641135b9fadeff589682e85eb4ace4bce6 (patch) | |
| tree | 06eafabcd7293083dea7d35f9ec11156aab29c5a /offcanvas | |
| parent | 4b849e5fd7e5df575ffc64be75816a16b2fef27f (diff) | |
| parent | 9c13af8cb10f6e16322c50dfc82ae9263d99b82a (diff) | |
| download | bootstrap-c3e662641135b9fadeff589682e85eb4ace4bce6.tar.xz bootstrap-c3e662641135b9fadeff589682e85eb4ace4bce6.zip | |
Merge branch 'example-named-files'
Conflicts:
.gitignore
Diffstat (limited to 'offcanvas')
| -rw-r--r-- | offcanvas/index.html | 8 | ||||
| -rw-r--r-- | offcanvas/offcanvas.css (renamed from offcanvas/example.css) | 0 | ||||
| -rw-r--r-- | offcanvas/offcanvas.js (renamed from offcanvas/example.js) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/offcanvas/index.html b/offcanvas/index.html index 319fcac70..982b8f7b6 100644 --- a/offcanvas/index.html +++ b/offcanvas/index.html @@ -6,13 +6,13 @@ <meta name="description" content=""> <meta name="author" content=""> - <title>Off canvas template for Bootstrap</title> + <title>Off Canvas Template for Bootstrap</title> <!-- Bootstrap core CSS --> - <link href="../bootstrap/bootstrap.css" rel="stylesheet"> + <link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <!-- Custom styles for this template --> - <link href="example.css" rel="stylesheet"> + <link href="offcanvas.css" rel="stylesheet"> </head> <body> @@ -109,6 +109,6 @@ <!-- jQuery and plugin --> <script src="http://code.jquery.com/jquery.js"></script> - <script src="example.js"></script> + <script src="offcanvas.js"></script> </body> </html>
\ No newline at end of file diff --git a/offcanvas/example.css b/offcanvas/offcanvas.css index 6dcd5ece1..6dcd5ece1 100644 --- a/offcanvas/example.css +++ b/offcanvas/offcanvas.css diff --git a/offcanvas/example.js b/offcanvas/offcanvas.js index 12f2dff51..12f2dff51 100644 --- a/offcanvas/example.js +++ b/offcanvas/offcanvas.js |