Replaced span-*s with col-md-*.

.hgignore

@@ -3,3 +3,5 @@ syntax: glob
 demo/assets/*
 demo/protected/config/local.php
 demo/protected/runtime/*
+*.swp
+*.swo

demo/protected/views/layouts/main.php

@@ -63,7 +63,7 @@
 						'active'=>Yii::app()->controller->id === 'site' && Yii::app()->controller->action->id === 'index'),
 				array('label'=>'Setup', 'url'=>array('site/setup')),
 			),
-			'htmlOptions'=>array('class'=>'pull-left'),
+			'htmlOptions'=>array('class'=>'pull-left navbar-nav'),
 		),
 		'<div class="add-this pull-right">
 			<!-- AddThis Button BEGIN -->
@@ -84,7 +84,7 @@
 				array('label'=>'Fork me on Bitbucket', 'url'=>'http://www.bitbucket.org/Crisu83/yii-bootstrap', 'linkOptions'=>array('target'=>'_blank')),
 				array('label'=>'Follow me on Twitter', 'url'=>'http://www.twitter.com/Crisu83', 'linkOptions'=>array('target'=>'_blank')),
 			),
-			'htmlOptions'=>array('class'=>'pull-right'),
+			'htmlOptions'=>array('class'=>'pull-right navbar-nav'),
 		),
 	),
 )); ?>
@@ -92,7 +92,7 @@
 <div class="container">
 
 	<div class="row">
-		<div class="span9">
+		<div class="col-md-9">
 
 			<?php $this->beginWidget('bootstrap.widgets.TbHeroUnit', array(
 				'heading'=>Yii::app()->name,
@@ -116,7 +116,7 @@
 
 		</div>
 
-		<div class="span3">
+		<div class="col-md-3">
 			<div class="donate">
 
 				<h3>Support development</h3>
@@ -161,7 +161,7 @@
 
 		<div class="row">
 
-			<div class="span6">
+			<div class="col-md-6">
 
 				<p class="powered">
 					Powered by <?php echo CHtml::link('Yii', 'http://www.yiiframework.com', array('target'=>'_blank')); ?> /
@@ -174,7 +174,7 @@
 
 			</div>
 
-			<div class="span6">
+			<div class="col-md-6">
 
 				<p class="copy">
 					&copy; Christoffer Niska <?php echo date('Y'); ?>

demo/protected/views/site/index.php

@@ -1961,11 +1961,12 @@ Yii::app()->user->setFlash('error', '<strong>Oh snap!</strong> Change a few thin
 	'fixed'=>'top',
 	'brand'=>false,
 	'collapse'=>true,
-	'htmlOptions'=>array('class'=>'subnav'),
+	'htmlOptions'=>array('class'=>'subnav navbar navbar-default navbar-nav'),
 	'items'=>array(
 		array(
 			'class'=>'bootstrap.widgets.TbMenu',
 			'scrollspy'=>'.navbar',
+            'htmlOptions' => array('class' => 'navbar-nav'),
 			'items'=>array(
 				array('label'=>'Buttons', 'url'=>'#tbButton'),
 				array('label'=>'Buttons groups', 'url'=>'#tbButtonGroup'),

widgets/TbNavbar.php

@@ -81,9 +81,9 @@ class TbNavbar extends CWidget
 			$this->brandOptions['href'] = CHtml::normalizeUrl($this->brandUrl);
 
 			if (isset($this->brandOptions['class']))
-				$this->brandOptions['class'] .= ' brand';
+				$this->brandOptions['class'] .= ' navbar-brand';
 			else
-				$this->brandOptions['class'] = 'brand';
+				$this->brandOptions['class'] = 'navbar-brand';
 		}
 
 		$classes = array('navbar');
@@ -110,15 +110,16 @@ class TbNavbar extends CWidget
 	public function run()
 	{
 		echo CHtml::openTag('div', $this->htmlOptions);
-		echo '<div class="navbar-inner"><div class="'.$this->getContainerCssClass().'">';
+		echo '<div class="'.$this->getContainerCssClass().'">';
 
 		$collapseId = TbCollapse::getNextContainerId();
 
 		if ($this->collapse !== false)
 		{
-			echo '<a class="btn btn-navbar" data-toggle="collapse" data-target="#'.$collapseId.'">';
+            echo '<div class="navbar-header">';
+			echo '<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#'.$collapseId.'">';
 			echo '<span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>';
-			echo '</a>';
+			echo '</button>';
 		}
 
 		if ($this->brand !== false)
@@ -134,10 +135,11 @@ class TbNavbar extends CWidget
 
 		if ($this->collapse !== false)
 		{
+			echo '</div>';
 			$this->controller->beginWidget('bootstrap.widgets.TbCollapse', array(
 				'id'=>$collapseId,
 				'toggle'=>false, // navbars should be collapsed by default
-				'htmlOptions'=>array('class'=>'nav-collapse collapse'),
+				'htmlOptions'=>array('class'=>'navbar-collapse collapse'),
 			));
 		}
 
@@ -160,7 +162,7 @@ class TbNavbar extends CWidget
 		if ($this->collapse !== false)
 			$this->controller->endWidget();
 
-		echo '</div></div></div>';
+		echo '</div></div>';
 	}
 
 	/**