Skip to content
Browse files

Merge branch 'gh-pages' of github.com:SUSE/hackweek into gh-pages

  • Loading branch information...
2 parents 8657f31 + dac261a commit 6f2068d89bc9a45c91f4b0330b0d95e176e97857 @digitaltom digitaltom committed Feb 28, 2013
Showing with 16 additions and 14 deletions.
  1. +7 −9 css/hackweek.css
  2. BIN images/cloud-pattern.png
  3. +3 −3 index.html
  4. +6 −2 js/hackweek.js
View
16 css/hackweek.css
@@ -127,7 +127,9 @@ li {
padding-left: 117px;
}
#what-is{
- background-color: #ff0000;
+ background-color: #ffffff;
+ background: url('../images/cloud-pattern.png');
+ background-repeat: repeat;
z-index: 10;
position: relative;
}
@@ -139,12 +141,6 @@ li {
z-index: 20;
position: relative;
}
-#projects .terminal-btn {
- color: #FFF;
-}
-#projects .terminal-dot {
- background-color: #FFF;
-}
.project-instructions{
background-color: #000000;
position: absolute;
@@ -233,15 +229,17 @@ li {
width: 100%;
height: 300px;
}
-.terminal-btn{
+#terminal-btn{
font-family: 'Cutive Mono', sans-serif;
- position: absolute;
+ position: fixed;
bottom: 20px;
right: 20px;
font-size: 13px;
font-weight: 100;
text-transform: uppercase;
cursor: pointer;
+ z-index: 100;
+ display: block;
}
.terminal-dot{
float: right;
View
BIN images/cloud-pattern.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
6 index.html
@@ -26,6 +26,9 @@
</li>
</div>
+<div id="terminal-btn">
+ Terminal Mode<div class="terminal-dot"></div>
+</div>
<div id="content">
<div id="terminal">
@@ -57,9 +60,6 @@
</div>
</div>
</div>
- <div class="terminal-btn">
- Terminal Mode<div class="terminal-dot"></div>
- </div>
</div>
<div id="agenda" class="page-size">
View
8 js/hackweek.js
@@ -36,7 +36,7 @@ $(function () {
}, 1000);
})
- $(".terminal-btn").click(function () {
+ $("#terminal-btn").click(function () {
toggle_terminal()
})
@@ -53,6 +53,7 @@ $(function () {
} else {
$('#terminal').slideDown('fast');
}
+ $('#wterm').find('div:last form input').focus()
}
$(window).scroll(function () {
@@ -107,7 +108,10 @@ $(function () {
// Setup terminal
- $('#wterm').wterm();
+ $('#wterm').wterm({
+ WELCOME_MESSAGE: "Welcome to Hackweek 9!",
+ PS1: "hackweek $"
+ });
});

0 comments on commit 6f2068d

Please sign in to comment.
Something went wrong with that request. Please try again.