Merge branch 'onepointthree' of github.com:CodeNow/runnable-angular into onepointthree

Author: SomeKittens

client/assets/styles/scss/box/box-header.scss

@@ -86,13 +86,13 @@
   position: relative;
 
   // offset for vertical-align: middle
-  > .btn-group {
+  .btn-group {
     top: -2px;
+  }
 
-    > .btn[disabled],
-    > .btn.disabled {
-      margin: 0;
-    }
+  .btn[disabled],
+  .btn.disabled {
+    margin: 0;
   }
 }
 

client/assets/styles/scss/components/menu.scss

@@ -17,11 +17,11 @@
     padding: 0;
     pointer-events: none;
     position: absolute;
-      right: 0;
-      z-index: 3;
+    right: 0;
     transform: scale3d(0,0,1);
     transform-origin: 90% -30%;
     transition: opacity .2s cubic-bezier(.19,1,.22,1), transform .4s cubic-bezier(.19,1,.22,1);
+    z-index: 3;
 
     &::before,
     &::after {
@@ -31,7 +31,7 @@
       display: block;
       height: 0;
       position: absolute;
-        right: 11px;
+      right: 11px;
       width: 0;
     }
 

client/lib/router.js

@@ -8,7 +8,10 @@ app.config(['$stateProvider',
     $urlRouterProvider,
     $locationProvider) {
 
-    $locationProvider.html5Mode(true);
+    $locationProvider.html5Mode({
+      enabled: true,
+      requireBase: false
+    });
 
     // redirect unmatched urls
     // $urlRouterProvider.otherwise('/');

server/views/layout.jade

@@ -36,11 +36,6 @@ html(
       name = "apple-mobile-web-app-title"
     )
 
-    //- For angular
-    base(
-      href = "/"
-    )
-
     //- js
     script(
       src = "/build/js/bundle.js?v=#{locals.version}"