Skip to content

Commit ddaf474

Browse files
committed
Various formatting changes and fixes
1 parent f1a11e7 commit ddaf474

File tree

4 files changed

+64
-15
lines changed

4 files changed

+64
-15
lines changed

_includes/demo.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ <h6 style="margin-bottom: 0px; margin-top: 18px">Input a tensor algebra expressi
5656
<th class="mdl-data-table__cell--non-numeric" style="min-width: 70px; vertical-align: middle; padding-left: 9px">
5757
<div align="center" style="position:relative"><big>Tensor</big></div></th>
5858
<th class="mdl-data-table__cell--non-numeric" style="width: 100%; padding-left: 0px; vertical-align: middle; text-align: left">
59-
<big>
59+
<big id="formatHeading">
6060
Format
6161
</big>
62-
<big id="levelHeading" style="padding-left: 158px">
62+
<big class="optional-header" style="padding-left: 93px">
6363
(Level Formats)
6464
</big>
6565
<big>
@@ -132,7 +132,7 @@ <h6 style="margin-bottom: 0px; margin-top: 18px">Input a tensor algebra expressi
132132
<th class="mdl-data-table__cell--non-numeric"></th>
133133
<th class="mdl-data-table__cell--non-numeric" style="padding-left: 0px; padding-right: 8px; vertical-align: middle; text-align: left">
134134
<big>
135-
Scheduling Commands
135+
Scheduling Command
136136
</big>
137137
<big>
138138
<button class="help-btn mdl-button mdl-js-button mdl-button--icon">
@@ -141,6 +141,9 @@ <h6 style="margin-bottom: 0px; margin-top: 18px">Input a tensor algebra expressi
141141
</a>
142142
</button>
143143
</big>
144+
<big class="optional-header" style="padding-left: 26px">
145+
Arguments
146+
</big>
144147
</th>
145148
</tr>
146149
</thead>

assets/css/app.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
---
3+
$primary: #FFD150;
4+
5+
html {
6+
-webkit-text-size-adjust: none;
7+
}
8+
9+
// Import Main CSS file from theme
10+
@import "main";

javascripts/demo.js

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ function demo() {
425425
listTensorsBody += "style=\"padding: 0px; vertical-align: middle\">";
426426

427427
listTensorsBody += "<div class=\"format-selector\">";
428-
listTensorsBody += "<div class=\"dropdown\" style=\"margin-top: 6px; margin-bottom: 6px\">";
428+
listTensorsBody += "<div class=\"dropdown format-dropdown\" style=\"margin-top: 6px; margin-bottom: 6px\">";
429429
listTensorsBody += "<div class=\"dropdown-trigger\">";
430430
listTensorsBody += "<button class=\"button has-text-spaced\" style=\"width: 190px\" ";
431431
listTensorsBody += "aria-haspopup=\"true\" aria-controls=\"dropdown-menu\">";
@@ -465,7 +465,7 @@ function demo() {
465465
listTensorsBody += "<label class=\"label\" style=\"cursor: move; margin-bottom: 0px\">";
466466
listTensorsBody += "<small>Dimension ";
467467
listTensorsBody += (dim + 1)
468-
listTensorsBody += "</small></label><div class=\"dropdown\" data-val=\"";
468+
listTensorsBody += "</small></label><div class=\"dropdown format-dropdown\" data-val=\"";
469469
listTensorsBody += level;
470470
listTensorsBody += "\" id=\"";
471471
listTensorsBody += selectId;
@@ -485,14 +485,14 @@ function demo() {
485485
listTensorsBody += "<a data-val=\"d\" class=\"dropdown-item\">Dense</a>";
486486
listTensorsBody += "<hr class=\"dropdown-divider\">";
487487
listTensorsBody += "<a data-val=\"s\" class=\"dropdown-item\">";
488-
listTensorsBody += "Compressed (w/ Unique Elements)</a>";
488+
listTensorsBody += "<div>Compressed</div><div>(w/ Unique Elements)</div></a>";
489489
listTensorsBody += "<a data-val=\"u\" class=\"dropdown-item\">";
490-
listTensorsBody += "Compressed (w/ Duplicate Elements)</a>";
490+
listTensorsBody += "<div>Compressed</div><div>(w/ Duplicate Elements)</div></a>";
491491
listTensorsBody += "<hr class=\"dropdown-divider\">";
492492
listTensorsBody += "<a data-val=\"q\" class=\"dropdown-item\">";
493-
listTensorsBody += "Singleton (w/ Unique Elements)</a>";
493+
listTensorsBody += "<div>Singleton</div><div>(w/ Unique Elements)</div></a>";
494494
listTensorsBody += "<a data-val=\"c\" class=\"dropdown-item\">";
495-
listTensorsBody += "Singleton (w/ Duplicate Elements)</a>";
495+
listTensorsBody += "<div>Singleton</div><div>(w/ Duplicate Elements)</div></a>";
496496
listTensorsBody += "</div></div></div></div></li>";
497497
}
498498

@@ -588,12 +588,12 @@ function demo() {
588588
dropdown.removeClass('is-active');
589589
});
590590

591-
$(".dropdown .button").click(function() {
591+
$(".format-dropdown .button").click(function() {
592592
var dropdown = $(this).parents('.dropdown');
593593
dropdown.toggleClass('is-active');
594594
});
595595

596-
$(".dropdown .button").each(function() {
596+
$(".format-dropdown .button").each(function() {
597597
var dropdown = $(this).parents('.dropdown');
598598
document.addEventListener("click", function(ev) {
599599
if (!dropdown[0].contains(ev.target)) {
@@ -1202,14 +1202,26 @@ function demo() {
12021202
for (var e in examples) {
12031203
listExamplesBody += "<li id=\"example_";
12041204
listExamplesBody += e;
1205-
listExamplesBody += "\" class=\"mdl-menu__item\">";
1205+
listExamplesBody += "\" class=\"mdl-menu__item\"><div class=\"short-name\">";
1206+
listExamplesBody += examples[e].name;
1207+
listExamplesBody += "</div><div class=\"long-name\">";
12061208
listExamplesBody += examples[e].name;
12071209
listExamplesBody += ":&nbsp; <code style=\"background-color: transparent\">";
12081210
listExamplesBody += examples[e].code;
1209-
listExamplesBody += "</code></li>";
1211+
listExamplesBody += "</code></div></li>";
12101212
}
12111213
$("#listExamples").html(listExamplesBody);
12121214

1215+
$("#btnExamples").click(function() {
1216+
if ($(window).width() > 480) {
1217+
$("#listExamples .long-name").css("display", "block");
1218+
$("#listExamples .short-name").css("display", "none");
1219+
} else {
1220+
$("#listExamples .long-name").css("display", "none");
1221+
$("#listExamples .short-name").css("display", "block");
1222+
}
1223+
});
1224+
12131225
var getURLParam = function(k) {
12141226
var url = window.location.search.substring(1);
12151227
var params = url.split('&');

stylesheets/style.css

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,22 @@ h1, h2, h3, h4, h5, h6 {
9292
padding-right: 28px;
9393
}
9494

95-
#levelHeading {
95+
.format-selector .dropdown-menu {
96+
min-width: 190px;
97+
}
98+
99+
.schedule-dropdown .dropdown-menu {
100+
min-width: 200px;
101+
}
102+
103+
.optional-header {
96104
display: inline;
97105
}
98106

107+
#formatHeading {
108+
padding-left: 65px;
109+
}
110+
99111
@media (max-width: 580px) {
100112
.format-selector {
101113
flex-wrap: wrap;
@@ -109,9 +121,13 @@ h1, h2, h3, h4, h5, h6 {
109121
padding-right: 50px;
110122
}
111123

112-
#levelHeading {
124+
.optional-header {
113125
display: none;
114126
}
127+
128+
#formatHeading {
129+
padding-left: 55px;
130+
}
115131
}
116132

117133
@media (max-width: 480px) {
@@ -215,3 +231,11 @@ h1, h2, h3, h4, h5, h6 {
215231
width: 100%;
216232
}
217233
}
234+
235+
.level-formats .dropdown-item {
236+
padding-right: 16px;
237+
}
238+
239+
#listExamples .long-name {
240+
display: none;
241+
}

0 commit comments

Comments
 (0)