mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-31 09:05:47 +02:00
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts: bootstrap.css
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body data-spy="scroll" data-target=".subnav" data-offset="50">
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
|
@@ -25,7 +25,7 @@
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body data-spy="scroll" data-target=".subnav" data-offset="50">
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
|
@@ -25,7 +25,7 @@
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body data-spy="scroll" data-target=".subnav" data-offset="50">
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
|
@@ -25,7 +25,7 @@
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body data-spy="scroll" data-target=".subnav" data-offset="50">
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
|
@@ -25,7 +25,7 @@
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body data-spy="scroll" data-target=".subnav" data-offset="50">
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
|
@@ -25,7 +25,7 @@
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body data-spy="scroll" data-target=".subnav" data-offset="50">
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
|
@@ -25,7 +25,7 @@
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body data-spy="scroll" data-target=".subnav" data-offset="50">
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
|
@@ -25,7 +25,7 @@
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body data-spy="scroll" data-target=".subnav" data-offset="50">
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
|
2
docs/templates/layout.mustache
vendored
2
docs/templates/layout.mustache
vendored
@@ -25,7 +25,7 @@
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body data-spy="scroll" data-target=".subnav" data-offset="50">
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
|
@@ -25,7 +25,7 @@
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body data-spy="scroll" data-target=".subnav" data-offset="50">
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
|
Reference in New Issue
Block a user