FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge branch '2.0' into sass-color-map · Java1024/ionic@487f5ef · GitHub

  1. Java1024
  2. ionic

Repository navigation

Commit 487f5ef

Browse files
brandyscarney
committed
Merge branch '2.0' into sass-color-map
2 parents 5f2e737 + 210b4ed commit 487f5ef

15 files changed

Lines changed: 33 additions & 32 deletions

File tree

‎demos/events/main.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
</ion-menu>
2525

2626

27-
<ion-nav id="nav" [root]="rootView" #content swipe-back-enabled="false"></ion-nav>
27+
<ion-nav id="nav" [root]="rootView" #content swipeBackEnabled="false"></ion-nav>

‎demos/id/main.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@
3131

3232
</ion-menu>
3333

34-
<ion-nav id="nav" [root]="rootView" #content swipe-back-enabled="false"></ion-nav>
34+
<ion-nav id="nav" [root]="rootView" #content swipeBackEnabled="false"></ion-nav>

‎demos/menu/main.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@
3131

3232
</ion-menu>
3333

34-
<ion-nav id="nav" [root]="rootView" #content swipe-back-enabled="false"></ion-nav>
34+
<ion-nav id="nav" [root]="rootView" #content swipeBackEnabled="false"></ion-nav>

‎ionic/components/action-sheet/action-sheet.ios.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ ion-action-sheet {
6767

6868
.action-sheet-button {
6969
padding: $action-sheet-ios-button-padding;
70-
70+
margin: 0;
7171
min-height: $action-sheet-ios-button-min-height;
7272

7373
border-bottom: $action-sheet-ios-button-border-width $action-sheet-ios-button-border-style $action-sheet-ios-border-color;

‎ionic/components/action-sheet/action-sheet.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export class ActionSheet extends ViewController {
140140
* |----------|----------|--------------------------------------------------------------------------------------------------------------------------------------------------|
141141
* | text | `string` | The buttons text |
142142
* | icon | `icon` | The buttons icons |
143-
* | handler | `any` | An express the button shoule evaluate |
143+
* | handler | `any` | An express the button should evaluate |
144144
* | cssClass | `string` | An additional class for custom styles |
145145
* | role | `string` | How the button should be displayed, `destructive` or `cancel`. If not role is provided, it will display the button without any additional styles |
146146
*

‎ionic/components/menu/test/basic/main.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,6 @@
138138

139139
</ion-menu>
140140

141-
<ion-nav id="nav" [root]="rootPage" #content swipe-back-enabled="false"></ion-nav>
141+
<ion-nav id="nav" [root]="rootPage" #content swipeBackEnabled="false"></ion-nav>
142142

143143
<div [hidden]="isChangeDetecting()"></div>

‎ionic/components/menu/test/disable-swipe/main.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333

3434
</ion-menu>
3535

36-
<ion-nav id="nav" [root]="rootView" #content swipe-back-enabled="false"></ion-nav>
36+
<ion-nav id="nav" [root]="rootView" #content swipeBackEnabled="false"></ion-nav>

‎ionic/components/menu/test/enable-disable/main.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@
7676
</ion-menu>
7777

7878

79-
<ion-nav id="nav" [root]="rootPage" #content swipe-back-enabled="false"></ion-nav>
79+
<ion-nav id="nav" [root]="rootPage" #content swipeBackEnabled="false"></ion-nav>

‎ionic/components/menu/test/multiple/main.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333
</ion-menu>
3434

3535

36-
<ion-nav [root]="rootPage" #content swipe-back-enabled="false"></ion-nav>
36+
<ion-nav [root]="rootPage" #content swipeBackEnabled="false"></ion-nav>

‎ionic/components/menu/test/overlay/main.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@
3737
</ion-menu>
3838

3939

40-
<ion-nav id="nav" [root]="rootView" #content swipe-back-enabled="false"></ion-nav>
40+
<ion-nav id="nav" [root]="rootView" #content swipeBackEnabled="false"></ion-nav>

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL