Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #31058 from etiennesegonzac/bug-1185160
Browse files Browse the repository at this point in the history
Bug 1185160 - Display the appWindow screenshot on top of the iframe r=sfoster
  • Loading branch information
etiennesegonzac committed Jul 22, 2015
2 parents b57aef5 + c176ba8 commit 428ca68
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
6 changes: 3 additions & 3 deletions apps/system/style/cards_view/cards_view.css
Expand Up @@ -75,7 +75,7 @@
position: absolute;
margin: 0;
padding: 0;
height: calc(100% - 1.5rem);
height: 100%;
overflow: hidden;
white-space: nowrap;
text-align: center;
Expand All @@ -87,10 +87,10 @@
#cards-view .card {
display: block;
position: absolute;
top: 25vh;
top: 25%;
left: 25vw;
width: 50vw;
height: 50vh;
height: 50%;
transform: translateY(0);
/* Defines the center of each card (column) as the
coordinate that should be used for snapping */
Expand Down
8 changes: 8 additions & 0 deletions apps/system/style/window.css
Expand Up @@ -315,6 +315,10 @@
/****************** Screenshot Overlay ******************/
.appWindow .screenshot-overlay {
pointer-events: none;

position: absolute;
top: 0;
width: 100%;
height: 100%;
visibility: hidden;

Expand Down Expand Up @@ -441,6 +445,10 @@
z-index: 1024;
}

.appWindow > .browser-container .screenshot-overlay {
z-index: 10;
}

.appWindow > .chrome {
z-index: 5;
}
Expand Down

0 comments on commit 428ca68

Please sign in to comment.