Skip to content

Commit 6d7a57f

Browse files
author
Jad Joubran
committed
v1.3.1 - Added Sample Flex layout
1 parent 717e91e commit 6d7a57f

File tree

9 files changed

+104
-23
lines changed

9 files changed

+104
-23
lines changed

‎angular/app/landing/landing.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,22 @@ <h2 class="md-title">Landing page</h2>
2020
<div class="Landing-CallToAction">
2121
<md-button ui-sref="dashboard" class="md-raised md-primary">Show me the Dashboard!</md-button>
2222
</div>
23+
<br>
24+
<md-content class="md-padding">
25+
Angular Material Uses Flexbox<br>
26+
<br>
27+
<div layout="row" layout-wrap>
28+
<div class="Landing-flex Landing-flex33" flex="33">
29+
[flex="33"]
30+
</div>
31+
<div class="Landing-flex Landing-flex55" flex="55">
32+
[flex="55"]
33+
</div>
34+
<div class="Landing-flex Landing-flexRemaining" flex>
35+
[flex]
36+
</div>
37+
</div>
38+
<br>
39+
<br>
40+
</md-content>
2341
</div>

‎angular/app/landing/landing.less

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,22 @@
55

66
.Landing-CallToAction{
77
text-align: center;
8+
}
9+
10+
.Landing-flex{
11+
min-height: 50px;
12+
padding: 5px;
13+
color: white;
14+
}
15+
16+
.Landing-flex33{
17+
background-color: #009688;
18+
}
19+
20+
.Landing-flex55{
21+
background-color: #3949ab;
22+
}
23+
24+
.Landing-flexRemaining{
25+
background-color: #9c27b0;
826
}

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"angular": "1.4",
1515
"angular-ui-router": "~0.2.15",
1616
"ngstorage": "~0.3.3",
17-
"angular-material": "~0.9.4",
17+
"angular-material": "~0.9.6",
1818
"restangular": "~1.5.1"
1919
}
2020
}

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.3.0",
2+
"version": "1.3.1",
33
"devDependencies": {
44
"gulp": "^3.8.8",
55
"laravel-elixir": "*",

‎public/css/all.css

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,17 @@
1919
.Landing-CallToAction {
2020
text-align: center;
2121
}
22-
22+
.Landing-flex {
23+
min-height: 50px;
24+
padding: 5px;
25+
color: white;
26+
}
27+
.Landing-flex33 {
28+
background-color: #009688;
29+
}
30+
.Landing-flex55 {
31+
background-color: #3949ab;
32+
}
33+
.Landing-flexRemaining {
34+
background-color: #9c27b0;
35+
}

‎public/css/vendor.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/js/vendor.js

Lines changed: 22 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/views/app/landing/landing.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,22 @@ <h2 class="md-title">Landing page</h2>
2020
<div class="Landing-CallToAction">
2121
<md-button ui-sref="dashboard" class="md-raised md-primary">Show me the Dashboard!</md-button>
2222
</div>
23+
<br>
24+
<md-content class="md-padding">
25+
Angular Material Uses Flexbox<br>
26+
<br>
27+
<div layout="row" layout-wrap>
28+
<div class="Landing-flex Landing-flex33" flex="33">
29+
[flex="33"]
30+
</div>
31+
<div class="Landing-flex Landing-flex55" flex="55">
32+
[flex="55"]
33+
</div>
34+
<div class="Landing-flex Landing-flexRemaining" flex>
35+
[flex]
36+
</div>
37+
</div>
38+
<br>
39+
<br>
40+
</md-content>
2341
</div>

‎readme.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
## Frontend Demo
55

6-
[VIEW DEMO](https://jadjoubran.github.io/laravel5-angular-material-starter)
6+
[View Frontend DEMO](https://jadjoubran.github.io/laravel5-angular-material-starter)
77

88
![Laravel & Angular](http://i.imgur.com/XiMykki.png)
99

@@ -52,14 +52,22 @@ Open a new issue.
5252

5353
Here's what I'm planning for the next versions:
5454

55+
+ Add angular material icons
56+
+ Add tooltips sample
5557
+ Laravel login API fixes
56-
+ Add sample Layout which relies on flexbox
5758
+ Sample route authentication (via $localStorage)
5859
+ Gulp watch should not exit when it catches an error
5960
+ Installer script that does everything
6061

6162
## Changelog
6263

64+
65+
### v1.3.1
66+
67+
+ Add sample Layout which relies on flexbox
68+
+ Update Angular, Angular ui-router and Angular Material
69+
70+
6371
### v1.3.0
6472

6573
+ Host demo on github pages

0 commit comments

Comments
 (0)