Skip to content

Commit 1c461d3

Browse files
author
Jesse McGinnis
committed
Converted all indentation to spaces.
1 parent aa0d693 commit 1c461d3

File tree

23 files changed

+441
-446
lines changed

23 files changed

+441
-446
lines changed
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#main {
2-
@include standard-link( $link-color );
2+
@include standard-link( $link-color );
33

4-
color:$base-font-color; margin:20px auto 0; width:$width;
4+
color:$base-font-color; margin:20px auto 0; width:$width;
55

6-
p { text-align:justify; margin:0 0 1em; }
6+
p { text-align:justify; margin:0 0 1em; }
77

8-
table { width:100%; }
9-
thead { border-bottom:solid 2px $base-font-color; text-align:left; }
10-
tbody { font-size:0.9em; }
11-
td, th { padding:1em; }
12-
tr {
13-
border-bottom:solid 1px $base-font-color;
8+
table { width:100%; }
9+
thead { border-bottom:solid 2px $base-font-color; text-align:left; }
10+
tbody { font-size:0.9em; }
11+
td, th { padding:1em; }
12+
tr {
13+
border-bottom:solid 1px $base-font-color;
1414

15-
&.status-failed { background:fade-out($emphasis-color, 0.8); }
16-
&:hover, &:hover a { background:$base-font-color; color:$nav-color; }
17-
}
18-
}
15+
&.status-failed { background:fade-out($emphasis-color, 0.8); }
16+
&:hover, &:hover a { background:$base-font-color; color:$nav-color; }
17+
}
18+
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
footer {
2-
clear:both; margin-top:1em; padding:30px 0;
3-
4-
p { font-size:0.72em; text-align:center; }
1+
footer {
2+
clear:both; margin-top:1em; padding:30px 0;
3+
4+
p { font-size:0.72em; text-align:center; }
55
}
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
header {
2-
color:invert($base-font-color); background:$header-color;
1+
header {
2+
color:invert($base-font-color); background:$header-color;
33

4-
.content {
5-
font-weight:normal; margin:0 auto 1em; width:$width;
4+
.content {
5+
font-weight:normal; margin:0 auto 1em; width:$width;
66

7-
h1, h2 { margin: 0; }
8-
h1 { font-size:4em; }
9-
h2 { color:$emphasis-color; font-size:2.5em; }
10-
}
7+
h1, h2 { margin: 0; }
8+
h1 { font-size:4em; }
9+
h2 { color:$emphasis-color; font-size:2.5em; }
10+
}
1111
}

app/compass/sass/partials/_nav.scss

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
nav {
2-
background:$nav-color; border-bottom:solid 1px darken($nav-color, 20%); border-top:solid 1px darken($nav-color, 20%); height:3em;
1+
nav {
2+
background:$nav-color; border-bottom:solid 1px darken($nav-color, 20%); border-top:solid 1px darken($nav-color, 20%); height:3em;
33

4-
ul {
5-
margin:6px auto; width:$width;
4+
ul {
5+
margin:6px auto; width:$width;
66

7-
li a {
8-
@include standard-button($base-font-color, $nav-color);
9-
margin:0 0.7em 0 0;
10-
}
11-
}
12-
}
7+
li a {
8+
@include standard-button($base-font-color, $nav-color);
9+
margin:0 0.7em 0 0;
10+
}
11+
}
12+
}

app/index.html

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
11
<!DOCTYPE html>
2-
<!--[if lt IE 7]>
3-
<html
4-
class="no-js ie6 oldie"
5-
lang="en"
6-
xmlns:ng="http://angularjs.org/"
7-
ng:controller="AppController">
2+
<!--[if lt IE 7]>
3+
<html
4+
class="no-js ie6 oldie"
5+
lang="en"
6+
xmlns:ng="http://angularjs.org/"
7+
ng:controller="AppController">
88
<![endif]-->
9-
<!--[if IE 7]>
10-
<html
11-
class="no-js ie7 oldie"
12-
lang="en"
13-
xmlns:ng="http://angularjs.org/"
14-
ng:controller="AppController">
9+
<!--[if IE 7]>
10+
<html
11+
class="no-js ie7 oldie"
12+
lang="en"
13+
xmlns:ng="http://angularjs.org/"
14+
ng:controller="AppController">
1515
<![endif]-->
16-
<!--[if IE 8]>
17-
<html
18-
class="no-js ie8 oldie"
19-
lang="en"
20-
xmlns:ng="http://angularjs.org/"
21-
ng:controller="AppController">
16+
<!--[if IE 8]>
17+
<html
18+
class="no-js ie8 oldie"
19+
lang="en"
20+
xmlns:ng="http://angularjs.org/"
21+
ng:controller="AppController">
2222
<![endif]-->
23-
<!--[if gt IE 8]><!-->
24-
<html
25-
class="no-js"
26-
lang="en"
27-
xmlns:ng="http://angularjs.org/"
28-
ng:controller="AppController">
23+
<!--[if gt IE 8]><!-->
24+
<html
25+
class="no-js"
26+
lang="en"
27+
xmlns:ng="http://angularjs.org/"
28+
ng:controller="AppController">
2929
<!--<![endif]-->
3030
<head>
31-
<meta charset="utf-8" />
32-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
31+
<meta charset="utf-8" />
32+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
3333

34-
<title ng:bind-template="{{title}} | Angular + Require + Boilerplate">Angular + Require + Boilerplate</title>
35-
<meta name="description" content="" />
36-
<meta name="author" content="" />
34+
<title ng:bind-template="{{title}} | Angular + Require + Boilerplate">Angular + Require + Boilerplate</title>
35+
<meta name="description" content="" />
36+
<meta name="author" content="" />
3737

38-
<meta name="viewport" content="width=device-width,initial-scale=1" />
39-
<link rel="stylesheet" href="css/app.css" />
40-
<link rel="stylesheet" href="js/libs/bootstrap/css/bootstrap.css"/>
41-
<link rel="stylesheet" href="js/libs/bootstrap/css/bootstrap-responsive.css"/>
42-
<script src="js/libs/modernizr-2.0.6.min.js"></script>
38+
<meta name="viewport" content="width=device-width,initial-scale=1" />
39+
<link rel="stylesheet" href="css/app.css" />
40+
<link rel="stylesheet" href="js/libs/bootstrap/css/bootstrap.css"/>
41+
<link rel="stylesheet" href="js/libs/bootstrap/css/bootstrap-responsive.css"/>
42+
<script src="js/libs/modernizr-2.0.6.min.js"></script>
4343
</head>
4444

4545
<body>
4646

47-
<div id="container">
48-
<noscript>
49-
<div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif">
50-
Your web browser must have JavaScript enabled in order for this application to display correctly.
51-
</div>
52-
</noscript>
53-
<header>
54-
<div class="content">
55-
<h1>Angular + Require + Boilerplate</h1>
56-
<h2 ng:bind-template="{{title}}">Loading...</h2>
57-
</div>
58-
<nav>
59-
<ul>
60-
<li ng:repeat="nav in navigation">
61-
<a href="#{{nav.route}}">{{nav.title}}</a>
62-
</li>
63-
</ul>
64-
</nav>
65-
</header>
66-
<div id="main" role="main">
67-
<ng:view></ng:view>
68-
</div>
69-
<footer>
70-
<p>Copyright &copy; 2011 Me</p>
71-
</footer>
72-
</div>
47+
<div id="container">
48+
<noscript>
49+
<div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif">
50+
Your web browser must have JavaScript enabled in order for this application to display correctly.
51+
</div>
52+
</noscript>
53+
<header>
54+
<div class="content">
55+
<h1>Angular + Require + Boilerplate</h1>
56+
<h2 ng:bind-template="{{title}}">Loading...</h2>
57+
</div>
58+
<nav>
59+
<ul>
60+
<li ng:repeat="nav in navigation">
61+
<a href="#{{nav.route}}">{{nav.title}}</a>
62+
</li>
63+
</ul>
64+
</nav>
65+
</header>
66+
<div id="main" role="main">
67+
<ng:view></ng:view>
68+
</div>
69+
<footer>
70+
<p>Copyright &copy; 2011 Me</p>
71+
</footer>
72+
</div>
7373

74-
<script src="js/libs/underscore/underscore-min.js"></script>
75-
<script data-main="js/bootstrap" src="js/require.js"></script>
74+
<script src="js/libs/underscore/underscore-min.js"></script>
75+
<script data-main="js/bootstrap" src="js/require.js"></script>
76+
77+
<!--[if lt IE 7 ]>
78+
<script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
79+
<script>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
80+
<![endif]-->
7681

77-
<!--[if lt IE 7 ]>
78-
<script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
79-
<script>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
80-
<![endif]-->
81-
8282
</body>
8383
</html>

app/js/_boilerplate.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
define([
2-
// Standard Libs
3-
'Console' // lib/console/console
4-
, 'jQuery' // lib/jquery/jquery
5-
, 'Underscore' // lib/underscore/underscore
6-
, 'Angular' // lib/angular/angular
2+
// Standard Libs
3+
'Console' // lib/console/console
4+
, 'jQuery' // lib/jquery/jquery
5+
, 'Underscore' // lib/underscore/underscore
6+
, 'Angular' // lib/angular/angular
77

8-
// Application Files
8+
// Application Files
99

1010
], function (Console, $, _, angular){
11-
"use strict";
12-
Console.group("Entering BOILERPLATE module.");
13-
11+
"use strict";
12+
Console.group("Entering BOILERPLATE module.");
1413

15-
Console.groupEnd();
16-
return {};
17-
// What we want available to other modules
18-
});
14+
15+
Console.groupEnd();
16+
return {};
17+
// What we want available to other modules
18+
});

app/js/app.js

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
define([
2-
// Standard Libs
3-
'Console' // lib/console/console
4-
, 'jQuery' // lib/jquery/jquery
5-
, 'Underscore' // lib/underscore/underscore
6-
, 'Angular' // lib/angular/angular
7-
8-
// Application Files
9-
, 'services/services'
10-
, 'directives/directives'
11-
, 'filters/filters'
12-
, 'controllers/controllers'
2+
// Standard Libs
3+
'Console' // lib/console/console
4+
, 'jQuery' // lib/jquery/jquery
5+
, 'Underscore' // lib/underscore/underscore
6+
, 'Angular' // lib/angular/angular
7+
8+
// Application Files
9+
, 'services/services'
10+
, 'directives/directives'
11+
, 'filters/filters'
12+
, 'controllers/controllers'
1313
], function (Console, $, _, angular, services, directives, filters, controllers) {
14-
"use strict";
15-
16-
var initialize = function () {
17-
Console.group("Starting application.");
18-
Console.info("Services: ", services);
19-
Console.info("Widgets: ", directives);
20-
Console.info("Filters: ", filters);
21-
Console.info("Controllers: ", controllers);
22-
23-
Console.group("Setup Angular");
14+
"use strict";
15+
16+
var initialize = function () {
17+
Console.group("Starting application.");
18+
Console.info("Services: ", services);
19+
Console.info("Widgets: ", directives);
20+
Console.info("Filters: ", filters);
21+
Console.info("Controllers: ", controllers);
22+
23+
Console.group("Setup Angular");
2424

25-
var mainModule = angular.module('myApp',['ngResource']);
26-
services.initialize(mainModule);
27-
directives.initialize(mainModule);
28-
filters.initialize(mainModule);
29-
controllers.initialize(mainModule);
25+
var mainModule = angular.module('myApp',['ngResource']);
26+
services.initialize(mainModule);
27+
directives.initialize(mainModule);
28+
filters.initialize(mainModule);
29+
controllers.initialize(mainModule);
3030

31-
angular.bootstrap(window.document,['myApp']);
32-
Console.info("Angular compiled and executed.");
31+
angular.bootstrap(window.document,['myApp']);
32+
Console.info("Angular compiled and executed.");
3333

34-
Console.groupEnd(); // [angular]
35-
Console.groupEnd(); // [bootstrap]
36-
};
34+
Console.groupEnd(); // [angular]
35+
Console.groupEnd(); // [bootstrap]
36+
};
3737

38-
return {
39-
initialize: initialize
40-
};
41-
});
38+
return {
39+
initialize: initialize
40+
};
41+
});

0 commit comments

Comments
 (0)