Merge pull request #28 from arc12012/John's-Branch

John's branch
arc12012 · Feb 24, 2017 · f4ec3d2 · f4ec3d2
2 parents e8c597f + fb681c7
commit f4ec3d2
Show file tree

Hide file tree

Showing 23 changed files with 2,588 additions and 2,481 deletions.
diff --git a/WebContent/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css
@@ -1,93 +1,93 @@
-body{
-	background-color: #94969A;
-	padding-top: 50px;
-	height: 100vh;
-    overflow-x: hidden;
-}
-
-a.divlink{
-	color: black;
-}
-
-div.sidebar{
-    display: inline-block; 
-    border-right-style: solid; 
-    height: 100vh;
-    background-color: #E9EAEB;
-    width: 300px;
-    position: fixed;
-}
-
-div.displayDevice{
-    display: inline-block; 
-    position: absolute; 
-    padding-left: 30px;
-    width: 100%;
-    height: 100%;
-    overflow: scroll;
-    left: 300px;
-}
-
-div.profileContainer{
-    display: inline-block; 
-    position: absolute; 
-    padding-left: 30px;
-    width: 100%;
-    height: 100%;
-    overflow: scroll;
-    left: 200px;
-    top: 70px;
-}
-
-div.modal{
-    display:none;
-    position: fixed;
-    z-index: 1;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    overflow: auto;
-    background-color: rgb(0,0,0);
-    background-color: rgba(0,0,0,0.4);
-}
-
-div.modal-content{
-    position: relative;
-    background-color: #fefefe;
-    margin: 5% auto;
-    padding: 10px;
-    border: 1px solid #888;
-    width: 80%;
-    max-height: 80%; 
-    text-align: center;
-    vertical-align: center;
-    align-items: center;
-}
-
-div.modal-body{
-    padding: 10px;
-    overflow: auto;
-}
-
-input[type=text]{
-    width: 60%;
-}
-
-
-span.close{
-    color: black;
-    float: right;
-    font-size: 28px;
-    font-weight: bold;
-}
-span.close:hover,
-span.close:focus{
-    color: black;
-    text-decoration: none;
-    cursor: pointer;
-}
-ul.nav{
-    padding: 0px;
-}
-
+body{
+	background-color: #94969A;
+	padding-top: 50px;
+	height: 100vh;
+    overflow-x: hidden;
+}
+
+a.divlink{
+	color: black;
+}
+
+div.sidebar{
+    display: inline-block; 
+    border-right-style: solid; 
+    height: 100vh;
+    background-color: #E9EAEB;
+    width: 300px;
+    position: fixed;
+}
+
+div.displayDevice{
+    display: inline-block; 
+    position: absolute; 
+    padding-left: 30px;
+    width: 100%;
+    height: 100%;
+    overflow: scroll;
+    left: 300px;
+}
+
+div.profileContainer{
+    display: inline-block; 
+    position: absolute; 
+    padding-left: 30px;
+    width: 100%;
+    height: 100%;
+    overflow: scroll;
+    left: 200px;
+    top: 70px;
+}
+
+div.modal{
+    display:none;
+    position: fixed;
+    z-index: 1;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    background-color: rgb(0,0,0);
+    background-color: rgba(0,0,0,0.4);
+}
+
+div.modal-content{
+    position: relative;
+    background-color: #fefefe;
+    margin: 5% auto;
+    padding: 10px;
+    border: 1px solid #888;
+    width: 80%;
+    max-height: 80%; 
+    text-align: center;
+    vertical-align: center;
+    align-items: center;
+}
+
+div.modal-body{
+    padding: 10px;
+    overflow: auto;
+}
+
+input[type=text]{
+    width: 60%;
+}
+
+
+span.close{
+    color: black;
+    float: right;
+    font-size: 28px;
+    font-weight: bold;
+}
+span.close:hover,
+span.close:focus{
+    color: black;
+    text-decoration: none;
+    cursor: pointer;
+}
+ul.nav{
+    padding: 0px;
+}
+