Skip to content
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.

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

🐢 #55

Merged
merged 6 commits into from Sep 3, 2015
Merged

🐢 #55

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
69 changes: 58 additions & 11 deletions assets/css/style.css
Expand Up @@ -91,6 +91,7 @@ li {
}

.sidebar {
overflow: auto;
width: 25%;
position: fixed;
height: 100%;
Expand Down Expand Up @@ -296,6 +297,7 @@ a:hover {
}

code, .outof {
font-size: 0.9em;
border: 1px solid #9DA6B3;
padding: 4px 6px;
border-radius: 2px;
Expand Down Expand Up @@ -329,11 +331,36 @@ footer ul li {
font-style: italic;
}

#git-tips, .didnt-pass {
background: #BADFFF;
#git-tips,
.didnt-pass {
border: 1px solid #BADFFF;
padding: 18px;
margin: 18px 0;
color: #0087ff;
margin: 18px 0 36px;
}

.didnt-pass {
border-color: #999;
}

#git-tips h2 {
color: #08f;
}

#git-tips h2,
.didnt-pass h2 {
margin: -32px -8px 0;
float: left;
background: #fff;
padding: 0 8px;
}

#git-tips h2 + p {
margin-top: 0;
}

#git-tips p:last-child,
.didnt-pass p:last-child {
margin-bottom: 0;
}

#git-tips ul {
Expand All @@ -347,7 +374,7 @@ footer ul li {
}

#git-tips li {
margin-top: 12px;
margin-top: 0px;
}

.challenge, .verify {
Expand All @@ -366,17 +393,19 @@ footer ul li {
margin-bottom: 30px;
}

#git-tips h2,
#git-tips h4,
.didnt-pass h2,
.didnt-pass h4,
.challenge h2,
.verify h3 {
margin-top: 0;
}

.didnt-pass {
background: #E3EEF8;
.didnt-pass h4 {
margin: 10px 0 0;
}

.didnt-pass h4:before {
content: '⚠️ ';
font-weight: normal;
}

.didnt-pass p + h4 {
Expand Down Expand Up @@ -428,7 +457,12 @@ n, v, adj {

/* new stuff */

#directory-path span {
#directory-path:empty {
display: none;
}

#path-required-warning,
#directory-path {
font-family: Liberation Mono, Monaco, Courier New, monospace;
padding: 6px 12px 6px 10px;
vertical-align: middle;
Expand All @@ -443,6 +477,19 @@ n, v, adj {
margin-left: -3px;
}

#path-required-warning {
display: none;
color: #ff0;
}

#path-required-warning.show {
display: inline;
}

#path-required-warning.show + #directory-path {
display: none;
}

.verify-fail:before {
content: '😞 ';
}
Expand Down
12 changes: 0 additions & 12 deletions challenge-content-zhtw/10_requesting_you_pull_please.html
Expand Up @@ -38,15 +38,3 @@ <h2>步驟:建立 <n>Pull Requests</n></h2>
<p>如果 <n>Pull Request</n> 沒有問題的話,很快就會被自動 <v>merged</v> 了哦。若沒有很快的被自動 <v>merged</v> 的話,Reporobot 會留言告訴你,為什麼不能 <v>merge</v>。如果是這樣子呢,先 <v>close</v> GitHub 上面的 <n>Pull Request</n>,在你的 <n>branch</n> 做適當的修改,再次 <v>push</v> 這些修改並重新發送 <n>Pull Request</n> 哦。</p>

{{{verify_button}}}

<script>
var verifyChallenge = require('../lib/verify/requesting_you_pull_please.js')

var verifyButton = document.getElementById('verify-challenge')
var ul = document.getElementById('verify-list')

verifyButton.addEventListener('click', function clicked (event) {
ul.innerHTML = ''
verifyChallenge()
})
</script>
34 changes: 0 additions & 34 deletions challenge-content-zhtw/11_merge_tada.html
Expand Up @@ -49,37 +49,3 @@ <h2>撇步</h2>
<code>$ git pull &#60;REMOTENAME&#62; &#60;BRANCHNAME&#62;</code>
</ul>
</div>

<script>
var ipc = require('ipc')

var verifyChallenge = require('../lib/verify/merge_tada.js')

var directoryPath = ''

var verifyButton = document.getElementById('verify-challenge')
var directoryButton = document.getElementById('select-directory')
var ul = document.getElementById('verify-list')

directoryButton.addEventListener('click', function clickedDir (event) {
ipc.send('open-file-dialog')
})

ipc.on('selected-directory', function(path) {
// TODO style and trim this
directoryPath = path
document.getElementById('directory-path').innerHTML = '<span>' + path + '</span>'

})

verifyButton.addEventListener('click', function clicked (event) {
if (directoryPath === '') {
var message = '<span>Please select your repository directory.</span>'

document.getElementById('directory-path').innerHTML = message
} else {
ul.innerHTML = ''
verifyChallenge(directoryPath[0])
}
})
</script>
12 changes: 0 additions & 12 deletions challenge-content-zhtw/1_get_git.html
Expand Up @@ -50,15 +50,3 @@ <h2>步驟:設定 Git</h2>
<h2>撇步</h2>
<p>這個金錢符號 <code>$</code> 會常常出現在程式的文件中,錢號代表這個指令是<strong>終端機</strong>的指令(參考上面的指令寫法)。在輸入指令的時候是不需要輸入 <code>$</code> 的,只需要輸入它後面的指令即可。例如如果你要輸入最後面「確認完成步驟的指令」,只要在終端機輸入 <code>git-it verify</code> 就好了。</p>
</div>

<script>
var verifyChallenge = require('../lib/verify/get_git.js')

var verifyButton = document.getElementById('verify-challenge')
var ul = document.getElementById('verify-list')

verifyButton.addEventListener('click', function clicked (event) {
ul.innerHTML = ''
verifyChallenge()
})
</script>
34 changes: 0 additions & 34 deletions challenge-content-zhtw/2_repository.html
Expand Up @@ -52,37 +52,3 @@ <h2>撇步</h2>
<code>$ git init</code>
</ul>
</div>

<script>
var ipc = require('ipc')

var verifyChallenge = require('../lib/verify/repository.js')

var directoryPath = ''

var verifyButton = document.getElementById('verify-challenge')
var directoryButton = document.getElementById('select-directory')
var ul = document.getElementById('verify-list')

directoryButton.addEventListener('click', function clickedDir (event) {
ipc.send('open-file-dialog')
})

ipc.on('selected-directory', function(path) {
// TODO style and trim this
directoryPath = path
document.getElementById('directory-path').innerHTML = '<span>' + path + '</span>'

})

verifyButton.addEventListener('click', function clicked (event) {
if (directoryPath === '') {
var message = '<span>Please select your repository directory.</span>'

document.getElementById('directory-path').innerHTML = message
} else {
ul.innerHTML = ''
verifyChallenge(directoryPath[0])
}
})
</script>
35 changes: 0 additions & 35 deletions challenge-content-zhtw/3_commit_to_it.html
Expand Up @@ -49,38 +49,3 @@ <h2>撇步</h2>
<li><code>$ git commit -m "&#60;your commit message&#62;"</code></li>
<ul>
</div>


<script>
var ipc = require('ipc')

var verifyChallenge = require('../lib/verify/commit_to_it.js')

var directoryPath = ''

var verifyButton = document.getElementById('verify-challenge')
var directoryButton = document.getElementById('select-directory')
var ul = document.getElementById('verify-list')

directoryButton.addEventListener('click', function clickedDir (event) {
ipc.send('open-file-dialog')
})

ipc.on('selected-directory', function(path) {
// TODO style and trim this
directoryPath = path
document.getElementById('directory-path').innerHTML = '<span>' + path + '</span>'

})

verifyButton.addEventListener('click', function clicked (event) {
if (directoryPath === '') {
var message = '<span>Please select your repository directory.</span>'

document.getElementById('directory-path').innerHTML = message
} else {
ul.innerHTML = ''
verifyChallenge(directoryPath[0])
}
})
</script>
11 changes: 0 additions & 11 deletions challenge-content-zhtw/4_githubbin.html
Expand Up @@ -33,14 +33,3 @@ <h4>GitHub & Git config usernames do not match</h4>
<p><code>$ git config --global user.username &#60;USerNamE&#62;</code></p>
<p>更新完之後,再檢查一次看看吧!</p>
</div>
<script>
var verifyChallenge = require('../lib/verify/githubbin.js')

var verifyButton = document.getElementById('verify-challenge')
var ul = document.getElementById('verify-list')

verifyButton.addEventListener('click', function clicked (event) {
ul.innerHTML = ''
verifyChallenge()
})
</script>
34 changes: 0 additions & 34 deletions challenge-content-zhtw/5_remote_control.html
Expand Up @@ -82,37 +82,3 @@ <h2>撇步</h2>
<code>$ git push &#60;REMOTENAME&#62; <BRANCH></code>
</ul>
</div>

<script>
var ipc = require('ipc')

var verifyChallenge = require('../lib/verify/remote_control.js')

var directoryPath = ''

var verifyButton = document.getElementById('verify-challenge')
var directoryButton = document.getElementById('select-directory')
var ul = document.getElementById('verify-list')

directoryButton.addEventListener('click', function clickedDir (event) {
ipc.send('open-file-dialog')
})

ipc.on('selected-directory', function(path) {
// TODO style and trim this
directoryPath = path
document.getElementById('directory-path').innerHTML = '<span>' + path + '</span>'

})

verifyButton.addEventListener('click', function clicked (event) {
if (directoryPath === '') {
var message = '<span>Please select your repository directory.</span>'

document.getElementById('directory-path').innerHTML = message
} else {
ul.innerHTML = ''
verifyChallenge(directoryPath[0])
}
})
</script>
34 changes: 0 additions & 34 deletions challenge-content-zhtw/6_forks_and_clones.html
Expand Up @@ -50,37 +50,3 @@ <h2>撇步</h2>
<li><code>$ git remote -v</code></li>
</ul>
</div>

<script>
var ipc = require('ipc')

var verifyChallenge = require('../lib/verify/forks_and_clones.js')

var directoryPath = ''

var verifyButton = document.getElementById('verify-challenge')
var directoryButton = document.getElementById('select-directory')
var ul = document.getElementById('verify-list')

directoryButton.addEventListener('click', function clickedDir (event) {
ipc.send('open-file-dialog')
})

ipc.on('selected-directory', function(path) {
// TODO style and trim this
directoryPath = path
document.getElementById('directory-path').innerHTML = '<span>' + path + '</span>'

})

verifyButton.addEventListener('click', function clicked (event) {
if (directoryPath === '') {
var message = '<span>Please select your repository directory.</span>'

document.getElementById('directory-path').innerHTML = message
} else {
ul.innerHTML = ''
verifyChallenge(directoryPath[0])
}
})
</script>