1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-18 03:11:19 +02:00

fixing conflict and recompiling

This commit is contained in:
Mark Otto
2011-09-16 09:47:36 -07:00
18 changed files with 61 additions and 67 deletions

View File

@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
<link href="../bootstrap.css" rel="stylesheet">
<style type="text/css">
/* Override some defaults */
html, body {

View File

@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
<link href="../bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;

View File

@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
<link href="../bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;