refactor(sticky): refactor

angular · Oct 3, 2014 · 41d562b · 41d562b
1 parent 43b54b3
commit 41d562b
Show file tree

Hide file tree

Showing 7 changed files with 298 additions and 259 deletions.
diff --git a/src/components/content/_content.scss b/src/components/content/_content.scss
@@ -1,6 +1,7 @@
 material-content {
 
  display: block;
+ position: relative;
  overflow: auto;
  -webkit-overflow-scrolling: touch;
 
@@ -18,10 +19,6 @@ material-content {
  &.material-content-padding {
  padding: 8px;
  }
-
- &[scroll-shrink] {
- position: relative;
- }
 }
 
 @media (min-width: $layout-breakpoint-sm) {

diff --git a/src/components/content/content.js b/src/components/content/content.js
@@ -33,13 +33,14 @@ angular.module('material.components.content', [
 function materialContentDirective() {
  return {
  restrict: 'E',
- controller: ['$element', ContentController],
+ controller: ['$scope', '$element', ContentController],
  link: function($scope, $element, $attr) {
  $scope.$broadcast('$materialContentLoaded', $element);
  }
  };
 
- function ContentController($element) {
+ function ContentController($scope, $element) {
+ this.$scope = $scope;
  this.$element = $element;
  }
 }
diff --git a/src/components/sticky/_sticky.scss b/src/components/sticky/_sticky.scss
@@ -1,5 +1,30 @@
-.material-sticky-active {
- top: 0px;
- position: fixed;
+
+
+
+
+
+
+.material-subheader {
+ position:relative;
+}
+.material-sticky-invisible {
+ opacity: 0;
+}
+
+.material-sticky-container {
+ position: absolute;
  z-index: 2;
+ overflow: hidden;
+ pointer-events: none;
+
+ .material-sticky-clone {
+ top: 0;
+ left: 0;
+ right: 24px;
+ position: absolute;
+ @include transform(translate3d(0, 0, 0));
+ &:not(.material-sticky-active) {
+ @include transform(translate3d(-9999px, -9999px, 0));
+ }
+ }
 }