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

Commit 8871eb3

Browse files
devversionThomasBurleson
authored andcommitted
fix(card): fix card demo for webkit engine
Webkit doesn't allow using percentage values for flex parents, that's why we need to use flex without percentage on `<= xs` webkit Fixes #6573 Fixes #6678 Closes #6765
1 parent 9d30661 commit 8871eb3

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/components/card/demoBasicUsage/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<div ng-controller="AppCtrl" ng-cloak>
2-
<md-content class="md-padding" layout="row" layout-wrap layout-align="center start" layout-xs="column">
3-
<div flex="50" flex-sm="100" flex-xs="100" layout="column">
1+
<div ng-controller="AppCtrl" ng-cloak >
2+
<md-content class="md-padding" layout-xs="column" layout="row">
3+
<div flex-xs flex-gt-xs="50" layout="column">
44
<md-card>
55
<md-card-title>
66
<md-card-title-text>
@@ -40,7 +40,7 @@
4040
</md-card-content>
4141
</md-card>
4242
</div>
43-
<div flex="50" flex-sm="100" flex-xs="100" layout="column">
43+
<div flex-xs flex-gt-xs="50" layout="column">
4444
<md-card>
4545
<md-card-title>
4646
<md-card-title-text>

src/components/card/demoCardActionButtons/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div ng-controller="AppCtrl" ng-cloak>
2-
<md-content class="md-padding" layout="row" layout-wrap layout-align="center start" layout-xs="column" >
3-
<div flex="50" flex-xs="100" layout="column">
2+
<md-content class="md-padding" layout-xs="column" layout="row">
3+
<div flex-xs flex-gt-xs="50" layout="column">
44
<md-card>
55
<img ng-src="{{imagePath}}" class="md-card-image" alt="Washed Out">
66
<md-card-title>
@@ -46,7 +46,7 @@
4646
</md-card-actions>
4747
</md-card>
4848
</div>
49-
<div flex="50" flex-xs="100" layout="column">
49+
<div flex-xs flex-gt-xs="50" layout="column">
5050
<md-card>
5151
<img ng-src="{{imagePath}}" class="md-card-image" alt="Washed Out">
5252
<md-card-title>

src/components/card/demoInCardActions/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div ng-controller="AppCtrl" ng-cloak>
2-
<md-content class="md-padding" layout="row" layout-wrap layout-align="center start" layout-xs="column">
3-
<div flex="50" flex-xs="100" layout="column">
2+
<md-content class="md-padding" layout-xs="column" layout="row">
3+
<div flex-xs flex-gt-xs="50" layout="column">
44
<md-card>
55
<img ng-src="{{imagePath}}" class="md-card-image" alt="Washed Out">
66
<md-card-title>
@@ -61,7 +61,7 @@
6161
</md-card-content>
6262
</md-card>
6363
</div>
64-
<div flex="50" flex-xs="100" layout="column">
64+
<div flex-xs flex-gt-xs="50" layout="column">
6565
<md-card>
6666
<md-card-header>
6767
<md-card-avatar>

0 commit comments

Comments
 (0)