fix(dialog): style cleanup

angular · May 1, 2015 · ee2f059 · ee2f059
1 parent 9abaed0
commit ee2f059
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 29 deletions.
diff --git a/src/components/dialog/demoBasicUsage/index.html b/src/components/dialog/demoBasicUsage/index.html
@@ -1,4 +1,4 @@
-<div ng-controller="AppCtrl" class="full" layout="column" layout-margin>
+<div ng-controller="AppCtrl" layout="column" layout-margin>
  <p class="inset">
  Open a dialog over the app's content. Press escape or click outside to close the dialog and
  send focus back to the triggering button.

diff --git a/src/components/dialog/demoBasicUsage/style.css b/src/components/dialog/demoBasicUsage/style.css
@@ -2,38 +2,11 @@
  height: 500px;
 }
 
-.full {
- width: 100%;
- height: 100%;
-}
-
 .dialog-demo-content div {
  text-align: center;
 }
-.dialog-demo-content div .md-button {
- display: inline-block;
-}
-
-md-dialog md-dialog-content.sticky-container {
- padding: 0;
-}
- md-dialog md-dialog-content.sticky-container > div {
- padding: 0 24px 24px;
- }
 
 .md-subheader {
  background-color: #dcedc8;
  margin: 0;
 }
-
-h2.md-subheader.md-sticky-clone {
- margin-right: 0;
- margin-top: 0;
-
- box-shadow: 0px 2px 4px 0 rgba(0,0,0,0.16);
-}
-
-h2 .md-subheader-content {
- padding-left: 10px;
-}
-
diff --git a/src/components/dialog/dialog.scss b/src/components/dialog/dialog.scss
@@ -1,3 +1,5 @@
+$dialog-padding: $baseline-grid * 3;
+
 .md-dialog-is-showing {
  max-height: 100%;
 }
@@ -38,7 +40,7 @@ md-dialog {
 
  md-dialog-content {
  order: 1;
- padding: $baseline-grid * 3;
+ padding: $dialog-padding;
  overflow: auto;
  -webkit-overflow-scrolling: touch;
 
@@ -49,6 +51,22 @@ md-dialog {
  &:focus {
  outline: none;
  }
+
+ .md-subheader {
+ margin: 0;
+
+ &.sticky-clone {
+ box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.16);
+ }
+ }
+ &.sticky-container {
+ padding: 0;
+
+ &> div {
+ padding: $dialog-padding;
+ padding-top: 0;
+ }
+ }
  }
 
  .md-actions {