Skip to content

Commit 933d208

Browse files
author
Jon Myrick
authored
Merge pull request CodewarsClone#64 from CodewarsClone/Thurs22.2
Thurs22.2
2 parents 64a8db0 + 8f72c6b commit 933d208

8 files changed

Lines changed: 32 additions & 17 deletions

File tree

.DS_Store

8 KB
Binary file not shown.

src/.DS_Store

8 KB
Binary file not shown.

src/assets/.DS_Store

8 KB
Binary file not shown.

src/assets/imgs/Asset 37.png

1.24 KB
Loading

src/assets/imgs/downarrrow.png

5.1 KB
Loading

src/components/menus/menu.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,13 @@ height:35px;
3131

3232
.side-menu {
3333
background-color: $sidebar-color;
34-
height: 100%;
34+
height: 100vh;
3535
width: 55px;
3636
padding: 5px;
3737
float: left;
3838
position: fixed;
3939
left: 0;
40+
top: 0;
4041
transition: width 0.5s;
4142
z-index: 99;
4243
}

src/components/training/training.html

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,30 @@
44
<div class="kata-name-container">
55
<div class="kata-name-container-top">
66
<img src="./assets/imgs/5_kyu_icon.png" alt="Difficulty" id="difficulty-icon">
7-
<h3 class="font16-reg" id="kata-name">
8-
Name of Kata
9-
</h3>
7+
<div class="font16-reg" id="kata-name">
8+
{{name}}
9+
</div>
1010
</div>
1111
<div class="kata-stats">
12-
<p>Here's where stats go</p>
13-
<p>Here's where stats go</p>
14-
<p>Here's where stats go</p>
1512
</div>
1613
</div>
1714
<!--End kata-name-container div-->
1815
<div class="selection-div">
19-
<select class="language-select-dropdown select-dropdown" ng-init="selectedLanguage = languages[0]" ng-model="selectedLanguage"
16+
<div class='select-dropdown'>
17+
<select class="language-select-dropdown " ng-init="selectedLanguage = languages[0]" ng-model="selectedLanguage"
2018
ng-options="x for x in languages">
21-
2219
</select>
23-
<select class="language-version-select-dropdown select-dropdown" ng-init="selectedVersion = versions[0]" ng-model="selectedVersion" ng-options="x for x in versions">
24-
20+
</div>
21+
<div class='select-dropdown'>
22+
<select class="language-version-select-dropdown" ng-init="selectedVersion = versions[0]" ng-model="selectedVersion" ng-options="x for x in versions">
2523
</select>
26-
</div>
24+
</div>
2725
<div class="assorted-options">
2826
<div class="view-options">Here's where view options go</div>
2927
<div class="view-options">Here's where view options go</div>
3028
<div class="view-options">Here's where view options go</div>
3129
</div>
30+
</div>
3231
</div>
3332
<div class="kata">
3433
<!-- <div class="instructions">

src/components/training/training.scss

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,23 @@ $green-color: #5F8120;
1919

2020
// STUFF ALONG THE TOP
2121
.training-top {
22-
background-color: green;
23-
height: 100px;
22+
height: 60px;
2423
margin-top: 50px;
2524
display: flex;
2625
justify-content: space-between;;
2726
align-items: center;
27+
padding: 15px;
2828
}
2929

3030
.kata-name-container {
31-
background-color: blue;
3231
display: flex;
3332
flex-direction: column;
3433
justify-content: flex-start;
35-
align-items: center;
34+
align-items: left;
35+
width: 40vw;
3636
}
3737

3838
.kata-name-container-top {
39-
background-color: blue;
4039
display: flex;
4140
justify-content: flex-start;
4241
align-items: center;
@@ -60,6 +59,22 @@ $green-color: #5F8120;
6059
height: 30px;
6160
width: 50px;
6261
margin-right: 5px;
62+
63+
}
64+
65+
.select-dropdown {
66+
height: 52px;
67+
width: 175px;
68+
background-color: $button1;
69+
flex-direction: row;
70+
margin: 7.5px;
71+
}
72+
73+
.selection-div {
74+
display: flex;
75+
justify-content: space-around;
76+
flex-direction: row;
77+
width: 60vw;
6378
}
6479

6580

0 commit comments

Comments
 (0)