Skip to content

Commit b815ef7

Browse files
64json64json
committed
Merge branch 'gh-pages' of https://github.com/parkjs814/AlgorithmVisualizer into gh-pages
2 parents 04c721c + 330c1b2 commit b815ef7

11 files changed

Lines changed: 89 additions & 67 deletions

‎algorithm/category.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"longest_increasing_subsequence": "Longest Increasing Subsequence",
2222
"max_subarray": "Maximum Subarray",
2323
"max_sum_path": "Maximum Sum Path",
24-
"pascal_triangle": "Pascal's Trangle",
24+
"pascal_triangle": "Pascal's Triangle",
2525
"sliding_window": "Sliding Window",
2626
"ugly_numbers": "Ugly Numbers"
2727
},
@@ -105,4 +105,4 @@
105105
},
106106
"name": "Uncategorized"
107107
}
108-
}
108+
}

‎css/stylesheet.css‎

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ a {
4040

4141
.btn,
4242
button {
43+
cursor: pointer;
4344
vertical-align: top;
4445
border: none;
4546
height: 100%;
@@ -51,19 +52,31 @@ button {
5152
white-space: nowrap;
5253
overflow: hidden;
5354
text-overflow: ellipsis;
55+
background: rgb(63, 63, 63);
5456
}
5557

5658
.btn:hover,
57-
button:not([disabled]):hover {
58-
background: rgba(0, 0, 0, .15) !important;
59-
cursor: pointer;
59+
button:hover {
60+
background: rgba(0, 0, 0, .15);
6061
}
6162

6263
.btn.active,
6364
button.active {
6465
background: rgb(38, 38, 38);
6566
}
6667

68+
.btn.active:hover,
69+
button.active:hover {
70+
background: rgba(38, 38, 38);
71+
color: rgba(187, 187, 187, .8);
72+
}
73+
74+
button[disabled] {
75+
background: rgb(63, 63, 63);
76+
cursor: not-allowed;
77+
opacity: 0.6;
78+
}
79+
6780
.btn input,
6881
button input {
6982
outline: none;
@@ -142,22 +155,29 @@ nav h3 {
142155
width: 100%;
143156
height: 30px;
144157
text-align: left;
158+
background: rgba(0, 0, 0, .15);
145159
}
146160

147-
button.category {
148-
background: rgba(0, 0, 0, .10);
161+
.sidemenu button:hover {
162+
background: rgb(63, 63, 63);
149163
}
150164

151-
button.indent {
152-
padding-left: 28px;
165+
.sidemenu button.active {
166+
background: rgb(38, 38, 38);
153167
}
154168

155-
.algorithms {
156-
box-shadow: inset 0 2px 2px rgba(0, 0, 0, 0.36), inset 0 -2px 2px rgba(0, 0, 0, 0.24);
169+
.sidemenu button.active:hover {
170+
background: rgb(38, 38, 38);
171+
}
172+
173+
.sidemenu button.indent {
174+
padding-left: 28px;
157175
}
158176

159-
.algorithms.collapse {
177+
.sidemenu .algorithms {
160178
display: none;
179+
padding: 3px 2px;
180+
box-shadow: inset 0 2px 2px rgba(0, 0, 0, 0.48), inset 0 -2px 2px rgba(0, 0, 0, 0.36);
161181
}
162182

163183
.workspace {
@@ -285,10 +305,6 @@ section {
285305
width: 30px;
286306
}
287307

288-
.files_bar > button:disabled {
289-
background: rgba(0, 0, 0, .15);
290-
}
291-
292308
.files_bar .btn-left {
293309
left: 0;
294310
}
@@ -539,22 +555,15 @@ input[type=number]::-webkit-outer-spin-button {
539555
content: 'Resume'
540556
}
541557

542-
button[disabled] {
543-
cursor: not-allowed;
544-
opacity: 0.6;
545-
}
546-
547558
#btn_pause {
548559
width: 86px;
549560
}
550561

551562
.top-menu-buttons button.active {
552-
background: rgba(0, 0, 0, .15);
553563
box-shadow: 0px 0px 10px 3px #1a1a1a inset;
554564
}
555565

556566
.top-menu-buttons button:active {
557-
background: rgba(0, 0, 0, .15);
558567
box-shadow: 0px 0px 10px 3px #1a1a1a inset;
559568
}
560569

‎index.html‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,30 +64,32 @@ <h3>
6464
<div id="list">
6565
</div>
6666
<div id="footer">
67-
<button id="scratch-paper"><i class="fa fa-code"></i> Scratch Paper</button>
68-
<button id="documentation"><i class="fa fa-book"></i> Tracer API</button>
69-
<button class="category" id="powered-by"><i class="fa fa-github"></i> Powered by ...</button>
67+
<button id="scratch-paper"><i class="fa fa-fw fa-code"></i> Scratch Paper</button>
68+
<button id="documentation"><i class="fa fa-fw fa-book"></i> Tracer API</button>
69+
<button class="category open" id="powered-by">
70+
<i class="fa fa-fw fa-github"></i> Powered by ...
71+
</button>
7072
<div id="powered-by-list">
7173
<a href="https://github.com/jquery/jquery">
72-
<button class="indent collapse">jquery/jquery</button>
74+
<button class="indent">jquery/jquery</button>
7375
</a>
7476
<a href="https://github.com/ajaxorg/ace">
75-
<button class="indent collapse">ajaxorg/ace</button>
77+
<button class="indent">ajaxorg/ace</button>
7678
</a>
7779
<a href="https://github.com/jacomyal/sigma.js">
78-
<button class="indent collapse">jacomyal/sigma.js</button>
80+
<button class="indent">jacomyal/sigma.js</button>
7981
</a>
8082
<a href="https://github.com/chartjs/Chart.js">
81-
<button class="indent collapse">chartjs/Chart.js</button>
83+
<button class="indent">chartjs/Chart.js</button>
8284
</a>
8385
<a href="https://github.com/showdownjs/showdown">
84-
<button class="indent collapse">showdownjs/showdown</button>
86+
<button class="indent">showdownjs/showdown</button>
8587
</a>
8688
<a href="https://github.com/FortAwesome/Font-Awesome">
87-
<button class="indent collapse">FortAwesome/Font-Awesome</button>
89+
<button class="indent">FortAwesome/Font-Awesome</button>
8890
</a>
8991
<a href="https://github.com/simonwhitaker/github-fork-ribbon-css">
90-
<button class="indent collapse">simonwhitaker/github-fork-ribbon-css</button>
92+
<button class="indent">simonwhitaker/github-fork-ribbon-css</button>
9193
</a>
9294
</div>
9395
</div>

‎js/dom/add_categories.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ const addCategoryToDOM = (category) => {
3737
$category.click(function () {
3838
const $self = $(this);
3939
$self.toggleClass('open');
40-
$self.next().toggleClass('collapse');
4140
$self.find('i.fa').toggleClass('fa-caret-right fa-caret-down');
41+
$self.next().toggle(300);
4242
});
4343

4444
const $algorithms = $('<div class="algorithms collapse">');

‎js/dom/setup/setup_side_menu.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ module.exports = () => {
3131
$('#btn_doc').click();
3232
});
3333

34-
$('#powered-by').click(() => {
35-
$('#powered-by-list button').toggleClass('collapse');
34+
$('#powered-by').click(function() {
35+
$(this).toggleClass('open')
36+
$('#powered-by-list').toggle(300);
3637
});
3738

3839
$('#scratch-paper').click(() => {
@@ -42,4 +43,4 @@ module.exports = () => {
4243
showAlgorithm(category, algorithm, data);
4344
});
4445
});
45-
};
46+
};

‎public/algorithm_visualizer.css‎

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ a {
160160

161161
.btn,
162162
button {
163+
cursor: pointer;
163164
vertical-align: top;
164165
border: none;
165166
height: 100%;
@@ -171,19 +172,31 @@ button {
171172
white-space: nowrap;
172173
overflow: hidden;
173174
text-overflow: ellipsis;
175+
background: rgb(63, 63, 63);
174176
}
175177

176178
.btn:hover,
177-
button:not([disabled]):hover {
178-
background: rgba(0, 0, 0, .15) !important;
179-
cursor: pointer;
179+
button:hover {
180+
background: rgba(0, 0, 0, .15);
180181
}
181182

182183
.btn.active,
183184
button.active {
184185
background: rgb(38, 38, 38);
185186
}
186187

188+
.btn.active:hover,
189+
button.active:hover {
190+
background: rgba(38, 38, 38);
191+
color: rgba(187, 187, 187, .8);
192+
}
193+
194+
button[disabled] {
195+
background: rgb(63, 63, 63);
196+
cursor: not-allowed;
197+
opacity: 0.6;
198+
}
199+
187200
.btn input,
188201
button input {
189202
outline: none;
@@ -262,22 +275,29 @@ nav h3 {
262275
width: 100%;
263276
height: 30px;
264277
text-align: left;
278+
background: rgba(0, 0, 0, .15);
265279
}
266280

267-
button.category {
268-
background: rgba(0, 0, 0, .10);
281+
.sidemenu button:hover {
282+
background: rgb(63, 63, 63);
269283
}
270284

271-
button.indent {
272-
padding-left: 28px;
285+
.sidemenu button.active {
286+
background: rgb(38, 38, 38);
273287
}
274288

275-
.algorithms {
276-
box-shadow: inset 0 2px 2px rgba(0, 0, 0, 0.36), inset 0 -2px 2px rgba(0, 0, 0, 0.24);
289+
.sidemenu button.active:hover {
290+
background: rgb(38, 38, 38);
291+
}
292+
293+
.sidemenu button.indent {
294+
padding-left: 28px;
277295
}
278296

279-
.algorithms.collapse {
297+
.sidemenu .algorithms {
280298
display: none;
299+
padding: 3px 2px;
300+
box-shadow: inset 0 2px 2px rgba(0, 0, 0, 0.48), inset 0 -2px 2px rgba(0, 0, 0, 0.36);
281301
}
282302

283303
.workspace {
@@ -405,10 +425,6 @@ section {
405425
width: 30px;
406426
}
407427

408-
.files_bar > button:disabled {
409-
background: rgba(0, 0, 0, .15);
410-
}
411-
412428
.files_bar .btn-left {
413429
left: 0;
414430
}
@@ -672,22 +688,15 @@ input[type=number]::-webkit-outer-spin-button {
672688
content: 'Resume'
673689
}
674690

675-
button[disabled] {
676-
cursor: not-allowed;
677-
opacity: 0.6;
678-
}
679-
680691
#btn_pause {
681692
width: 86px;
682693
}
683694

684695
.top-menu-buttons button.active {
685-
background: rgba(0, 0, 0, .15);
686696
box-shadow: 0px 0px 10px 3px #1a1a1a inset;
687697
}
688698

689699
.top-menu-buttons button:active {
690-
background: rgba(0, 0, 0, .15);
691700
box-shadow: 0px 0px 10px 3px #1a1a1a inset;
692701
}
693702

‎public/algorithm_visualizer.js‎

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

‎public/algorithm_visualizer.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)