Skip to content

Commit 3e380e1

Browse files
committed
fixing demo elements stacked on iOS #130
1 parent 4b3183c commit 3e380e1

File tree

7 files changed

+35
-14
lines changed

7 files changed

+35
-14
lines changed

angular/app/footer/footer.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<md-content class="Page-Container Footer" ng-controller="FooterController as vm" layout-align="center center">
2-
<md-icon md-svg-src="/img/icons/logo-grey.svg" class="Footer-logo"></md-icon>
3-
<br/>
4-
<br/>
5-
<div class="Footer-text">
6-
An open source project by <a href="https://github.com/jadjoubran" class="Footer-link" target="_blank">Jad Joubran</a>.
7-
Design by <a href="https://www.linkedin.com/in/nicolesaidy" class="Footer-link" target="_blank">Nicole Saidy</a>
8-
</div>
9-
<div class="Footer-text">
10-
&copy; 2016 Laravel Angular Material Starter
11-
</div>
2+
<md-icon md-svg-src="/img/icons/logo-grey.svg" class="Footer-logo"></md-icon>
3+
<br/>
4+
<br/>
5+
<div class="Footer-text">
6+
An open source project by <a href="https://github.com/jadjoubran" class="Footer-link" target="_blank">Jad Joubran</a>.
7+
Design by <a href="https://www.linkedin.com/in/nicolesaidy" class="Footer-link" target="_blank">Nicole Saidy</a>
8+
</div>
9+
<div class="Footer-text">
10+
&copy; 2016 Laravel Angular Material Starter
11+
</div>
1212
</md-content>

angular/app/landing/landing.controller.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88

99
vm.laravel_description = 'Response macros integrated with your Angular app';
1010
vm.angular_description = 'Query your API without worrying about validations';
11+
12+
/*
13+
This is a terrible temporary hack,
14+
to fix layout issues with flex on iOS (chrome & safari)
15+
Make sure to remove this when you modify this demo
16+
*/
17+
vm.iOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
1118
}
1219

1320
})();

angular/app/landing/landing.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h1 class="md-display-3 Landing-heading"><strong>laravel angular</strong> <span
55
<md-button class="md-raised md-large Landing-getStarted" href="https://laravel-angular.readme.io/docs/install" target="_blank">Get Started</md-button>
66
</div>
77

8-
<div class="Landing-laravelAngular">
8+
<div class="Landing-laravelAngular" ng-class="{'iOS-hack': vm.iOS}">
99
<div class="Landing-ampersand" hide show-gt-sm>&amp;</div>
1010
<div layout="column" layout-gt-sm="row">
1111
<div flex="50" class="Landing-laravel" layout-align="center center">

angular/app/landing/landing.less

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,3 +199,17 @@ body{
199199
.Landing-featuresEntry--generators md-icon{
200200
width: 80px;
201201
}
202+
203+
/*
204+
This is a terrible temporary hack,
205+
to fix layout issues with flex on iOS (chrome & safari)
206+
Make sure to remove this when you modify this demo
207+
*/
208+
@media only screen and (max-width : 950px) {
209+
.iOS-hack .flex-100,
210+
.iOS-hack .flex-50,
211+
.iOS-hack .flex-33,
212+
{
213+
flex: none !important;
214+
}
215+
}

public/css/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)