Skip to content

Fix modals #175

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 8 commits into from
Jun 13, 2020
Merged

Fix modals #175

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3987f8a
Make modals appear correctly
obulat May 28, 2020
898139c
Fix failing tests and update some dependencies
obulat May 28, 2020
acc1614
Update package.json
obulat Jun 10, 2020
6cda0b0
Build the site
obulat Jun 10, 2020
b3fa421
Merge branch 'master' into modal-fix
obulat Jun 11, 2020
0f72b0c
Fix layout
obulat Jun 11, 2020
cb654a3
Build the site
obulat Jun 11, 2020
0ca7431
Fix Russian typo
obulat Jun 11, 2020
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
Next Next commit
Make modals appear correctly
  • Loading branch information
@obulat
obulat committed May 28, 2020
commit 3987f8a8171ae25b0d8802ca856ddfd0cc39e263
4 changes: 2 additions & 2 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export default {
// for the right column to stay sticky when scrolling
margin-bottom: 32px;
}
footer.footer.chooser-footer {
footer.chooser-footer {
margin-top: 2rem;
}
@media only screen and (min-width: 769px) {
Expand All @@ -151,7 +151,7 @@ export default {
grid-gap: 1.5rem;
grid-template-areas: "heading localechooser";
}
footer {
footer.chooser-footer {
margin-top: 5rem;
}
}
Expand Down
74 changes: 35 additions & 39 deletions src/components/HelpSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
</div>
</div>
</section>
<footer class="modal-card-foot" />
</b-modal>
</Portal>
<Portal selector="#portal-target">
Expand All @@ -150,6 +151,7 @@
<section class="modal-card-body">
<article v-html="this.$t('help.how-formally-license.text')" />
</section>
<footer class="modal-card-foot" />
</b-modal>
<b-modal :active.sync="modals[6].status">
<header class="modal-card-head">
Expand Down Expand Up @@ -200,6 +202,7 @@
</tbody>
</table>
</section>
<footer class="modal-card-foot" />
</b-modal>
</Portal>
<Portal selector="#portal-target">
Expand All @@ -225,6 +228,7 @@
<section class="modal-card-body">
<p v-html="this.$t('help.look-earlier-license-ver.text')" />
</section>
<footer class="modal-card-foot" />
</b-modal>
</Portal>
</div>
Expand Down Expand Up @@ -310,40 +314,6 @@ export default {
list-style-image: url("../assets/arrow-right.png");
}

table svg {
width: 28px !important;
height: 28px !important;
vertical-align: middle;
margin-right: 3px;
}

.help-section__table {
margin-top: 1.5rem;
}

.top-bottom-paddingless {
padding-bottom: 0 !important;
padding-top: 0 !important;
}

@media only screen and (max-width: 1025px) {
.tablet-hide { display: none; }
.tablet-show { display: block; }
}

@media only screen and (max-width: 670px) {
h2 { font-size: 30px !important; }
button p { font-size: 18px; }

.modal-title { font-size: 18px; }
.modal-content {
margin-left: 10%;
margin-right: 10%;
}

.mobile-hide { display: none; }
.mobile-show { display: block; }
}
</style>
<style lang="scss">
.help__instructions {
Expand All @@ -364,17 +334,15 @@ export default {
}
.edu-icons-title-section {
display: grid;
grid-gap: 0.5rem;
grid-template-columns: 1fr 7fr;
}

.edu-icons-section img {
width: 45px;
}

.edu-icons-section p {
margin-bottom: 6%;
}

.edu-icons-section .title {
vertical-align: middle !important;
margin-bottom: 0 !important;
Expand All @@ -385,13 +353,41 @@ export default {
font-size: 23px;
line-height: 27px;
}

.edu-icons-section b {
padding-top: 0;
}

.edu-icons-section-icon_title p {
margin: 0;
}
.modal.is-active .modal-content {
overflow: hidden;
}
button.modal-close {
position: fixed;
}
p.modal-card-title {
flex-shrink: 1;
line-height: inherit;
}
.help-section__table {
margin-top: 1.5rem;
}
.top-bottom-paddingless {
padding-bottom: 0 !important;
padding-top: 0 !important;
}

@media only screen and (max-width: 670px) {
.modal-card-title.modal-title { font-size: 18px; }
.modal-content {
margin-left: 10%;
margin-right: 10%;
}
.modal-card-body {
max-height: 55vh;
}
.modal.is-active .modal-content {
max-height: calc(100vh - 20px);
}
}
</style>