trello#44

yesobo · Dec 20, 2014 · c8ba35d · c8ba35d
1 parent fd03ebc
commit c8ba35d
Show file tree

Hide file tree

Showing 34 changed files with 8,791 additions and 23 deletions.
diff --git a/app/index.html b/app/index.html
@@ -62,6 +62,15 @@
     <script src="bower_components/bootstrap-sass/js/tab.js"></script>
     <!-- endbuild -->
 
+    <!-- build:js scripts/modules.js -->
+    <script src="bower_components/oclazyload/dist/ocLazyLoad.js"></script>
+    <script src="bower_components/angular-resource/angular-resource.js"></script>
+    <script src="bower_components/angular-cookies/angular-cookies.js"></script>
+    <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
+    <script src="bower_components/angular-translate/angular-translate.js"></script>
+    <script src="bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script>
+    <!-- endbuild -->
+
     <!-- build:js({.tmp,app}) scripts/scripts.js -->
     <script src="scripts/app.js"></script>
     <script src="scripts/services.js"></script>
@@ -73,15 +82,7 @@
     <script src="scripts/directives/panelCollapseButton.js"></script>
     <script src="scripts/directives/directives.js"></script>
     <script src="scripts/directives/mainLeft.js"></script>
-    <script src="scripts/my-sticky-kit.js"></script>
     <!-- endbuild -->
 
-    <!-- build:js scripts/modules.js -->
-    <script src="bower_components/angular-resource/angular-resource.js"></script>
-    <script src="bower_components/angular-cookies/angular-cookies.js"></script>
-    <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
-    <script src="bower_components/angular-translate/angular-translate.js"></script>
-    <script src="bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script>
-    <!-- endbuild -->
 </body>
 </html>
diff --git a/app/scripts/controllers.js b/app/scripts/controllers.js
@@ -1,5 +1,5 @@
 /*global angular: false */
-angular.module('JesusEspejoACVControllers', [])
+angular.module('JesusEspejoACVControllers', ['oc.lazyLoad'])
 .controller('AppCtrl', ['$scope', function(sc) {
   'use strict';
 
@@ -12,10 +12,14 @@ angular.module('JesusEspejoACVControllers', [])
 }
 ])
 .controller('ExperienceCtrl',
-['$scope', '$window', 'SharedData', 'DatesDiff',
-function(sc, window, SharedData, DatesDiff) {
+['$scope', '$window', 'SharedData', 'DatesDiff', '$ocLazyLoad',
+function(sc, window, SharedData, DatesDiff, $ocLazyLoad) {
   'use strict';
 
+  $ocLazyLoad.load([{
+    files: ['scripts/my-sticky-kit.js']
+  }]);
+
   var employments = sc.employments =
   SharedData.getEmploymentsResource().query(function() {
     var employersDates = sc.employersDates =
@@ -41,8 +45,12 @@ function(sc, window, SharedData, DatesDiff) {
 }
 ])
 .controller('ProjectsCtrl', ['$scope', '$window', 'SharedData', 'DatesDiff',
-function(sc, window, SharedData, DatesDiff) {
+'$ocLazyLoad', function(sc, window, SharedData, DatesDiff, $ocLazyLoad) {
   'use strict';
+
+  $ocLazyLoad.load([{
+    files: ['scripts/my-sticky-kit.js']
+  }]);
   var projects = sc.employments =
   SharedData.getProjectsResource().query(function() {
     var employersDates = sc.employersDates =

diff --git a/app/styles/main.scss b/app/styles/main.scss
@@ -6,6 +6,7 @@ $light-color: #c1dbf2;
 $very-light-color: #ddebf9;
 $light-grey: #dddddd;
 $dark-blue: #428bca;
+$darker-blue: #171070;
 
 $stuck_shadow: 0 2px 5px rgba(0,0,0,0.26);
 
@@ -16,12 +17,12 @@ $stuck_shadow: 0 2px 5px rgba(0,0,0,0.26);
 /* Put your CSS here */
 
 .primary {
-  background-color: #428bca;
+  background-color: $dark-blue;
   color: #ffffff;
 }
 
 .primary-inverse {
-  color: #428bca;
+  color: $dark-blue;
 }
 
 .default {
@@ -89,15 +90,21 @@ section.menu-section {
   margin-top: $top-menu-margin;
 }
 
-.navbar-inverse .nav .active > a {
-  color: white;
-  background-color: #111111;
-  &:hover, &:focus {
+.navbar-inverse {
+  background-color: $darker-blue;
+  border-color: $darker-blue;
+
+  .nav .active > a {
     color: white;
-    background-color: #111111;
+    background-color: $dark-blue;
+    &:hover, &:focus {
+      color: white;
+      background-color: $dark-blue;
+    }
   }
 }
 
+
 .navitem-wrapper {
   max-height: 40px;
   overflow: visible;
@@ -202,7 +209,7 @@ button.search {
   font-weight: bold;
   height: 46px;
   padding: 0px;
-  border: solid 1px #428bca;
+  border: solid 1px $dark-blue;
 }
 
 .period-mini {

diff --git a/dist/bower_components/oclazyload/.bower.json b/dist/bower_components/oclazyload/.bower.json
@@ -0,0 +1,47 @@
+{
+  "name": "oclazyload",
+  "version": "0.5.1",
+  "description": "Load modules on demand (lazy load) with angularJS",
+  "main": "dist/ocLazyLoad.min.js",
+  "homepage": "https://github.com/ocombe/ocLazyLoad",
+  "authors": [
+    "Olivier Combe <olivier.combe@gmail.com>"
+  ],
+  "license": "MIT",
+  "keywords": [
+    "lazy load",
+    "lazy-load",
+    "load on demand",
+    "module",
+    "angular",
+    "angularJS"
+  ],
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "src",
+    "gulpfile.js",
+    "package.json",
+    "changelog.js",
+    "validate-commit-msg.js",
+    "tests",
+    "karma.conf.js"
+  ],
+  "devDependencies": {
+    "angular-mocks": "~1.3.2"
+  },
+  "dependencies": {
+    "angular": "1.2.x - 1.3.x"
+  },
+  "_release": "0.5.1",
+  "_resolution": {
+    "type": "version",
+    "tag": "0.5.1",
+    "commit": "b6daf2dd760c90c32f8d0be8c95c35df3a3b4e91"
+  },
+  "_source": "git://github.com/ocombe/ocLazyLoad.git",
+  "_target": "~0.5.1",
+  "_originalSource": "oclazyload",
+  "_direct": true
+}