Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Remove div.table tag in HTML Viewer. #139

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ bento:before {
.editor .file-window {
padding: 10px 10px 10px 46px;
position: relative;
min-height: 432px;
min-height: 335px;
}

.editor .css-view {
Expand Down Expand Up @@ -1192,7 +1192,7 @@ plate orange:nth-last-child(4)
width: 30px;
display: inline-block;
opacity: .25;
transition: opacity .2s .ease-out;
transition: opacity .2s ease-out;
}

.level-nav a:hover {
Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ <h4>Exhibit 1 - A CSS Rule</h4>
</div>
<div class="file-window css-view">
<div class="line-numbers">
1<br/>2<br/>3<br/>4<br/>5<br/>6<br/>7<br/>8<br/>9<br/>10<br/>11<br/>12<br/>13<br/>14<br/>15<br/>16<br/>17<br/>18<br/>19<br/>20
1<br/>2<br/>3<br/>4<br/>5<br/>6<br/>7<br/>8<br/>9<br/>10<br/>11<br/>12<br/>13<br/>14<br/>15
</div>
<input class="input-strobe" type="text" placeholder="Type in a CSS selector"/><span class="plus">+</span><div class="enter-button">enter</div>
<div>
Expand All @@ -112,7 +112,7 @@ <h4>Exhibit 1 - A CSS Rule</h4>
HTML Viewer
</div>
<div class="file-window">
<div class="line-numbers">1<br/>2<br/>3<br/>4<br/>5<br/>6<br/>7<br/>8<br/>9<br/>10<br/>11<br/>12<br/>13<br/>14<br/>15<br/>16<br/>17<br/>18<br/>19<br/>20</div>
<div class="line-numbers">1<br/>2<br/>3<br/>4<br/>5<br/>6<br/>7<br/>8<br/>9<br/>10<br/>11<br/>12<br/>13<br/>14<br/>15</div>
<div class="markup"></div>
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions js/restaurant.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ $(document).ready(function(){
});

//Shows the tooltip on the table
$(".markup").on("mouseover","div *",function(e){
$(".markup").on("mouseover","*",function(e){
el = $(this);
var markupElements = $(".markup *");
var index = markupElements.index(el) -1;
var index = markupElements.index(el);
showTooltip($(".table *").eq(index));
e.stopPropagation();
});
Expand Down Expand Up @@ -254,7 +254,7 @@ function showTooltip(el){
var tableElements = $(".table *");
var index = tableElements.index(el);
var that = el;
$(".markup > div *").eq(index).addClass("enhance").find("*").addClass("enhance");
$(".markup *").eq(index).addClass("enhance").find("*").addClass("enhance");

var helper = $(".helper");

Expand Down Expand Up @@ -547,7 +547,7 @@ function getMarkup(el){
$(el.children).each(function(i,el){
wrapperEl.append(getMarkup(el));
});
wrapperEl.append("&lt;" + elName + "/&gt;");
wrapperEl.append("&lt;/" + elName + "&gt;");
} else {
wrapperEl.text("<" + elName + attributeSpace + attributeString + "/>");
}
Expand Down Expand Up @@ -578,7 +578,7 @@ function loadBoard(){
$(".table *").addClass("pop");


$(".markup").html('<div>&ltdiv class="table"&gt' + markupHolder.html() + '&lt/div&gt</div>');
$(".markup").html(markupHolder.html());
}

// Adds nametags to the items on the table
Expand Down