Merge pull request #67 from shblythe/master

Fixed issue #48
hybridgroup · Apr 25, 2012 · 4336783 · 4336783
2 parents 833e265 + 5596db8
commit 4336783
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/public/css/master.css b/public/css/master.css
@@ -95,20 +95,19 @@ body.lesson-set section h1 {
 
 /* line 87, ../../sass/master.scss */
 #buttons {
-  position: relative;
+  position: absolute;
   float: right;
-  top: 93%;
-  width: 100%;
+  bottom: 2px;
+  width: 49%;
 }
 
 /* line 93, ../../sass/master.scss */
 #buttons button {
   background-color: red;
-  -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
-  -o-border-radius: 4px;
+  -moz-border-radius: 4px;
   -ms-border-radius: 4px;
-  -khtml-border-radius: 4px;
+  -o-border-radius: 4px;
   border-radius: 4px;
   background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ff3333), color-stop(100%, #ff0000));
   background: -webkit-linear-gradient(#ff3333, #ff0000);
@@ -203,11 +202,10 @@ iframe h1 {
 /* line 174, ../../sass/master.scss */
 #rubycode {
   width: 49%;
-  height: 94%;
   margin: 0;
   position: absolute;
   top: 0;
-  bottom: 0;
+  bottom: 48px;
   left: 0;
   right: 0;
   clear: both;

diff --git a/sass/master.scss b/sass/master.scss
@@ -85,10 +85,10 @@ body.lesson-set section h1 {
 }
 
 #buttons {
-  position: relative;
+  position: absolute;
   float: right;
-  top: 93%;
-  width: 100%;
+  bottom: 2px;
+  width: 49%;
 }
 #buttons button {
   background-color: red;
@@ -173,11 +173,10 @@ iframe h1 {
 
 #rubycode {
   width: 49%;
-  height: 94%;
   margin: 0;
   position: absolute;
   top: 0;
-  bottom: 0;
+  bottom: 48px;
   left: 0;
   right: 0;
   clear: both;