Skip to content

Commit 2effa7c

Browse files
committed
Right side of kata library looking pretty good.
1 parent 3b28012 commit 2effa7c

13 files changed

Lines changed: 72 additions & 34 deletions

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ config.js
44
test.js
55
dist/
66
.DS_Store/
7-
src/dist/
7+
src/dist/
8+
src/notes.txt
1.7 KB
Loading
1.38 KB
Loading
3.47 KB
Loading

src/assets/imgs/creator_icon.png

1.4 KB
Loading
2.33 KB
Loading

src/components/home/homeCtrl.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
angular.module('app').controller('homeCtrl', function($scope, $state, mainService) {
44

5-
$scope.getUser = () => {
6-
mainService.getUser().then(response => {
7-
mainService.user = response.data[0];
8-
console.log(mainService.user);
9-
})
10-
}
5+
console.log(mainService.user);
6+
7+
// $scope.getUser = () => {
8+
// mainService.getUser().then(response => {
9+
// mainService.user = response.data[0];
10+
// console.log(mainService.user);
11+
// })
12+
// }
1113

1214
$scope.getRandomKata = (userid) => {
1315
mainService.getRandomKata(userid).then(response => {
@@ -20,7 +22,7 @@ angular.module('app').controller('homeCtrl', function($scope, $state, mainServic
2022
// If there is a button you can link the button to $scope.getRandomKata
2123

2224
$scope.init = () => {
23-
$scope.getUser();
25+
// $scope.getUser();
2426
$scope.getRandomKata(mainService.user.id);
2527
}
2628

src/components/kata_list/kata_list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<div class="kata-list-top">
1010
<div class="section-selector-kata font13-reg-gray" ng-click="showLibrary()"><img id="arrow-icon-kata-list" src="./assets/imgs/arrow_icon.png"/>Library</div>
11-
<div class="section-selector-kata font13-reg-gray" ng-click="showCollections()">Collections</div>
11+
<div class="section-selector-kata font13-reg-gray" ng-click="showCollections()"><img id="arrow-icon-kata-list" src="./assets/imgs/collections_icon.png"/>Collections</div>
1212
</div>
1313

1414
<library ></library>

src/components/kata_list/kata_list.scss

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,30 @@ $grey-color: #C0C0C0;
9191
.kata-sort-div {
9292
display: flex;
9393
flex-direction: row;
94-
94+
9595
}
9696

9797
.kata-list-right {
9898
width: 85vw;
99-
background-color: blue;
10099
}
101100

102101
/************* INDIVIDUAL KATA DIV *********/
103102
.individual-kata {
104103
display: flex;
105104
justify-content: space-between;
106105
align-items: center;
107-
border-bottom: 1px solid $grey-color;
108106
height: 118px;
107+
border-bottom: 1px solid $selectedButton;
108+
}
109+
110+
111+
112+
.kata-bottom-border-hr {
113+
background-image: -webkit-linear-gradient(left, transparent, rgba(255,255,255,0.1) 20%, rgba(255,255,255,0.1) 80%, transparent);
114+
background-image: -moz-linear-gradient(left, transparent, rgba(255,255,255,0.1) 20%, rgba(255,255,255,0.1) 80%, transparent);
115+
background-image: -ms-linear-gradient(left, transparent, rgba(255,255,255,0.1) 20%, rgba(255,255,255,0.1) 80%, transparent);
116+
background-image: -o-linear-gradient(left, transparent, rgba(255,255,255,0.1) 20%, rgba(255,255,255,0.1) 80%, transparent);
117+
background-image: -linear-gradient(left, transparent, rgba(255,255,255,0.1) 20%, rgba(255,255,255,0.1) 80%, transparent);
109118
}
110119

111120
.indv-kata-top {
@@ -118,11 +127,22 @@ $grey-color: #C0C0C0;
118127
margin-left: 10px;
119128
}
120129

130+
#kata-name:hover {
131+
color: $blue-color;
132+
}
133+
121134
.kata-stats {
122135
display: flex;
123136
align-items: center;
124137
}
125138

139+
.kata-stats-icon {
140+
margin-top: 10px;
141+
margin-left: 5px;
142+
height: 10px;
143+
width: 10px;
144+
}
145+
126146
.kata-stats-info {
127147
color: $grey-color;
128148
margin-top: 10px;

0 commit comments

Comments
 (0)