Skip to content
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

Revert "hiding div to allow playing/showing the video" #3212

Merged
merged 7 commits into from
Oct 4, 2018
Merged

Revert "hiding div to allow playing/showing the video" #3212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
025a5e6
Revert "Removes console logs from browser from karma testing output (…
offtherailz Oct 4, 2018
8427d85
Revert "Fix #3209 show/hide title translations in layer settings (#32…
offtherailz Oct 4, 2018
47ecf65
Revert "Fixes #2669: use https version of geosolutions maven repo (#3…
offtherailz Oct 4, 2018
b7f4df6
Revert "Automatic definition of proj codes from configuration in Open…
offtherailz Oct 4, 2018
1b8ec85
Revert "Fix #3192 setting the default layer as object (#3199)"
offtherailz Oct 4, 2018
f96e43a
Revert "Fix #2298 de-DE translation fix (#3205)"
offtherailz Oct 4, 2018
44d5aed
Revert "hiding div to allow playing/showing the video (#3188)"
offtherailz Oct 4, 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
2 changes: 1 addition & 1 deletion web/client/components/maps/modals/MetadataModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class MetadataModal extends React.Component {
toolbar: [
[{ 'size': ['small', false, 'large', 'huge'] }, 'bold', 'italic', 'underline', 'blockquote'],
[{ 'list': 'bullet' }, { 'align': [] }],
[{ 'color': [] }, { 'background': [] }, 'clean'], ['image', 'link', 'video']
[{ 'color': [] }, { 'background': [] }, 'clean'], ['image', 'link']
]
},
options: {},
Expand Down
1 change: 0 additions & 1 deletion web/client/components/misc/quillmodules/ResizeModule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,6 @@ module.exports = Quill => {
iframe.setAttribute('height', height);
let overlay = document.createElement('DIV');
overlay.setAttribute('class', 'ms-quill-iframe');
overlay.style.display = 'none';
overlay.style.overflow = 'hidden';
overlay.style.position = 'absolute';
overlay.style.left = '0';
Expand Down
2 changes: 1 addition & 1 deletion web/client/components/resources/modals/DetailSheet.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = ({
toolbar: [
[{ 'size': ['small', false, 'large', 'huge'] }, 'bold', 'italic', 'underline', 'blockquote'],
[{ 'list': 'bullet' }, { 'align': [] }],
[{ 'color': [] }, { 'background': [] }, 'clean'], ['image', 'link', 'video']
[{ 'color': [] }, { 'background': [] }, 'clean'], ['image', 'link']
]
},
detailsText,
Expand Down