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 /grid | |
| parent | 4b849e5fd7e5df575ffc64be75816a16b2fef27f (diff) | |
| parent | 9c13af8cb10f6e16322c50dfc82ae9263d99b82a (diff) | |
| download | bootstrap-c3e662641135b9fadeff589682e85eb4ace4bce6.tar.xz bootstrap-c3e662641135b9fadeff589682e85eb4ace4bce6.zip | |
Merge branch 'example-named-files'
Conflicts:
.gitignore
Diffstat (limited to 'grid')
| -rw-r--r-- | grid/grid.css (renamed from grid/example.css) | 0 | ||||
| -rw-r--r-- | grid/index.html | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/grid/example.css b/grid/grid.css index c213ac6a7..c213ac6a7 100644 --- a/grid/example.css +++ b/grid/grid.css diff --git a/grid/index.html b/grid/index.html index 81ef11883..bd86f4ab9 100644 --- a/grid/index.html +++ b/grid/index.html @@ -6,13 +6,13 @@ <meta name="description" content=""> <meta name="author" content=""> - <title>Grid template for Bootstrap</title> + <title>Grid 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="grid.css" rel="stylesheet"> </head> <body> |