Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

Commit

Permalink
fix(dialog): use .md-primary color for actions
Browse files Browse the repository at this point in the history
Closes #2448
  • Loading branch information
Marcy Sutton committed Apr 25, 2015
1 parent 5610dc9 commit 4a648d5
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 17 deletions.
2 changes: 1 addition & 1 deletion docs/app/partials/view-source.tmpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</md-dialog-content>

<div class="md-actions" layout="horizontal">
<md-button class="md-button-light" ng-click="$hideDialog()">
<md-button class="md-primary" ng-click="$hideDialog()">
Done
</md-button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/demoBasicUsage/dialog1.tmpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
More on Wikipedia
</md-button>
<span flex></span>
<md-button ng-click="answer('not useful')">
<md-button ng-click="answer('not useful')" class="md-primary">
Not Useful
</md-button>
<md-button ng-click="answer('useful')" class="md-primary">
Expand Down
39 changes: 24 additions & 15 deletions src/components/dialog/dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,26 @@ function MdDialogDirective($$rAF, $mdTheming) {
* @usage
* <hljs lang="html">
* <div ng-app="demoApp" ng-controller="EmployeeController">
* <md-button ng-click="showAlert()" class="md-raised md-warn">
* Employee Alert!
* </md-button>
* <md-button ng-click="showDialog($event)" class="md-raised">
* Custom Dialog
* </md-button>
* <md-button ng-click="closeAlert()" ng-disabled="!hasAlert()" class="md-raised">
* Close Alert
* </md-button>
* <md-button ng-click="showGreeting($event)" class="md-raised md-primary" >
* Greet Employee
* </md-button>
* <div>
* <md-button ng-click="showAlert()" class="md-raised md-warn">
* Employee Alert!
* </md-button>
* </div>
* <div>
* <md-button ng-click="showDialog($event)" class="md-raised">
* Custom Dialog
* </md-button>
* </div>
* <div>
* <md-button ng-click="closeAlert()" ng-disabled="!hasAlert()" class="md-raised">
* Close Alert
* </md-button>
* </div>
* <div>
* <md-button ng-click="showGreeting($event)" class="md-raised md-primary" >
* Greet Employee
* </md-button>
* </div>
* </div>
* </hljs>
*
Expand Down Expand Up @@ -110,7 +118,7 @@ function MdDialogDirective($$rAF, $mdTheming) {
* ' </md-list>'+
* ' </md-dialog-content>' +
* ' <div class="md-actions">' +
* ' <md-button ng-click="closeDialog()">' +
* ' <md-button ng-click="closeDialog()" class="md-primary">' +
* ' Close Dialog' +
* ' </md-button>' +
* ' </div>' +
Expand Down Expand Up @@ -189,7 +197,7 @@ function MdDialogDirective($$rAF, $mdTheming) {
* ' <md-dialog-content>Hello {{ employee }}!</md-dialog-content>' +
*
* ' <div class="md-actions">' +
* ' <md-button ng-click="closeDialog()">' +
* ' <md-button ng-click="closeDialog()" class="md-primary">' +
* ' Close Greeting' +
* ' </md-button>' +
* ' </div>' +
Expand Down Expand Up @@ -358,7 +366,8 @@ function MdDialogProvider($$interimElementProvider) {
'<p>{{ dialog.content }}</p>',
'</md-dialog-content>',
'<div class="md-actions">',
'<md-button ng-if="dialog.$type == \'confirm\'" ng-click="dialog.abort()">',
'<md-button ng-if="dialog.$type == \'confirm\'"' +
' ng-click="dialog.abort()" class="md-primary">',
'{{ dialog.cancel }}',
'</md-button>',
'<md-button ng-click="dialog.hide()" class="md-primary">',
Expand Down

0 comments on commit 4a648d5

Please sign in to comment.