Permalink
Browse files

1) except in output and libraries, change tab to two-space convention…

… already established by project

2) Remove trailing spaces (unless prepared at indent for new insertion)
3) Add a couple missing semicolons as per project's established convention
  • Loading branch information...
1 parent 2602624 commit f29d09cb3be349e77f1b11fbe4c3dc3a40c9f0ba @brettz9 brettz9 committed Aug 27, 2012
View
@@ -1,5 +1,5 @@
-
-# Backbone boilerplate
+
+# Backbone boilerplate
[http://backboneboilerplate.com](http://backboneboilerplate.com) is a community driven effort to help developers learn and rapidly deploy single page web applications.
## Philosophy
View
@@ -6,7 +6,7 @@ cp ../index.html output/index.html
REQUIRE_VERSION='1.0.5'
SEDCMD='sed -i'
if [[ $OSTYPE == *"darwin"* ]]; then
- SEDCMD=$SEDCMD' .tmp'
+ SEDCMD=$SEDCMD' .tmp'
fi
SEDCMD=$SEDCMD' s/js\/libs\/require\/require.js/http:\/\/requirejs.org\/docs\/release\/'$REQUIRE_VERSION'\/minified\/require.js/g output/index.html'
$SEDCMD
View
@@ -35,7 +35,7 @@ body { margin: 0; font-size: 13px; line-height: 1.231; }
body, button, input, select, textarea { font-family: sans-serif; color: #222; }
-/*
+/*
* These selection declarations have to be separate
* No text-shadow: twitter.com/miketaylr/status/12228805301
* Also: hot pink!
@@ -113,7 +113,7 @@ nav ul, nav ol { list-style: none; margin: 0; padding: 0; }
img { border: 0; -ms-interpolation-mode: bicubic; }
/*
- * Correct overflow displayed oddly in IE9
+ * Correct overflow displayed oddly in IE9
*/
svg:not(:root) {
@@ -135,9 +135,9 @@ figure { margin: 0; }
form { margin: 0; }
fieldset { border: 0; margin: 0; padding: 0; }
-/*
- * 1. Correct color not inheriting in IE6/7/8/9
- * 2. Correct alignment displayed oddly in IE6/7
+/*
+ * 1. Correct color not inheriting in IE6/7/8/9
+ * 2. Correct alignment displayed oddly in IE6/7
*/
legend { border: 0; *margin-left: -7px; padding: 0; }
@@ -174,9 +174,9 @@ button, input[type="button"], input[type="reset"], input[type="submit"] { cursor
input[type="checkbox"], input[type="radio"] { box-sizing: border-box; }
input[type="search"] { -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; }
-/*
+/*
* Remove inner padding and border in FF3/4
- * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
+ * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
*/
button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
@@ -219,7 +219,7 @@ table { border-collapse: collapse; border-spacing: 0; }
/* Hide visually and from screenreaders, but maintain layout */
.invisible { visibility: hidden; }
-/* Contain floats: nicolasgallagher.com/micro-clearfix-hack/ */
+/* Contain floats: nicolasgallagher.com/micro-clearfix-hack/ */
.clearfix:before, .clearfix:after { content: ""; display: table; }
.clearfix:after { clear: both; }
.clearfix { zoom: 1; }
@@ -247,7 +247,7 @@ table { border-collapse: collapse; border-spacing: 0; }
Print styles.
Inlined to avoid required HTTP connection: www.phpied.com/delay-loading-your-print-css/
========================================================================== */
-
+
@media print {
* { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } /* Black prints faster: sanbeiji.com/archives/953 */
a, a:visited { color: #444 !important; text-decoration: underline; }
View
@@ -4,13 +4,13 @@
*/
-/*
+/*
### Third Party
*/
@import url("normalize.css");
@import url("960.css");
-/*
+/*
### Custom themes
*/
@import url("theme.css");
View
@@ -6,15 +6,15 @@
```
<div class="divider"></div>
<div class="main-menu">
- <ul>
- <li><a href="">Home</a></li>
- <li><a href="">Modules</a></li>
- <li><a href="">Optimize</a></li>
- <li><a href="">Backbone</a></li>
- <li><a href="">Views</a></li>
- <li><a href="">Feedback</a></li>
- </ul>
- <div style="clear: both;"></div>
+ <ul>
+ <li><a href="">Home</a></li>
+ <li><a href="">Modules</a></li>
+ <li><a href="">Optimize</a></li>
+ <li><a href="">Backbone</a></li>
+ <li><a href="">Views</a></li>
+ <li><a href="">Feedback</a></li>
+ </ul>
+ <div style="clear: both;"></div>
</div>
<div class="divider"></div>
@@ -28,35 +28,35 @@
}
.main-menu {
- margin: 10px 0 10px 0;
+ margin: 10px 0 10px 0;
}
.main-menu ul {
- margin: 0;
- padding: 0;
- list-style: none;
+ margin: 0;
+ padding: 0;
+ list-style: none;
}
.main-menu li {
- margin-right: 10px;
- float: left;
+ margin-right: 10px;
+ float: left;
}
.main-menu li a,
.main-menu li a:visited {
- padding: 5px;
- color: #515151;
- font-size: 18px;
- text-decoration: none;
- display: inline-block;
+ padding: 5px;
+ color: #515151;
+ font-size: 18px;
+ text-decoration: none;
+ display: inline-block;
}
.main-menu li a.active,
.main-menu li a:hover {
- background: #c0c0c0;
- border-radius: 6px;
+ background: #c0c0c0;
+ border-radius: 6px;
}
.divider {
- clear: both;
+ clear: both;
border-top: 1px solid #919191;
- border-bottom: 1px solid #ececec;
+ border-bottom: 1px solid #ececec;
}
/*
@@ -69,9 +69,9 @@
*/
.h3 {
- list-style: none;
- margin: 0;
- padding: 0;
+ list-style: none;
+ margin: 0;
+ padding: 0;
}
h1, h2, h3, h4, h5, h6 {
@@ -99,45 +99,45 @@ adadasd
<span class="fixie"></span>
```
<ul class="action-list">
- <li><a href="">download zip</a></li>
- <li><a href="">view the source</a></li>
- <li><a href="">watch</a></li>
- <li><a href="">fork</a></li>
+ <li><a href="">download zip</a></li>
+ <li><a href="">view the source</a></li>
+ <li><a href="">watch</a></li>
+ <li><a href="">fork</a></li>
</ul>
```
*/
.action-list {
- list-style: none;
- margin: 0;
- padding: 0;
+ list-style: none;
+ margin: 0;
+ padding: 0;
}
.action-list li {
- text-align: center;
+ text-align: center;
}
.action-list li a {
- font-size: 34px;
- color: #594936;
- font-weight: bold;
+ font-size: 34px;
+ color: #594936;
+ font-weight: bold;
}
.action-list li a:visited {
- color: #594936;
-}
+ color: #594936;
+}
body {
- background: #dddddd url('../images/page_bg.png');
- color: #11141b;
- font-family: 'PT Sans', sans-serif;
+ background: #dddddd url('../images/page_bg.png');
+ color: #11141b;
+ font-family: 'PT Sans', sans-serif;
font-size: 14px;
}
.logo {
- color: #5a4935;
- padding: 0;
- margin: 0;
+ color: #5a4935;
+ padding: 0;
+ margin: 0;
text-shadow: 0 1px 1px #fff;
text-align: center;
font-family: 'Squada One';
@@ -154,9 +154,9 @@ Boilerplate Stamp!
```
*/
.bp_logo {
- width: 280px;
- height: 266px;
- background: url('../images/backboneboilerplate_logo.png');
+ width: 280px;
+ height: 266px;
+ background: url('../images/backboneboilerplate_logo.png');
}
#springydemo {
View
@@ -4,15 +4,15 @@
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" xml:lang="en" lang="en"> <!--<![endif]-->
<head>
- <meta charset="utf-8" />
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+ <meta charset="utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
- <title>Backbone Boilerplate</title>
- <meta name="viewport" content="width=device-width,initial-scale=1" />
- <meta name="description" content="Backboneboilerplate.com is a community driven effort to help developers learn and rapidly deploy single page web applications" />
- <link rel="stylesheet" href="css/styles.css" />
+ <title>Backbone Boilerplate</title>
+ <meta name="viewport" content="width=device-width,initial-scale=1" />
+ <meta name="description" content="Backboneboilerplate.com is a community driven effort to help developers learn and rapidly deploy single page web applications" />
+ <link rel="stylesheet" href="css/styles.css" />
- <script data-main="js/main" src="js/libs/require/require.js"></script>
+ <script data-main="js/main" src="js/libs/require/require.js"></script>
</head>
<body>
<!-- Initially populated by templates/layout.html -->
@@ -25,4 +25,4 @@
<script>try{ clicky.init(66544553); }catch(e){}</script>
</body>
-</html>
+</html>
View
@@ -3,6 +3,6 @@ define([
'underscore',
'backbone'
], function($, _, Backbone){
- var vent = _.extend({}, Backbone.Events);
- return vent;
+ var vent = _.extend({}, Backbone.Events);
+ return vent;
});
View
@@ -3,55 +3,55 @@ define([
'jquery',
'underscore',
'backbone',
- 'vm'
+ 'vm'
], function ($, _, Backbone, Vm) {
var AppRouter = Backbone.Router.extend({
routes: {
// Pages
- '/modules': 'modules',
+ '/modules': 'modules',
'/optimize': 'optimize',
'/backbone/:section': 'backbone',
'/backbone': 'backbone',
'/manager': 'manager',
-
+
// Default - catch all
'*actions': 'defaultAction'
}
});
var initialize = function(options){
- var appView = options.appView;
+ var appView = options.appView;
var router = new AppRouter(options);
- router.on('route:optimize', function () {
- require(['views/optimize/page'], function (OptimizePage) {
- var optimizePage = Vm.create(appView, 'OptimizePage', OptimizePage);
- optimizePage.render();
- });
- });
- router.on('route:defaultAction', function (actions) {
- require(['views/dashboard/page'], function (DashboardPage) {
+ router.on('route:optimize', function () {
+ require(['views/optimize/page'], function (OptimizePage) {
+ var optimizePage = Vm.create(appView, 'OptimizePage', OptimizePage);
+ optimizePage.render();
+ });
+ });
+ router.on('route:defaultAction', function (actions) {
+ require(['views/dashboard/page'], function (DashboardPage) {
var dashboardPage = Vm.create(appView, 'DashboardPage', DashboardPage);
dashboardPage.render();
});
- });
- router.on('route:modules', function () {
- require(['views/modules/page'], function (ModulePage) {
+ });
+ router.on('route:modules', function () {
+ require(['views/modules/page'], function (ModulePage) {
var modulePage = Vm.create(appView, 'ModulesPage', ModulePage);
modulePage.render();
- });
- });
- router.on('route:backbone', function (section) {
+ });
+ });
+ router.on('route:backbone', function (section) {
require(['views/backbone/page'], function (BackbonePage) {
var backbonePage = Vm.create(appView, 'BackbonePage', BackbonePage, {section: section});
backbonePage.render();
});
- });
- router.on('route:manager', function () {
- require(['views/manager/page'], function (ManagerPage) {
- var managerPage = Vm.create(appView, 'ManagerPage', ManagerPage);
- managerPage.render();
- });
- });
+ });
+ router.on('route:manager', function () {
+ require(['views/manager/page'], function (ManagerPage) {
+ var managerPage = Vm.create(appView, 'ManagerPage', ManagerPage);
+ managerPage.render();
+ });
+ });
Backbone.history.start();
};
return {
Oops, something went wrong.

0 comments on commit f29d09c

Please sign in to comment.