Merge pull request #160 from cjsaylor/2.2.2

Updated bootstrap to 3.0 stable.
boxmeup · Aug 29, 2013 · a09040a · a09040a
2 parents c0762fe + 360b972
commit a09040a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/app/View/Elements/app/account.ctp b/app/View/Elements/app/account.ctp
@@ -13,9 +13,9 @@
 	</li>
 </ul>
 <?php
-	echo $this->Form->create('Language', array('id' => 'change-language', 'url' => array('controller' => 'users', 'action' => 'change_language'), 'class' => 'navbar-form pull-right', 'style' => 'margin-right: 20px'));
+	echo $this->Form->create('Language', array('id' => 'change-language', 'url' => array('controller' => 'users', 'action' => 'change_language'), 'class' => 'navbar-form navbar-right'));
 	echo $this->Form->input('locale', array('id' => 'change-language-locale', 'label' => false, 'div' => false, 'class' => 'form-control', 'options' => $availableLanguages, 'empty' => __('Choose Language')));
 	echo $this->Form->end();
-	echo $this->Form->create('Search', array('url' => array('controller' => 'searches', 'action' => 'find'), 'autocomplete' => 'off', 'class' => 'navbar-form pull-right', 'style' => 'margin-right: 30px'));
+	echo $this->Form->create('Search', array('url' => array('controller' => 'searches', 'action' => 'find'), 'autocomplete' => 'off', 'class' => 'navbar-form pull-right'));
 	echo $this->Form->input('query', array('label' => false, 'type' => 'text', 'div' => false, 'autocomplete' => 'off', 'class' => 'form-control', 'placeholder' => __('Search')));
 	echo $this->Form->end();
diff --git a/app/View/Elements/nav.ctp b/app/View/Elements/nav.ctp
@@ -1,6 +1,6 @@
-<form action="/login" class="navbar-form navbar-right" style="margin-left: 20px;">
-	<button type="submit" class="btn btn-primary"><?php echo __('Login') ?></button>
-</form>
+<?php
+	echo $this->Html->link(__('Login'), '/login', array('class' => 'btn btn-primary navbar-btn navbar-right'));
+?>
 <?php 
 	echo $this->Form->create('Language', array('id' => 'change-language', 'url' => array('controller' => 'users', 'action' => 'change_language'), 'class' => 'navbar-form navbar-right'));
 	echo $this->Form->input('locale', array('id' => 'change-language-locale', 'label' => false, 'div' => false, 'class' => 'form-control', 'options' => $availableLanguages, 'empty' => __('Choose Language'), 'style' => 'width: 200px;'));

diff --git a/app/View/Layouts/app.ctp b/app/View/Layouts/app.ctp
@@ -9,8 +9,9 @@
 	</title>
 	<?php
 		echo $this->Html->meta('icon');
-		echo $this->Html->css('//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap.min.css');
+		echo $this->Html->css('//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.no-icons.min.css');
 		echo $this->Html->css('//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css');
+		echo $this->Html->css('//netdna.bootstrapcdn.com/bootswatch/3.0.0/spacelab/bootstrap.min.css');
 		echo $this->Html->css('//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.css');
 		echo $this->Html->css('app');
 		if (Configure::read('Feature.feedback')) {
@@ -38,7 +39,7 @@
 		<div class="container">
 			<div class="navbar-header">
 				<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
-					<i class="icon-list"></i>
+					<i class="icon-list" style="color: black"></i>
 				</button>
 				<a href="/" class="navbar-brand">Boxmeup</a>
 			</div>
@@ -75,7 +76,7 @@
 		echo $this->Html->script('//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js');
 		echo $this->Html->script('//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js');
 		echo $this->Html->script('//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.1/underscore-min.js');
-		echo $this->Html->script('//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/js/bootstrap.min.js');
+		echo $this->Html->script('//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js');
 		echo $this->Html->script('main');
 		echo $this->Html->script('app');
 		echo $this->element('analytics');

diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
@@ -8,8 +8,9 @@
 	</title>
 	<?php
 		echo $this->Html->meta('icon');
-		echo $this->Html->css('//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap.min.css');
+		echo $this->Html->css('//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.no-icons.min.css');
 		echo $this->Html->css('//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css');
+		echo $this->Html->css('//netdna.bootstrapcdn.com/bootswatch/3.0.0/spacelab/bootstrap.min.css');
 		echo $this->Html->css('main');
 		if (Configure::read('Feature.feedback')) {
 			echo $this->Html->css('/feedback/css/feedback.css');
@@ -44,7 +45,7 @@
 	<?php echo $this->element('footer'); ?>
 	<?php
 		echo $this->Html->script('//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js');
-		echo $this->Html->script('//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/js/bootstrap.min.js');
+		echo $this->Html->script('//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js');
 		echo $this->Html->script('//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.1/underscore-min.js');
 		echo $this->Html->scriptBlock("
 			var WEBROOT = '$Webroot';

diff --git a/app/webroot/css/app.css b/app/webroot/css/app.css
@@ -6,13 +6,10 @@ body { margin-top: 90px; margin-bottom: 90px;}
 	padding: 20px 0;
 }
 
-.navbar {
-	padding: 10px 0;
-}
-
 .navbar-brand {
 	background: url(../img/logo-icon.png) left center no-repeat;
 	padding-left: 36px;
+	font-size: 24px;
 	color: black;
 }
 
@@ -51,6 +48,9 @@ body { margin-top: 90px; margin-bottom: 90px;}
 }
 
 @media (min-width: 0) and (max-width: 991px) {
+	body {
+		margin-bottom: 0px;
+	}
 	.main-navigation {
 		width: 100%;
 		position: relative;

diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
@@ -8,6 +8,11 @@
 	background-color: #3A3A44;
 	background-image: url(../img/hero-bg.jpg);
 }
+
+.hero h1, .hero h2, .hero h3 {
+	color: white;
+}
+
 .footer {
 	padding: 20px 0;
 }