Skip to content

CMP locator frame, tweaks to responsiveness #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 12, 2018
Merged

CMP locator frame, tweaks to responsiveness #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0d40d1
change media query for flex-direction
Aug 13, 2018
80090e2
restrict max height of description text, action buttons always visible
Aug 14, 2018
dd32f12
163 append locator frame logic to init
Sep 10, 2018
3c6a5b9
Merge pull request #169 from SupahNickie/163-iframe-postmessage
SupahNickie Sep 10, 2018
7bc8fec
Merge pull request #158 from SupahNickie/responsiveness-tweaks
SupahNickie Sep 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/components/popup/intro/intro.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
.flexColumn {
flex-direction: column;
@media (max-width: 480px) {
flex-direction: row;
}
@media (min-width: 481px) {
flex-direction: column;
}
}


div.intro {
align-items: center;
padding: 0 4em;
max-height: 100%;

.top {
max-height: 425px;
margin-bottom: 75px;
overflow: auto;

@media (max-width: 480px) {
max-height: calc(100vh - 75px);
}
@media (min-width: 481px) {
max-height: 425px;
}

.logo {
display: block;
margin: 20px auto 10px auto;
Expand All @@ -27,6 +39,7 @@ div.intro {
.description {
margin: 2em 0;
overflow: auto;
max-height: 150px;
text-align: center;
}
.options {
Expand Down
15 changes: 15 additions & 0 deletions src/lib/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,21 @@ export function init(configUpdates) {
cmp.gdprAppliesLanguage = response.language;
cmp.gdprAppliesLocation = response.location;
}).then((response) => {
function addLocatorFrame() {
if (!window.frames['__cmpLocator']) {
if (document.body) {
var frame = document.createElement('iframe');
frame.style.display = 'none';
frame.name = '__cmpLocator';
document.body.appendChild(frame);
}
else {
setTimeout(addLocatorFrame, 5);
}
}
}

addLocatorFrame();
store.updateIsEU(response.applies);

// Render the UI
Expand Down