Updated Casset and Bootstrap to latest versions. A few other small ch…

…anges.
mmanos · Dec 19, 2014 · e002f82 · e002f82
1 parent 1cf3107
commit e002f82
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git a/src/FrontendCommand.php b/src/FrontendCommand.php
@@ -81,7 +81,7 @@ protected function installCasset($directory, $output)
 	{
 		if (!File::has($directory.'/composer.json', 'mmanos/laravel-casset')) {
 			$output->writeln('<info>Installing mmanos/laravel-casset...</info>');
-			exec('composer require mmanos/laravel-casset:1.3.*', $out);
+			exec('composer require mmanos/laravel-casset:1.4.*', $out);
 			echo implode("\n", $out) . "\n";
 		}
 
@@ -122,7 +122,7 @@ protected function installBootstrap($directory, $output)
 	{
 		if (!File::has($directory.'/composer.json', 'twbs/bootstrap')) {
 			$output->writeln('<info>Installing twbs/bootstrap...</info>');
-			exec('composer require twbs/bootstrap:3.2.0', $out);
+			exec('composer require twbs/bootstrap:3.3.1', $out);
 			echo implode("\n", $out) . "\n";
 		}
 

diff --git a/src/PrepareCommand.php b/src/PrepareCommand.php
@@ -93,7 +93,7 @@ protected function configureEnvDetection($directory, $output)
 		File::replaceOnce(
 			$directory.'/bootstrap/start.php',
 			"'local' => array('homestead'),",
-			"'local' => array('*.local'),"
+			"'local' => array('homestead', '*.local'),"
 		);
 
 		$output->writeln('local env detection configured');
@@ -286,7 +286,7 @@ protected function addCarbonAlias($directory, $output)
 			File::replaceOnce(
 				$directory.'/app/config/app.php',
 				"=> 'Illuminate\Support\Facades\View',",
-				"=> 'Illuminate\Support\Facades\View',\n\t\t'Carbon'          => 'Carbon\Carbon',"
+				"=> 'Illuminate\Support\Facades\View',\n\t\t'Carbon'            => 'Carbon\Carbon',"
 			);
 		}
 

diff --git a/stubs/app/views/auth/forgot.blade.stub b/stubs/app/views/auth/forgot.blade.stub
@@ -4,7 +4,7 @@
 @section('content')
 	<div class="container margin-top-lg">
 		<div class="row">
-			<div class="col-md-4 col-md-offset-4">
+			<div class="col-xs-8 col-xs-offset-2 col-md-6 col-md-offset-3 col-lg-4 col-lg-offset-4">
 				@include('common.alerts')
 
 				<h3 class="text-center">Reset Your Password</h3>

diff --git a/stubs/app/views/auth/login.blade.stub b/stubs/app/views/auth/login.blade.stub
@@ -4,7 +4,7 @@
 @section('content')
 	<div class="container margin-top-lg">
 		<div class="row">
-			<div class="col-md-4 col-md-offset-4">
+			<div class="col-xs-8 col-xs-offset-2 col-md-6 col-md-offset-3 col-lg-4 col-lg-offset-4">
 				@include('common.alerts')
 
 				<h3 class="text-center">Log in to {{ company() }}</h3>

diff --git a/stubs/app/views/auth/reset.blade.stub b/stubs/app/views/auth/reset.blade.stub
@@ -4,7 +4,7 @@
 @section('content')
 	<div class="container margin-top-lg">
 		<div class="row">
-			<div class="col-md-4 col-md-offset-4">
+			<div class="col-xs-8 col-xs-offset-2 col-md-6 col-md-offset-3 col-lg-4 col-lg-offset-4">
 				@include('common.alerts')
 
 				<h3 class="text-center">Change Your Password</h3>

diff --git a/stubs/app/views/layouts/default.blade.stub b/stubs/app/views/layouts/default.blade.stub
@@ -5,12 +5,12 @@
 {{ Casset::container('layout')->add('libs/font-awesome/less/font-awesome.less') }}
 {{ Casset::container('layout')->add('css/layouts/default/layout.less') }}
 
-{{ Casset::container('layout')->add('jquery::/jquery.min.js') }}
+{{ Casset::container('layout')->add('frameworks/jquery::/jquery.min.js') }}
 
-{{ Casset::container('layout')->add('bootstrap::/js/collapse.js') }}
-{{ Casset::container('layout')->add('bootstrap::/js/transition.js') }}
-{{ Casset::container('layout')->add('bootstrap::/js/dropdown.js') }}
-{{ Casset::container('layout')->add('bootstrap::/js/modal.js') }}
+{{ Casset::container('layout')->add('twbs/bootstrap::/js/collapse.js') }}
+{{ Casset::container('layout')->add('twbs/bootstrap::/js/transition.js') }}
+{{ Casset::container('layout')->add('twbs/bootstrap::/js/dropdown.js') }}
+{{ Casset::container('layout')->add('twbs/bootstrap::/js/modal.js') }}
 
 <!DOCTYPE html>
 <html lang="en">

diff --git a/stubs/app/views/signup/index.blade.stub b/stubs/app/views/signup/index.blade.stub
@@ -4,7 +4,7 @@
 @section('content')
 	<div class="container margin-top-lg">
 		<div class="row">
-			<div class="col-md-4 col-md-offset-4">
+			<div class="col-xs-8 col-xs-offset-2 col-md-6 col-md-offset-3 col-lg-4 col-lg-offset-4">
 				@include('common.alerts')
 
 				<h3 class="text-center">Sign up for {{ company() }}</h3>

diff --git a/stubs/public/assets/css/layouts/default/bootstrap.stub b/stubs/public/assets/css/layouts/default/bootstrap.stub
@@ -35,6 +35,7 @@
 //@import "../../../../../vendor/twbs/bootstrap/less/media.less";
 //@import "../../../../../vendor/twbs/bootstrap/less/list-group.less";
 @import "../../../../../vendor/twbs/bootstrap/less/panels.less";
+@import "../../../../../vendor/twbs/bootstrap/less/responsive-embed.less";
 //@import "../../../../../vendor/twbs/bootstrap/less/wells.less";
 //@import "../../../../../vendor/twbs/bootstrap/less/close.less";