Skip to content
Browse files

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

  • Loading branch information...
2 parents 3959a69 + 860419c commit 1aba7122695e2abae0006581bd34ada93e4e859d @digitaltom digitaltom committed Feb 28, 2013
Showing with 52 additions and 3 deletions.
  1. +9 −0 css/hackweek.css
  2. +38 −2 css/wterm.css
  3. BIN images/what-is-hackweek.png
  4. +5 −1 index.html
View
9 css/hackweek.css
@@ -136,6 +136,15 @@ li {
z-index: 10;
position: relative;
}
+#what-is-content {
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ width: 1193px;
+ height: 732px;
+ margin-left: -597px;
+ margin-top: -366px;
+}
#projects{
background-color: #000;
background: url('../images/projects-thumbs.jpg');
View
40 css/wterm.css
@@ -1,5 +1,16 @@
/* Basic Terminal CSS */
-.wterm_terminal { background: #000; color: #fff; font-size: 1em; font-family: monospace; padding: 10px 10px 0px; display: block; overflow-x: none; overflow-y: auto; margin-left: auto; margin-right: auto; }
+.wterm_terminal {
+ background: #000;
+ color: #fff;
+ font-size: 1em;
+ font-family: monospace;
+ padding: 10px 10px 0px;
+ display: block;
+ overflow-x: none;
+ overflow-y: auto;
+ margin-left: auto;
+ margin-right: auto;
+ box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.7);}
/* TODO: Input Box Width is faulty */
.wterm_terminal input { background: transparent; border: 0; color: #fff; width: 100%; font-size: 1em; font-family: monospace; outline: none; }
@@ -18,4 +29,29 @@
width: 100%;
}
-#terminal-bottom-bar { padding: 4px 10px; height:20px; width: 80%; background: #4b4a4a; display: block; overflow-x: none; overflow-y: auto; margin-left: auto; margin-right: auto; border-radius: 0px 0px 4px 4px; box-shadow: 3 3px 10px rgba(0, 0, 0, 0.5); }
+#terminal-bottom-bar {
+ padding: 4px 10px;
+ height:20px;
+ width: 80%;
+ background: #4b4a4a;
+ display: block;
+ overflow-x: none;
+ overflow-y: auto;
+ margin-left: auto;
+ margin-right: auto;
+ border-radius: 0px 0px 4px 4px;
+ box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.7);
+}
+#terminal-bottom-tabbar {
+ padding: 4px 10px;
+ height: 4px;
+ width: 80%;
+ background: #4b4a4a;
+ display: block;
+ overflow-x: none;
+ overflow-y: auto;
+ margin-left: auto;
+ margin-right: auto;
+ box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.7);
+ border-bottom: 1px solid #212121;
+}
View
BIN images/what-is-hackweek.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
@@ -36,6 +36,8 @@
<div id="terminal">
<div id="wterm">
</div>
+ <div id="terminal-bottom-tabbar">
+ </div>
<div id="terminal-bottom-bar">
</div>
</div>
@@ -53,7 +55,9 @@
</div>
<div id="what-is" class="page-size">
-
+ <div id="what-is-content">
+ <img src="images/what-is-hackweek.png">
+ </div>
</div>
<div id="projects" class="page-size">
<div class="project-instructions">

0 comments on commit 1aba712

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