Skip to content

Commit f1e03cb

Browse files
committed
upper menu fading in and out
1 parent f85c1b0 commit f1e03cb

5 files changed

Lines changed: 20 additions & 6 deletions

File tree

src/assets/scss/styles.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ $blue-color: #6795DE;
1616
$orange-color: #CF4B32;
1717
$clone-wars-color: rgb(217, 217, 217);
1818
$grey-color: #C0C0C0;
19+
$green-color: #5F8120;
1920
// Thin 100 Italic
2021
// Light 300
2122
// Light 300 Italic

src/components/directive.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,22 @@ angular.module('app').directive('animateDir', function () {
77
link: function (scope, elems, attrs) {
88
$(document).ready(function () {
99
$('.side-menu').on('mouseenter', function () {
10-
console.log('this is working');
11-
// $('.side-menu-container').css('width', '160px');
1210
$('.side-menu').css('width', '215px');
1311
setTimeout(function(){
1412
$('.menu-items').css('display','flex');
1513
},200);
1614
});
1715
$('.side-menu').on('mouseleave', function () {
18-
console.log("it's all gone");
1916
$('.side-menu').css('width', '55px');
2017
$('.menu-items').css('display','none');
2118
});
2219
$('.top-menu').on('mouseenter', function () {
23-
console.log('You have entered the twilight zone');
20+
$('.top-menu').css('background-color', '#222222')
21+
});
22+
23+
$('.top-menu').on('mouseleave', function () {
24+
console.log('I left the div');
25+
$('.top-menu').css('background-color', 'rgba(0,0,0,0)')
2426
});
2527

2628
$('.solutions-icon').on('mouseclick', function () {

src/components/menus/menu.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ $blue-color: #6795DE;
1515
$orange-color: #CF4B32;
1616
$clone-wars-color: rgb(217, 217, 217);
1717
$grey-color: #C0C0C0;
18+
1819
.view {
1920
flex-direction: row;
2021
}
@@ -84,6 +85,6 @@ height:35px;
8485
position: fixed;
8586
top: 0px;
8687
right: 0px;
87-
width: 150px;
88+
width: 300px;
8889
height: 50px;
8990
}

src/components/training/training.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ <h2 class="font20-reg">Name of Kata</h2>
7676
<div class='button-div'>
7777
<button ng-click="testExamples()" class="test-examples-button font12-reg-blue">RUN EXAMPLES</button>
7878
<button ng-click="testSuite()" class="test-suite-button font12-reg-black"><i class="fa fa-caret-right fa-lg" style="margin-right: 2px" aria-hidden="true"></i>ATTEMPT</button>
79+
<button ng-click="submitAnswer()" class="submit-button font12-reg-black"><i class="fa fa-caret-right fa-lg" style="margin-right: 2px" aria-hidden="true"></i>SUBMIT</button>
7980
</div>
8081
</div>
8182
</div>

src/components/training/training.scss

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $blue-color: #6795DE;
1515
$orange-color: #CF4B32;
1616
$clone-wars-color: rgb(217, 217, 217);
1717
$grey-color: #C0C0C0;
18-
18+
$green-color: #5F8120;
1919

2020
// STUFF ALONG THE TOP
2121
.training-top {
@@ -127,6 +127,15 @@ hr {
127127
margin:15px;
128128
}
129129

130+
.submit-button {
131+
border: 1px solid $green-color;
132+
border-radius: 4%;
133+
width: 113px;
134+
height: 30px;
135+
background-color: $green-color;
136+
margin:15px;
137+
}
138+
130139
.button-div {
131140
display:flex;
132141
justify-content: right;

0 commit comments

Comments
 (0)