Permalink
Browse files

Applied Bower and Jade compile integration

  • Loading branch information...
GulinSS committed Feb 7, 2013
1 parent f4edc7a commit 5d63d3094978bd988cfe24501d2b9489bb0268e1
Showing with 92 additions and 27,958 deletions.
  1. +3 −0 .bowerrc
  2. BIN app/assets/font/fontawesome-webfont.eot
  3. +0 −255 app/assets/font/fontawesome-webfont.svg
  4. BIN app/assets/font/fontawesome-webfont.ttf
  5. BIN app/assets/font/fontawesome-webfont.woff
  6. 0 app/assets/img/.gitignore
  7. BIN app/assets/img/glyphicons-halflings-white.png
  8. BIN app/assets/img/glyphicons-halflings.png
  9. +0 −6 app/assets/partials/nav.html
  10. +0 −2 app/assets/partials/partial1.html
  11. +0 −6 app/assets/partials/partial2.html
  12. +0 −19 app/assets/partials/todo.html
  13. +41 −39 app/styles/app.less
  14. +1 −1 app/styles/themes/custom/_overrides.less
  15. +19 −0 component.json
  16. +22 −20 config.coffee
  17. +6 −4 package.json
  18. +0 −171 vendor/scripts/angular/angular-cookies.js
  19. +0 −276 vendor/scripts/angular/angular-loader.js
  20. +0 −435 vendor/scripts/angular/angular-resource.js
  21. +0 −535 vendor/scripts/angular/angular-sanitize.js
  22. +0 −14,531 vendor/scripts/angular/angular.js
  23. +0 −1 vendor/scripts/angular/version.txt
  24. +0 −117 vendor/scripts/bootstrap/bootstrap-affix.js
  25. +0 −99 vendor/scripts/bootstrap/bootstrap-alert.js
  26. +0 −105 vendor/scripts/bootstrap/bootstrap-button.js
  27. +0 −185 vendor/scripts/bootstrap/bootstrap-carousel.js
  28. +0 −167 vendor/scripts/bootstrap/bootstrap-collapse.js
  29. +0 −161 vendor/scripts/bootstrap/bootstrap-dropdown.js
  30. +0 −245 vendor/scripts/bootstrap/bootstrap-modal.js
  31. +0 −114 vendor/scripts/bootstrap/bootstrap-popover.js
  32. +0 −162 vendor/scripts/bootstrap/bootstrap-scrollspy.js
  33. +0 −144 vendor/scripts/bootstrap/bootstrap-tab.js
  34. +0 −287 vendor/scripts/bootstrap/bootstrap-tooltip.js
  35. +0 −60 vendor/scripts/bootstrap/bootstrap-transition.js
  36. +0 −323 vendor/scripts/bootstrap/bootstrap-typeahead.js
  37. +0 −11 vendor/scripts/console-helper.js
  38. +0 −3,441 vendor/scripts/jquery-1.8.3.js
  39. +0 −34 vendor/styles/bootstrap/_accordion.less
  40. +0 −79 vendor/styles/bootstrap/_alerts.less
  41. +0 −63 vendor/styles/bootstrap/_bootstrap.less
  42. +0 −24 vendor/styles/bootstrap/_breadcrumbs.less
  43. +0 −227 vendor/styles/bootstrap/_button-groups.less
  44. +0 −230 vendor/styles/bootstrap/_buttons.less
  45. +0 −131 vendor/styles/bootstrap/_carousel.less
  46. +0 −31 vendor/styles/bootstrap/_close.less
  47. +0 −61 vendor/styles/bootstrap/_code.less
  48. +0 −22 vendor/styles/bootstrap/_component-animations.less
  49. +0 −233 vendor/styles/bootstrap/_dropdowns.less
  50. +0 −687 vendor/styles/bootstrap/_forms.less
  51. +0 −21 vendor/styles/bootstrap/_grid.less
  52. +0 −25 vendor/styles/bootstrap/_hero-unit.less
  53. +0 −82 vendor/styles/bootstrap/_labels-badges.less
  54. +0 −16 vendor/styles/bootstrap/_layouts.less
  55. +0 −55 vendor/styles/bootstrap/_media.less
  56. +0 −686 vendor/styles/bootstrap/_mixins.less
  57. +0 −95 vendor/styles/bootstrap/_modals.less
  58. +0 −490 vendor/styles/bootstrap/_navbar.less
  59. +0 −391 vendor/styles/bootstrap/_navs.less
  60. +0 −41 vendor/styles/bootstrap/_pager.less
  61. +0 −121 vendor/styles/bootstrap/_pagination.less
  62. +0 −129 vendor/styles/bootstrap/_popovers.less
  63. +0 −122 vendor/styles/bootstrap/_progress-bars.less
  64. +0 −216 vendor/styles/bootstrap/_reset.less
  65. +0 −28 vendor/styles/bootstrap/_responsive-1200px-min.less
  66. +0 −193 vendor/styles/bootstrap/_responsive-767px-max.less
  67. +0 −19 vendor/styles/bootstrap/_responsive-768px-979px.less
  68. +0 −185 vendor/styles/bootstrap/_responsive-navbar.less
  69. +0 −43 vendor/styles/bootstrap/_responsive-utilities.less
  70. +0 −57 vendor/styles/bootstrap/_responsive.less
  71. +0 −52 vendor/styles/bootstrap/_scaffolding.less
  72. +0 −193 vendor/styles/bootstrap/_sprites.less
  73. +0 −237 vendor/styles/bootstrap/_tables.less
  74. +0 −52 vendor/styles/bootstrap/_thumbnails.less
  75. +0 −70 vendor/styles/bootstrap/_tooltip.less
  76. +0 −235 vendor/styles/bootstrap/_type.less
  77. +0 −30 vendor/styles/bootstrap/_utilities.less
  78. +0 −301 vendor/styles/bootstrap/_variables.less
  79. +0 −29 vendor/styles/bootstrap/_wells.less
View
@@ -0,0 +1,3 @@
+{
+ "directory" : "vendor"
+}
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
Binary file not shown.
No changes.
Binary file not shown.
Binary file not shown.
@@ -1,6 +0,0 @@
-
-<ul class="nav">
- <li ng-class="getClass('/todo')"><a ng-href="#/todo">todo</a></li>
- <li ng-class="getClass('/view1')"><a ng-href="#/view1">view1</a></li>
- <li ng-class="getClass('/view2')"><a ng-href="#/view2">view2</a></li>
-</ul>
@@ -1,2 +0,0 @@
-
-<p>This is the partial for view 1.</p>
@@ -1,6 +0,0 @@
-
-<p>This is the partial for view 2.</p>
-<p>
- Showing of 'interpolate' filter:
- {{ 'Current version is v%VERSION%.' | interpolate }}
-</p>
@@ -1,19 +0,0 @@
-
-<div ng-app="ng-app">
- <h2>Todo</h2>
- <div ng-controller="TodoCtrl"><span>{{remaining()}} of {{todos.length}} remaining</span> [<a href="" ng-click="archive()">archive</a>]
- <ul class="unstyled">
- <li ng-repeat="todo in todos">
- <label class="checkbox inline">
- <input type="checkbox" ng-model="todo.done"/><span class="done{{todo.done}}">{{todo.text}}</span>
- </label>
- </li>
- </ul>
- <form ng-submit="addTodo()" class="form-inline">
- <p>
- <input type="text" ng-model="todoText" size="30" placeholder="add new todo here"/>
- <input type="submit" value="add" class="btn btn-primary"/>
- </p>
- </form>
- </div>
-</div>
View
@@ -9,7 +9,7 @@
*/
// CSS Reset
-@import "/vendor/styles/bootstrap/_reset.less";
+@import "/vendor/bootstrap/less/reset.less";
// Theme variables
// Uncomment the theme you would like to use. Themes may include
@@ -26,68 +26,70 @@
@import "themes/custom/_variables.less";
// Core variables and mixins
-@import "/vendor/styles/bootstrap/_mixins.less";
+@import "/vendor/bootstrap/less/mixins.less";
// Grid system and page structure
-@import "/vendor/styles/bootstrap/_scaffolding.less";
-@import "/vendor/styles/bootstrap/_grid.less";
-@import "/vendor/styles/bootstrap/_layouts.less";
+@import "/vendor/bootstrap/less/scaffolding.less";
+@import "/vendor/bootstrap/less/grid.less";
+@import "/vendor/bootstrap/less/layouts.less";
// Base CSS
-@import "/vendor/styles/bootstrap/_type.less";
-@import "/vendor/styles/bootstrap/_code.less";
-@import "/vendor/styles/bootstrap/_forms.less";
-@import "/vendor/styles/bootstrap/_tables.less";
+@import "/vendor/bootstrap/less/type.less";
+@import "/vendor/bootstrap/less/code.less";
+@import "/vendor/bootstrap/less/forms.less";
+@import "/vendor/bootstrap/less/tables.less";
// Components: common
-@import "/vendor/styles/bootstrap/_sprites.less";
-@import "/vendor/styles/sapling/_font-awesome.less";
-@import "/vendor/styles/bootstrap/_dropdowns.less";
-@import "/vendor/styles/bootstrap/_wells.less";
-@import "/vendor/styles/bootstrap/_component-animations.less";
-@import "/vendor/styles/bootstrap/_close.less";
+@import "/vendor/bootstrap/less/sprites.less";
+
+@import "/vendor/font-awesome/less/font-awesome.less";
+
+@import "/vendor/bootstrap/less/dropdowns.less";
+@import "/vendor/bootstrap/less/wells.less";
+@import "/vendor/bootstrap/less/component-animations.less";
+@import "/vendor/bootstrap/less/close.less";
// Components: Buttons & Alerts
-@import "/vendor/styles/bootstrap/_buttons.less";
-@import "/vendor/styles/bootstrap/_button-groups.less";
-@import "/vendor/styles/bootstrap/_alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+@import "/vendor/bootstrap/less/buttons.less";
+@import "/vendor/bootstrap/less/button-groups.less";
+@import "/vendor/bootstrap/less/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
// Components: Nav
-@import "/vendor/styles/bootstrap/_navs.less";
-@import "/vendor/styles/bootstrap/_navbar.less";
-@import "/vendor/styles/bootstrap/_breadcrumbs.less";
-@import "/vendor/styles/bootstrap/_pagination.less";
-@import "/vendor/styles/bootstrap/_pager.less";
+@import "/vendor/bootstrap/less/navs.less";
+@import "/vendor/bootstrap/less/navbar.less";
+@import "/vendor/bootstrap/less/breadcrumbs.less";
+@import "/vendor/bootstrap/less/pagination.less";
+@import "/vendor/bootstrap/less/pager.less";
// Components: Popovers
-@import "/vendor/styles/bootstrap/_modals.less";
-@import "/vendor/styles/bootstrap/_tooltip.less";
-@import "/vendor/styles/bootstrap/_popovers.less";
+@import "/vendor/bootstrap/less/modals.less";
+@import "/vendor/bootstrap/less/tooltip.less";
+@import "/vendor/bootstrap/less/popovers.less";
// Components: Misc
-@import "/vendor/styles/bootstrap/_thumbnails.less";
-@import "/vendor/styles/bootstrap/_media.less";
-@import "/vendor/styles/bootstrap/_labels-badges.less";
-@import "/vendor/styles/bootstrap/_progress-bars.less";
-@import "/vendor/styles/bootstrap/_accordion.less";
-@import "/vendor/styles/bootstrap/_carousel.less";
-@import "/vendor/styles/bootstrap/_hero-unit.less";
+@import "/vendor/bootstrap/less/thumbnails.less";
+@import "/vendor/bootstrap/less/media.less";
+@import "/vendor/bootstrap/less/labels-badges.less";
+@import "/vendor/bootstrap/less/progress-bars.less";
+@import "/vendor/bootstrap/less/accordion.less";
+@import "/vendor/bootstrap/less/carousel.less";
+@import "/vendor/bootstrap/less/hero-unit.less";
// Componets: Footer
@import "/vendor/styles/sapling/_sticky-footer.less";
// Responsive
-@import "/vendor/styles/bootstrap/_responsive-utilities.less";
-@import "/vendor/styles/bootstrap/_responsive-1200px-min.less";
-@import "/vendor/styles/bootstrap/_responsive-768px-979px.less";
-@import "/vendor/styles/bootstrap/_responsive-767px-max.less";
-@import "/vendor/styles/bootstrap/_responsive-navbar.less";
+@import "/vendor/bootstrap/less/responsive-utilities.less";
+@import "/vendor/bootstrap/less/responsive-1200px-min.less";
+@import "/vendor/bootstrap/less/responsive-768px-979px.less";
+@import "/vendor/bootstrap/less/responsive-767px-max.less";
+@import "/vendor/bootstrap/less/responsive-navbar.less";
// AngularJS
@import "/vendor/styles/sapling/_angular.less";
// Utility classes
-@import "/vendor/styles/bootstrap/_utilities.less"; // Has to be last to override when necessary
+@import "/vendor/bootstrap/less/utilities.less"; // Has to be last to override when necessary
// Theme Overrides
@@ -7,7 +7,7 @@ bootstrap, so the may override it's behavior.
.footer {
background-color: whitesmoke;
padding: 30px 0;
- .box-shadow(inset 0 5px 15px rgba(0, 0, 0, .025));
+ /* .box-shadow(inset 0 5px 15px rgba(0, 0, 0, .025)); */
}
// Application styles
View
@@ -0,0 +1,19 @@
+{
+ "name": "bower-brunch",
+ "version": "0.0.1",
+ "main": [],
+ "dependencies": {
+ "console-polyfill": "*",
+
+ "jquery": "1.8.3",
+
+ "bootstrap": "2.2.2",
+ "font-awesome": "3.0.2",
+
+ "angular": "1.0.4",
+ "angular-sanitize": "1.0.4",
+ "angular-resource": "1.0.4",
+ "angular-cookies": "1.0.4",
+ "angular-mocks": "git://github.com/fabsor/bower-angular-mocks.git#v1.0.4"
+ }
+}
View
@@ -1,5 +1,7 @@
exports.config =
# See docs at http://brunch.readthedocs.org/en/latest/config.html.
+ conventions:
+ ignored: /^(vendor.*\.less|.+node_modules.+|.+_.+\.+)$/
modules:
definition: false
wrapper: false
@@ -13,36 +15,36 @@ exports.config =
'test/scenarios.js': /^test(\/|\\)e2e/
order:
before: [
- 'vendor/scripts/console-helper.js'
- 'vendor/scripts/jquery-1.8.3.js'
- 'vendor/scripts/angular/angular.js'
- 'vendor/scripts/angular/angular-resource.js'
- 'vendor/scripts/angular/angular-cookies.js'
-
- 'vendor/scripts/bootstrap/bootstrap-transition.js'
- 'vendor/scripts/bootstrap/bootstrap-alert.js'
- 'vendor/scripts/bootstrap/bootstrap-button.js'
- 'vendor/scripts/bootstrap/bootstrap-carousel.js'
- 'vendor/scripts/bootstrap/bootstrap-collapse.js'
- 'vendor/scripts/bootstrap/bootstrap-dropdown.js'
- 'vendor/scripts/bootstrap/bootstrap-modal.js'
- 'vendor/scripts/bootstrap/bootstrap-tooltip.js'
- 'vendor/scripts/bootstrap/bootstrap-popover.js'
- 'vendor/scripts/bootstrap/bootstrap-scrollspy.js'
- 'vendor/scripts/bootstrap/bootstrap-tab.js'
- 'vendor/scripts/bootstrap/bootstrap-typeahead.js'
- 'vendor/scripts/bootstrap/bootstrap-affix.js'
+ 'vendor/console-polyfill/index.js'
+ 'vendor/jquery/jquery.js'
+ 'vendor/angular/angular.js'
+ 'vendor/angular-resource/angular-resource.js'
+ 'vendor/angular-cookies/angular-cookies.js'
+ 'vendor/bootstrap/docs/assets/js/bootstrap.js'
]
stylesheets:
joinTo:
'css/app.css': /^(app|vendor)/
+
templates:
- joinTo: 'js/templates.js'
+ joinTo:
+ 'js/dontUseMe' : /^app/ # dirty hack for Jade compiling.
plugins:
jade:
pretty: yes # Adds pretty-indentation whitespaces to output (false by default)
+ jade_angular:
+ modules_folder: 'partials'
+ locals: {}
+
+ bower:
+ extend:
+ "bootstrap" : 'vendor/bootstrap/docs/assets/js/bootstrap.js'
+ asserts:
+ "img" : /bootstrap(\\|\/)img/
+ "font": /font-awesome(\\|\/)font/
+
# Enable or disable minifying of result js / css files.
# minify: true
View
@@ -18,11 +18,9 @@
"dependencies": {
"brunch": ">= 1.4 < 1.5",
- "javascript-brunch": ">= 1.0 < 1.5",
"coffee-script-brunch": ">= 1.0 < 1.5",
"coffeelint-brunch": ">= 1.0 < 1.5",
- "css-brunch": ">= 1.0 < 1.5",
"less-brunch": ">= 1.4 < 1.5",
"stylus-brunch": ">= 1.0 < 1.5",
@@ -31,8 +29,12 @@
"uglify-js-brunch": ">= 1.0 < 1.5",
"clean-css-brunch": ">= 1.0 < 1.5",
- "jade-brunch": ">= 1.4.1 < 1.5",
- "static-jade-brunch": ">= 1.4.0 <= 1.4.5 || >= 1.4.8 < 1.5"
+ "bower-stylesheet-brunch": "*",
+ "bower-javascript-brunch": "*",
+ "bower-asserts-brunch": "*",
+ "bower": "~0.7.0",
+
+ "jade-angularjs-brunch" : "0.0.1"
},
"devDependencies": {
"jade": ">= 0.27.7",
Oops, something went wrong.

0 comments on commit 5d63d30

Please sign in to comment.