Merge remote-tracking branch 'upstream/master'

Author: josephperrott

src/demo-app/card/card-demo.html

@@ -13,7 +13,7 @@
 
   <md-card>
     <md-card-subtitle>Subtitle</md-card-subtitle>
-    <md-card-title>Card with title</md-card-title>
+    <md-card-title>Card with title and footer</md-card-title>
     <md-card-content>
       <p>This is supporting text.</p>
       <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
@@ -22,6 +22,9 @@
       <button md-button>LIKE</button>
       <button md-button>SHARE</button>
     </md-card-actions>
+    <md-card-footer>
+      <md-progress-bar mode="indeterminate"></md-progress-bar>
+    </md-card-footer>
   </md-card>
 
   <md-card>

src/demo-app/ripple/ripple-demo.html

@@ -49,5 +49,4 @@
       Click me
     </div>
   </section>
-  {{centered}} {{rounded}}
 </div>

src/demo-app/slide-toggle/slide-toggle-demo.html

@@ -11,4 +11,19 @@
   <md-slide-toggle [disabled]="firstToggle">
     Disable Bound
   </md-slide-toggle>
+
+  <p>Example where the slide toggle is required inside of a form.</p>
+
+  <form #form="ngForm" (ngSubmit)="onFormSubmit()">
+
+    <md-slide-toggle name="slideToggle" required ngModel>
+      Slide Toggle
+    </md-slide-toggle>
+
+    <p>
+      <button md-raised-button type="submit">Submit Form</button>
+    </p>
+
+  </form>
+
 </div>

src/demo-app/slide-toggle/slide-toggle-demo.ts

@@ -9,4 +9,9 @@ import {Component} from '@angular/core';
 })
 export class SlideToggleDemo {
   firstToggle: boolean;
+
+  onFormSubmit() {
+    alert(`You submitted the form.`);
+  }
+
 }

src/lib/card/README.md

@@ -27,7 +27,7 @@ We also provide a number of preset sections that you can mix and match within th
   * `<md-card-content>`: main content section, intended for blocks of text
   * `<img md-card-image>`: stretches image to container width
   * `<md-card-actions>`: wraps and styles buttons
-  * `<md-card-footer>`: anchors section to bottom of card
+  * `<md-card-footer>`: anchors section to bottom of card (e.g progress bar)
 
 Example markup for a card with section presets:
 

src/lib/card/card.scss

@@ -72,7 +72,10 @@ md-card-actions {
 
 md-card-footer {
   position: absolute;
+  width: 100%;
+  min-height: 5px;
   bottom: 0;
+  left: 0;
 }
 
 md-card-actions {

src/lib/card/card.ts

@@ -40,6 +40,14 @@ export class MdCardSubtitle {}
 })
 export class MdCardActions {}
 
+/**
+ * Footer of a card, needed as it's used as a selector in the API.
+ */
+@Directive({
+  selector: 'md-card-footer'
+})
+export class MdCardFooter {}
+
 
 /*
 
@@ -118,11 +126,11 @@ export class MdCardTitleGroup {}
 @NgModule({
   exports: [
     MdCard, MdCardHeader, MdCardTitleGroup, MdCardContent, MdCardTitle, MdCardSubtitle,
-    MdCardActions
+    MdCardActions, MdCardFooter
   ],
   declarations: [
     MdCard, MdCardHeader, MdCardTitleGroup, MdCardContent, MdCardTitle, MdCardSubtitle,
-    MdCardActions
+    MdCardActions, MdCardFooter
   ],
 })
 export class MdCardModule {

src/lib/checkbox/checkbox.html

@@ -2,6 +2,7 @@
   <div class="md-checkbox-inner-container">
     <input class="md-checkbox-input md-visually-hidden" type="checkbox"
            [id]="inputId"
+           [required]="required"
            [checked]="checked"
            [disabled]="disabled"
            [name]="name"

src/lib/checkbox/checkbox.scss

@@ -402,4 +402,11 @@ md-checkbox {
   }
 }
 
+.md-checkbox-input {
+  // Move the input to the bottom and in the middle.
+  // Visual improvement to properly show browser popups when being required.
+  bottom: 0;
+  left: 50%;
+}
+
 @include md-temporary-ink-ripple(checkbox);

src/lib/checkbox/checkbox.spec.ts

@@ -255,6 +255,18 @@ describe('MdCheckbox', () => {
 
     }));
 
+    it('should forward the required attribute', () => {
+      testComponent.isRequired = true;
+      fixture.detectChanges();
+
+      expect(inputElement.required).toBe(true);
+
+      testComponent.isRequired = false;
+      fixture.detectChanges();
+
+      expect(inputElement.required).toBe(false);
+    });
+
     describe('state transition css classes', () => {
       it('should transition unchecked -> checked -> unchecked', () => {
         testComponent.isChecked = true;
@@ -502,6 +514,7 @@ describe('MdCheckbox', () => {
   <div (click)="parentElementClicked = true" (keyup)="parentElementKeyedUp = true">    
     <md-checkbox 
         id="simple-check"
+        [required]="isRequired"
         [align]="alignment"
         [checked]="isChecked" 
         [indeterminate]="isIndeterminate" 
@@ -516,6 +529,7 @@ describe('MdCheckbox', () => {
 class SingleCheckbox {
   alignment: string = 'start';
   isChecked: boolean = false;
+  isRequired: boolean = false;
   isIndeterminate: boolean = false;
   isDisabled: boolean = false;
   parentElementClicked: boolean = false;