Skip to content

Commit

Permalink
Update new web view
Browse files Browse the repository at this point in the history
  • Loading branch information
sniok committed Jul 24, 2016
1 parent d59768f commit 33cbeb1
Show file tree
Hide file tree
Showing 3 changed files with 188 additions and 258 deletions.
26 changes: 8 additions & 18 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
<div class="container" id="menu">
<div class="row" id="options">
<div class="col s12">
<div class="card white">
<div class="card-content black-text">
<span class="card-title">Options<a class="btn-floating btn-medium waves-effect waves-light red navButton" id="optionsButton"><i class="material-icons">menu</i></a></span>
<ul class="collapsible" data-collapsible="accordion">
<li>
<div class="collapsible-header"><i class="material-icons">settings</i>Settings</div>
<div class="collapsible-body">
<ul id="optionsList">
<li>
Pan
Expand Down Expand Up @@ -59,23 +60,11 @@
</li>
</ul>
</div>
</div>
</li>
</ul>
</div>
</div>
<div class="row" id="trainer">
<div class="col s12">
<div class="card white">
<div class="card-content black-text">
<span class="card-title">Trainer<a class="btn-floating btn-medium waves-effect waves-light red navButton" id="trainerButton"><i class="material-icons">menu</i></a></span>
<ul id="trainerList">
<li><a class="waves-effect waves-light btn" id="tInfo">Info</a></li><br>
<li><a class="waves-effect waves-light btn" id="tItems">Items</a></li><br>
<li><a class="waves-effect waves-light btn" id="tPokemon">Pokemon</a></li><br>
<li><a class="waves-effect waves-light btn" id="tPokedex">Pokedex</a></li>
</ul>
</div>
</div>
</div>
<div class="row" id="trainers">
</div>
</div>

Expand All @@ -84,6 +73,7 @@
<div class="card white">
<div class="card-content black-text">
<span class="card-title" id="subtitle">Submenu</span>
<span id="close">×</span>
<div id="subcontent"></div>
</div>
</div>
Expand Down
66 changes: 53 additions & 13 deletions main.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,26 @@ html, body {
top: 10px;
z-index: 5;
height: auto;
width: auto;
width: 180px;
}
#submenu {
position: fixed;
left: 20px;
top: 30%;
max-height: 400px;
left: 50%;
top: 10px;
transform: translate(-50%, 0);
width: 50%;
z-index: 6;
display: none;
}
#close {
float: right;
font-size: 32px;
cursor: pointer;
line-height: 48px;
}
.items {
max-height: 350px !important;
overflow-y: scroll;
height: 80vh;
}
.item_img {
width: 75px;
Expand All @@ -39,18 +45,52 @@ html, body {
width: 96px;
height: auto;
}
.png_img_small {
width: 50px;
height: auto;
}
.navButton {
position: relative;
top: -30px;
right: -30px;
}
#optionsList {
display: none;
.row {
margin-bottom: 0;
}
#trainerList {
display: none;
.collapsible-body a {
width: 100%;
}
#toast-container {
top: auto !important;
right: auto !important;
bottom: 10%;
left:7%;
}
#bots-list {
overflow-y: scroll;
max-height: 80vh;
}
#bots-list::-webkit-scrollbar {
display: none;
}
.collapsible-body {
background: #FFF;
padding: 1em;
}
.card .card-content {
padding: 10px 20px 20px 20px;
}
.collapsible-title {
display: block;
min-height: 3rem;
line-height: 3rem;
padding: 0 1rem;
background-color: #fff;
border-bottom: 1px solid #ddd;
}

.collapsible-title i {
width: 2rem;
font-size: 1.6rem;
line-height: 3rem;
display: block;
float: left;
text-align: center;
margin-right: 1rem;
}

0 comments on commit 33cbeb1

Please sign in to comment.