Merge pull request #41 from MichalBryxi/feature/3-timelapsters-v2

Nicer map & smaller map
MichalBryxi · May 8, 2016 · 7767182 · 7767182
2 parents 0baff1d + 75f4262
commit 7767182
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/frontend/app/project/map/route.js b/frontend/app/project/map/route.js
@@ -1,14 +1,4 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
-  actions: {
-    didTransition() {
-      this.send('setFullscreen', true);
-      return true;
-    },
-    willTransition() {
-      this.send('setFullscreen', false);
-      return true;
-    }
-  }
 });
diff --git a/frontend/app/styles/layout/application.scss b/frontend/app/styles/layout/application.scss
@@ -1,7 +1,7 @@
+// scss-lint:disable PlaceholderInExtend
+
 .application-container {
-  // scss-lint:disable PlaceholderInExtend
   @extend .container;
-  // scss-lint:enable PlaceholderInExtend
 
   min-height: calc(100vh - 70px - 20px - 56px);
 }
@@ -35,9 +35,7 @@ footer.page-footer {
 
   .footer-twitter,
   .footer-github {
-    // scss-lint:disable PlaceholderInExtend
     @extend .right;
-    // scss-lint:enable PlaceholderInExtend
 
     color: $color-3-1;
     padding-left: 1em;
@@ -51,3 +49,7 @@ footer.page-footer {
     color: $color-4-3;
   }
 }
+
+.s-map {
+  @extend .z-depth-2;
+}