Skip to content

Commit 2a893e7

Browse files
author
Jon Myrick
authored
Merge pull request CodewarsClone#78 from CodewarsClone/Mon1.2
Mon1.2
2 parents a312473 + 92d5e14 commit 2a893e7

4 files changed

Lines changed: 13 additions & 19 deletions

File tree

src/components/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $stateProvider
1414
.state('menu',{
1515
url: '/',
1616
templateUrl:'./components/menus/menu.html',
17-
// controller: 'loginCtrl'
17+
controller: 'menuCtrl'
1818
})
1919

2020
//~~~~~~~~~~~~~Child States~~~~~~~~~~~~~

src/components/menus/menu.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<ul class='ul-top'>
2020
<li><div class='li65'><img src='./assets/imgs/asset_30.png' class='li65-img'></div></li>
2121
<li><div class='li65'><img src='./assets/imgs/asset_31.png'class='li65-img'></div></li>
22-
<li class='li170'><li>img</li><li>kyu</li><li>lvl</li></li>
22+
<li class='li170'><li>{{userPic}}</li><li>kyu</li><li>lvl</li></li>
2323
</ul>
2424
</div>
2525
<main>

src/components/menus/menu.scss

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ $grey-color: #C0C0C0;
2323
.ul {
2424
display: flex;
2525
height:35px;
26+
cursor: pointer;
2627
}
2728

2829
.li {
@@ -47,36 +48,26 @@ height:35px;
4748
align-items: center;
4849
justify-content: center;
4950
display: flex;
51+
5052
}
5153

5254
.main-icon {
5355
width:35px;
5456
height:35px;
5557
left:50px;
58+
cursor: pointer;
5659
}
5760
.side-menu-icon {
5861
// width: 20px;
5962
height: 22px;
6063
}
6164

62-
#icon1 {
63-
64-
}
65-
66-
#icon2 {
67-
68-
}
69-
70-
#icon3 {
71-
72-
}
73-
74-
#icon4 {
75-
76-
}
77-
7865
.menu-items {
79-
display: none;
66+
display: none;
67+
cursor: pointer;
68+
vertical-align: center;
69+
margin: auto 0;
70+
justify-content: left;
8071
}
8172

8273

src/components/menus/menuCtrl.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
angular.module('app').controller('menuCtrl', function($scope, mainService){
2+
$scope.userPic = this.user.picture_url;
3+
});

0 commit comments

Comments
 (0)