Skip to content

Zen mode with remote for presentation #57

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Zen mode with remote for presentation #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 34 additions & 6 deletions css/explaingit.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ span.cmd {
top: 0; bottom: 0; right: 0; left: 0;
}

#ExplainGitZenRemote-Container .id-label{
font-size: 15px;
}

#ExplainGitZen-Container .svg-container {
display: inline-block;
border: 1px dotted #AAA;
Expand All @@ -77,15 +81,39 @@ span.cmd {
margin-left: 0;
}

#ExplainGitZen-Container .svg-container.remote-container {
#ExplainGitZen-Container .playground-container {
position: absolute;
top: 0; bottom: 20px; right: 20px; left: 20px;
}

#ExplainGitZenRemote-Container {
position: absolute;
top: 0; bottom: 0; right: 0; left: 0;
}

#ExplainGitZenRemote-Container .id-label{
font-size: 12px;
}

#ExplainGitZenRemote-Container .svg-container {
display: inline-block;
border: 1px dotted #AAA;
position: absolute;
top: 0; bottom: 40%; right: 0; left: 250px;
margin-left: 0;
}

#ExplainGitZenRemote-Container .svg-container.remote-container {
display: inline-block;
border: 1px dotted #AAA;
position: absolute;
top: 0px; right: 0px; left: auto; bottom: auto;
top: 60%; bottom: 0; right: 0; left: 250px;
margin-left: 0;
background-color: #EFF1FF;
border-left: 1px dotted #AAA;
border-bottom: 1px dotted #AAA;
overflow: auto;
}

#ExplainGitZen-Container .playground-container {
#ExplainGitZenRemote-Container .playground-container {
position: absolute;
top: 0; bottom: 20px; right: 20px; left: 20px;
}
Expand Down Expand Up @@ -122,7 +150,7 @@ span.cmd {
.control-box .log,
.control-box input[type="text"] {
font-family: Courier New;
font-size: 14px;
font-size: 15px;
}

.control-box .log .command-entry {
Expand Down
32 changes: 30 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ <h2>Specific Examples</h2>
<div class="twocol last">
<a id="open-freeplay" class="openswitch" href="#freeplay">Free Playground</a>
<a id="open-zen" class="openswitch" href="#zen">Zen Mode</a>
<a id="open-zen-remote" class="openswitch" href="#zenremote">Zen Mode with remote</a>
</div>
</div>
</div>
Expand All @@ -286,6 +287,10 @@ <h2>Specific Examples</h2>
<div class="playground-container"></div>
</div>

<div id="ExplainGitZenRemote-Container" style="display:none">
<div class="playground-container"></div>
</div>

<svg version="1.1" baseProfile="full"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
Expand Down Expand Up @@ -519,7 +524,7 @@ <h2>Specific Examples</h2>
initialMessage:
'Have fun.'
}
};
};

window.addEventListener('hashchange', open, false);
window.addEventListener('load', open, false);
Expand Down Expand Up @@ -547,11 +552,34 @@ <h2>Specific Examples</h2>
name: 'Zen',
height: '100%',
commitData: [
{id: 'e137e9b', tags: ['master'], message: 'first commit'}
{id: 'e137e9b', tags: ['master'], message: 'initial commit'}
],
initialMessage:
'Have fun.'
});
} else if (hash === 'zenremote') {
var elements = document.getElementsByClassName('row');
for(var i = 0; i != elements.length; ++i)
{
elements[i].style.display = 'none';
}
document.getElementById('fork-me').style.display = 'none';

explainGit.reset();

explainGit.open({
name: 'ZenRemote',
height: '100%',
commitData: [
{id: 'e137e9b', tags: ['origin/master', 'master'], message: 'initial commit'}
],
commitRadius: 15,
originData: [
{id: 'e137e9b', tags: ['master'], message: 'initial commit'}
],
initialMessage:
'Formation Git'
});
}
}
});
Expand Down
4 changes: 2 additions & 2 deletions js/explaingit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ define(['historyview', 'controlbox', 'd3'], function (HistoryView, ControlBox, d
if (args.originData) {
originView = new HistoryView({
name: name + '-Origin',
width: 300,
height: 225,
width: 275,
height: 300,
commitRadius: 15,
remoteName: 'origin',
commitData: args.originData
Expand Down