Skip to content

Commit

Permalink
Merge pull request #109 from matrx-software/#70_objects_display_over_…
Browse files Browse the repository at this point in the history
…GUI_dropdown

changed CSS, fixing z-index bug
  • Loading branch information
thaije committed Mar 10, 2020
2 parents eb100c3 + 677db4e commit d25ced0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions docs/source/_static/css/theme_overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ a.external {color:#656AE0;}
padding: 3px 10px;
margin: 0 5px;
vertical-align: middle;
z-index: 400;
/*z-index: 400;*/
transition: border-color 0.4s;
}
.version-btn {
Expand Down Expand Up @@ -443,7 +443,7 @@ a.external {color:#656AE0;}
border-color: gray;
border-radius: 3px 3px 0px 0px;
box-shadow: 0 0 6px #000C;
z-index: 399;
/*z-index: 399;*/
max-height: calc(100vh - 30px);
overflow-y: auto;
}
Expand Down
6 changes: 3 additions & 3 deletions matrx_visualizer/static/css/GUI.css
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ html {
padding-top: 0.1em;
padding-bottom: 0.1em;
padding-left: 1em;
position: sticky;
z-index: 1;
/* position: sticky; */
z-index: 100000000000;
}

.row {
Expand Down Expand Up @@ -196,7 +196,7 @@ h5 {
padding-bottom: 1em;
padding-left: 0.5em;
padding-right: 1em;
z-index: 1;
z-index: 100000000000;
}

.object:hover {
Expand Down
3 changes: 2 additions & 1 deletion matrx_visualizer/static/js/gen_grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ function draw(state, world_settings, new_messages, accessible_chatrooms, new_tic

// set the visualization depth of this object
obj_element.style.zIndex = obj['visualization']['depth'];
// obj_element.style.zIndex = 0;

// if we need to style this object, e.g. because it's new or visualiation settings changed,
// regenerate the specfic object shape with its settings
Expand Down Expand Up @@ -654,7 +655,7 @@ function draw_bg_tiles() {
// set position and z-index
var pos_x = x * tile_size;
var pos_y = y * tile_size;
tile.style = "left:" + pos_x + "px; top:" + pos_y + "px; width: " + tile_size + "px; height: " + tile_size + "px; z-index: 0;"
tile.style = "left:" + pos_x + "px; top:" + pos_y + "px; width: " + tile_size + "px; height: " + tile_size + "px; z-index: 0;";

// add to grid
grid.append(tile);
Expand Down

0 comments on commit d25ced0

Please sign in to comment.