Skip to content

Commit

Permalink
Merge pull request #30 from arc12012/Client
Browse files Browse the repository at this point in the history
Client
  • Loading branch information
clj13001 committed Mar 24, 2017
2 parents c725b69 + 4c816e1 commit 08176ab
Show file tree
Hide file tree
Showing 15 changed files with 1,261 additions and 1,359 deletions.
193 changes: 100 additions & 93 deletions WebContent/html/css/stylesheet.css
Original file line number Diff line number Diff line change
@@ -1,93 +1,100 @@
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]{
margin: 0 auto;
width: 60%;
}

select{
margin:0 auto;
width: 65%;
align-self: center;
float: center;
}


span.close{
color: #aaa;
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;
}
3 changes: 2 additions & 1 deletion WebContent/html/javascript/navbar.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 08176ab

Please sign in to comment.