Skip to content

Commit

Permalink
Merge pull request #71 from TheVindicators/menubar-fix
Browse files Browse the repository at this point in the history 
Menubar Lock and Model Reset
  • Loading branch information
@Proplex
Proplex authored Nov 21, 2017
2 parents 4f2f9ea + 6469d46 commit 2a74793
Show file tree
Hide file tree
Showing 12 changed files with 361 additions and 410 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Our program is an extension of the three.js development evironment modified to a

### For Users

If you're interested in trying out Vis yourself, please visit http://vis.ipwnage.com. From there, you'll be able to upload models, add antennas, and modify wireframe status easily.
If you're interested in trying out Vis yourself, please visit our landing page at https://thevindicators.github.io/Vis/ for information regarding our project. You can also head directly over to the application at http://vis.ipwnage.com. From there, you'll be able to upload models, add antennas, and modify wireframe status easily.

### For Developers

Expand Down
150 changes: 110 additions & 40 deletions app/static/css/dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,46 +109,116 @@ select {
padding: 8px;
}

#menubar .menu .options {
position: fixed;
display: none;
padding: 5px 0;
background: #111;
width: 150px;
max-height: calc(100% - 80px);
overflow: auto;
}

#menubar .menu:hover .options {
display: block;
}

#menubar .menu .options hr {
border-color: #222;
}

#menubar .menu .options .option {
color: #888;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#menubar .menu .options .option:hover {
color: #fff;
background-color: #08f;
}

#menubar .menu .options .option:active {
background: transparent;
}

#menubar .menu .options .inactive {
color: #444;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}
#menubar .menu .options {
position: absolute;
display: none;
padding: 5px 0;
background: #eee;
width: 150px;
}

#menubar .menu:hover .options {
display: block;
}

#menubar .menu .options hr {
border-color: #ddd;
}

#menubar .menu .options .option {
color: #666;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#menubar .menu .options .option:hover {
color: #fff;
background-color: #08f;
}

#menubar .menu .options .option:active {
color: #666;
background: transparent;
}

#menubar .menu .options .inactive {
color: #bbb;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#menubar .menu .options2 {
position: absolute;
display: block;
padding: 5px 0;
background: #eee;
width: 150px;
}

#menubar .menu:hover .options2 {
display: block;
}

#menubar .menu .options2 hr {
border-color: #ddd;
}

#menubar .menu .options2 .option {
color: #666;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#menubar .menu .options2 .option:hover {
color: #fff;
background-color: #08f;
}

#menubar .menu .options2 .option:active {
color: #666;
background: transparent;
}

#menubar .menu .options2 .inactive {
color: #bbb;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#menubar .menu .options3 {
position: absolute;
display: none;
padding: 5px 0;
background: #eee;
width: 150px;
}

#menubar .menu .options3 hr {
border-color: #ddd;
}

#menubar .menu .options3 .option {
color: #666;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#menubar .menu .options3 .option:active {
color: #666;
background: transparent;
}

#menubar .menu .options3 .inactive {
color: #bbb;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#sidebar {
position: absolute;
Expand Down
151 changes: 110 additions & 41 deletions app/static/css/light.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,47 +105,116 @@ select {
padding: 8px;
}

#menubar .menu .options {
position: fixed;
display: none;
padding: 5px 0;
background: #eee;
width: 150px;
max-height: calc(100% - 80px);
overflow: auto;
}

#menubar .menu:hover .options {
display: block;
}

#menubar .menu .options hr {
border-color: #ddd;
}

#menubar .menu .options .option {
color: #666;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#menubar .menu .options .option:hover {
color: #fff;
background-color: #08f;
}

#menubar .menu .options .option:active {
color: #666;
background: transparent;
}

#menubar .menu .options .inactive {
color: #bbb;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}
#menubar .menu .options {
position: absolute;
display: none;
padding: 5px 0;
background: #eee;
width: 150px;
}

#menubar .menu:hover .options {
display: block;
}

#menubar .menu .options hr {
border-color: #ddd;
}

#menubar .menu .options .option {
color: #666;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#menubar .menu .options .option:hover {
color: #fff;
background-color: #08f;
}

#menubar .menu .options .option:active {
color: #666;
background: transparent;
}

#menubar .menu .options .inactive {
color: #bbb;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#menubar .menu .options2 {
position: absolute;
display: block;
padding: 5px 0;
background: #eee;
width: 150px;
}

#menubar .menu:hover .options2 {
display: block;
}

#menubar .menu .options2 hr {
border-color: #ddd;
}

#menubar .menu .options2 .option {
color: #666;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#menubar .menu .options2 .option:hover {
color: #fff;
background-color: #08f;
}

#menubar .menu .options2 .option:active {
color: #666;
background: transparent;
}

#menubar .menu .options2 .inactive {
color: #bbb;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#menubar .menu .options3 {
position: absolute;
display: none;
padding: 5px 0;
background: #eee;
width: 150px;
}

#menubar .menu .options3 hr {
border-color: #ddd;
}

#menubar .menu .options3 .option {
color: #666;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#menubar .menu .options3 .option:active {
color: #666;
background: transparent;
}

#menubar .menu .options3 .inactive {
color: #bbb;
background-color: transparent;
padding: 5px 10px;
margin: 0 !important;
}

#sidebar {
position: absolute;
Expand Down
Loading

0 comments on commit 2a74793

Please sign in to comment.