Merge branch 'dev'

app/index.html

@@ -86,6 +86,7 @@
         <script src="scripts/controllers/contact.js"></script>
         <script src="scripts/services/botsdata.js"></script>
         <script src="scripts/directives/botbar.js"></script>
+        <script src="scripts/services/analyticsservice.js"></script>
         <!-- endbuild -->
 </body>
 </html>

app/scripts/app.js

@@ -36,12 +36,8 @@ angular
       .otherwise({
         redirectTo: '/alex'
       });
-  }).run(['$rootScope', '$location', '$window', function($rootScope, $location, $window){
-   $rootScope
-      .$on('$stateChangeSuccess',
-          function(event){
-              if (!$window.ga)
-                  return;
-              $window.ga('send', 'pageview', { page: $location.path() });
-      });
-}]);
+  }).run(function($rootScope, $location, analyticsService) {
+    $rootScope.$on('$routeChangeSuccess', function() {
+      analyticsService.recordPageview($location.url());
+    });
+  });

app/scripts/services/analyticsservice.js

@@ -0,0 +1,16 @@
+'use strict';
+
+/**
+ * @ngdoc service
+ * @name happybotsApp.analyticsService
+ * @description
+ * # analyticsService
+ * Service in the happybotsApp.
+ */
+angular.module('happybotsApp')
+  .service('analyticsService', function () {
+    this.recordPageview = function(url) {
+      ga('set', 'page', url);
+      ga('send', 'pageview');
+    };
+  });

app/styles/_bot.scss

@@ -27,9 +27,26 @@
 @media (max-width: $screen-sm-min) {
 
   .bot {
+
+      padding-top: 35px;
+
+      .btn {
+        padding: 6px 12px;
+        font-size: 14px;
+
+        .img-bg {
+          height: 14px;
+          width: 14px;
+        }
+      }
+
       h1 {
         text-transform: uppercase;
-        font-size: 3rem;
+        font-size: 2.5rem;
+      }
+
+      h2 {
+        font-size: 2rem;
       }
   }
 

app/styles/_socialbuttons.scss

@@ -15,12 +15,10 @@
 @media (max-width: $screen-sm-min) {
 
   .social-center {
-    .social { text-align: center; }
-    .social ul { display:inline-table; }
-    .social li { display:inline; }
-    margin-bottom: 100px;
+    display: none;
   }
 
+
 }
 
 .social {

app/styles/_wip.scss

@@ -67,10 +67,21 @@
 @media (max-width: $screen-sm-min) {
 
   .wip {
+
       h2 {
         font-size: 2rem;
       }
 
+			.img-responsive {
+				padding-top: 20px;
+				padding-left: 50px;
+				padding-right: 50px;
+			}
+
+			.text {
+				font-size: 1.4rem;
+			}
+
   }
 
 }

test/spec/services/analyticsservice.js

@@ -0,0 +1,18 @@
+'use strict';
+
+describe('Service: analyticsService', function () {
+
+  // load the service's module
+  beforeEach(module('happybotsApp'));
+
+  // instantiate service
+  var analyticsService;
+  beforeEach(inject(function (_analyticsService_) {
+    analyticsService = _analyticsService_;
+  }));
+
+  it('should do something', function () {
+    expect(!!analyticsService).toBe(true);
+  });
+
+});