Browse Source

Simplify layout and add bootstrap col classes

Jean-Baptiste (Rorist) Aubort 5 years ago
parent
commit
a989a50bde
2 changed files with 5 additions and 16 deletions
  1. 1 10
      style.css
  2. 4 6
      trigger.html

+ 1 - 10
style.css

@@ -42,14 +42,9 @@ p {
 #container {
     margin: auto;
     width: 800px;
-    
     min-height: 100%;
-    
     background-color: rgba(50, 50, 50, 0.8);
-}
-
-#wrapper {
-    padding: 50px 50px;
+    padding: 10px 25px;
 }
 
 /*
@@ -87,10 +82,6 @@ h3 {
     margin-bottom: 10px;
 }
 
-.central-block {
-	
-}
-
 .index {
     text-align: left;
 }

+ 4 - 6
trigger.html

@@ -10,11 +10,10 @@
   <link rel="shortcut icon" href="favicon.ico" />
 </head>
 <body onload="onPageLoad()">
-<div id="container">
-    <div id="wrapper">
+<div id="container" class="row">
     <h1>Hackerspace control</h1>
 
-    <div class='central-block'>
+    <div class="col-md-6">
         <h2>Status</h2>
 
         <div id="open-block">
@@ -47,10 +46,10 @@
         </div>
 
         <div id="msg-block"></div>
-
         <div id="loading-block"><p>Loading ...</p></div>
+    </div>
 
-        <br/>
+    <div class="col-md-6">
         <h2>Lights</h2>
         <input type="button" onclick="switchTheLightColor('red')" value="ON" class="button btn_red">
         <input type="button" onclick="switchTheLightColor('green')" value="ON" class="button btn_green">
@@ -68,7 +67,6 @@
             <span id="breathValue">0</span>
         </div>
     </div>
-    </div>
 </div>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>