From d90d7817406272fb930c00ff39b479def81dd988 Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Tue, 26 Dec 2017 17:31:00 -0600 Subject: [PATCH] Added mobile style fixes (#9741) --- website/client/components/appFooter.vue | 10 +-- .../components/auth/registerLoginReset.vue | 21 +++-- .../components/challenges/challengeDetail.vue | 11 ++- .../components/challenges/findChallenges.vue | 3 +- .../client/components/challenges/sidebar.vue | 1 - website/client/components/groups/group.vue | 4 +- website/client/components/groups/myGuilds.vue | 6 ++ website/client/components/header/index.vue | 8 +- .../client/components/shops/market/index.vue | 18 +++- website/client/components/static/faq.vue | 8 +- website/client/components/static/home.vue | 15 +++- website/client/components/tasks/taskModal.vue | 6 ++ website/client/components/tasks/user.vue | 9 +- .../client/components/userMenu/profile.vue | 82 +++++++++---------- 14 files changed, 134 insertions(+), 68 deletions(-) diff --git a/website/client/components/appFooter.vue b/website/client/components/appFooter.vue index 77f67e82ef..0671c656e8 100644 --- a/website/client/components/appFooter.vue +++ b/website/client/components/appFooter.vue @@ -69,8 +69,8 @@ a.social-circle(href='https://www.facebook.com/Habitica', target='_blank') .social-icon.facebook.svg-icon(v-html='icons.facebook') .row - .col-10 {{ $t('donateText3') }} - .col-2 + .col-12.col-md-10 {{ $t('donateText3') }} + .col-12.col-md-2 button.btn.btn-contribute(@click="donate()", v-if="user") .svg-icon.heart(v-html="icons.heart") .text {{ $t('companyDonate') }} @@ -82,7 +82,7 @@ .col-12 hr .row - .col-5 + .col-12.col-md-5 | © 2017 Habitica. All rights reserved. .debug.float-left(v-if="!IS_PRODUCTION && isUserLoaded") button.btn.btn-primary(@click="debugMenuShown = !debugMenuShown") Toggle Debug Menu @@ -102,9 +102,9 @@ a.btn.btn-default(@click="addQuestProgress()", tooltip="+1000 to boss quests. 300 items to collection quests") Quest Progress Up a.btn.btn-default(@click="makeAdmin()") Make Admin a.btn.btn-default(@click="openModifyInventoryModal()") Modify Inventory - .col-2.text-center + .col-12.col-md-2.text-center .logo.svg-icon(v-html='icons.gryphon') - .col-5.text-right + .col-12.col-md-5.text-right template(v-if="!isExpandedFooter") span a(:href="getDataDisplayToolUrl", target='_blank') {{ $t('dataDisplayTool') }} diff --git a/website/client/components/auth/registerLoginReset.vue b/website/client/components/auth/registerLoginReset.vue index 79ac0494a3..dba5c28c62 100644 --- a/website/client/components/auth/registerLoginReset.vue +++ b/website/client/components/auth/registerLoginReset.vue @@ -4,8 +4,8 @@ .seamless_stars_varied_opacity_repeat form#login-form( - @submit.prevent='handleSubmit', - @keyup.enter="handleSubmit", + @submit.prevent='handleSubmit', + @keyup.enter="handleSubmit", v-if="!forgotPassword && !resetPasswordSetNewOne", ) .text-center @@ -14,11 +14,11 @@ div .svg-icon.habitica-logo(v-html="icons.habiticaIcon") .form-group.row.text-center - .col-6 + .col-12.col-md-6 .btn.btn-secondary.social-button(@click='socialAuth("facebook")') .svg-icon.social-icon(v-html="icons.facebookIcon") .text {{registering ? $t('signUpWithSocial', {social: 'Facebook'}) : $t('loginWithSocial', {social: 'Facebook'})}} - .col-6 + .col-12.col-md-6 .btn.btn-secondary.social-button(@click='socialAuth("google")') .svg-icon.social-icon(v-html="icons.googleIcon") span {{registering ? $t('signUpWithSocial', {social: 'Google'}) : $t('loginWithSocial', {social: 'Google'})}} @@ -79,7 +79,7 @@ input#confirmPasswordInput.form-control(type='password', :placeholder='$t("confirmPasswordPlaceholder")', v-model='passwordConfirm') .text-center .btn.btn-info( - @click='resetPasswordSetNewOneLink()', + @click='resetPasswordSetNewOneLink()', :enabled="!resetPasswordSetNewOneData.hasError" ) {{$t('setNewPass')}} @@ -121,6 +121,17 @@ } } + @media only screen and (max-width: 768px) { + #login-form { + width: 100% !important; + } + + .form-group { + padding-left: .5em; + padding-right: .5em; + } + } + .form-wrapper { background-color: $purple-200; background: $purple-200; /* For browsers that do not support gradients */ diff --git a/website/client/components/challenges/challengeDetail.vue b/website/client/components/challenges/challengeDetail.vue index add3e53011..01f07bcb6d 100644 --- a/website/client/components/challenges/challengeDetail.vue +++ b/website/client/components/challenges/challengeDetail.vue @@ -4,10 +4,9 @@ leave-challenge-modal(:challengeId='challenge._id') close-challenge-modal(:members='members', :challengeId='challenge._id') challenge-member-progress-modal(:memberId='progressMemberId', :challengeId='challenge._id') - - .col-8.standard-page + .col-12.col-md-8.standard-page .row - .col-8 + .col-12.col-md-8 h1(v-markdown='challenge.name') div strong(v-once) {{$t('createdBy')}}: @@ -20,7 +19,7 @@ // span {{challenge.endDate}} .tags span.tag(v-for='tag in challenge.tags') {{tag}} - .col-4 + .col-12.col-md-4 .box(@click="showMemberModal()") .svg-icon.member-icon(v-html="icons.memberIcon") | {{challenge.memberCount}} @@ -30,7 +29,7 @@ | {{challenge.prize}} .details(v-once) {{$t('prize')}} .row.challenge-actions - .col-7.offset-5 + .col-12.col-md-7.offset-md-5 span.view-progress strong {{ $t('viewProgressOf') }} member-search-dropdown(:text="$t('selectParticipant')", :members='members', :challengeId='challengeId', @member-selected='openMemberProgressModal') @@ -56,7 +55,7 @@ :taskListOverride='tasksByType[column]', v-on:editTask="editTask", v-if='tasksByType[column].length > 0') - .col-4.sidebar.standard-page + .col-12.col-md-4.sidebar.standard-page .acitons div(v-if='canJoin') button.btn.btn-success(v-once, @click='joinChallenge()') {{$t('joinChallenge')}} diff --git a/website/client/components/challenges/findChallenges.vue b/website/client/components/challenges/findChallenges.vue index ed25791729..2372e360eb 100644 --- a/website/client/components/challenges/findChallenges.vue +++ b/website/client/components/challenges/findChallenges.vue @@ -2,8 +2,7 @@ .row challenge-modal(v-on:createChallenge='challengeCreated') sidebar(v-on:search="updateSearch", v-on:filter="updateFilters") - - .col-10.standard-page + .col-12.col-md-10.standard-page .row.header-row .col-md-8.text-left h1(v-once) {{$t('findChallenges')}} diff --git a/website/client/components/challenges/sidebar.vue b/website/client/components/challenges/sidebar.vue index a2c7a5a278..9c7110c1ce 100644 --- a/website/client/components/challenges/sidebar.vue +++ b/website/client/components/challenges/sidebar.vue @@ -2,7 +2,6 @@ .standard-sidebar.d-none.d-sm-block .form-group input.form-control.search(type="text", :placeholder="$t('search')", v-model='searchTerm') - form h2(v-once) {{ $t('filter') }} .form-group diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue index 34f705ca44..5b0f7ae16b 100644 --- a/website/client/components/groups/group.vue +++ b/website/client/components/groups/group.vue @@ -7,11 +7,11 @@ group-gems-modal .col-12.col-sm-8.standard-page .row - .col-6.title-details + .col-12.col-md-6.title-details h1 {{group.name}} strong.float-left(v-once) {{$t('groupLeader')}} span.leader.float-left(v-if='group.leader.profile', @click='showMemberProfile(group.leader)') : {{group.leader.profile.name}} - .col-6 + .col-12.col-md-6 .row.icon-row .col-4.offset-4(v-bind:class="{ 'offset-8': isParty }") .item-with-icon(@click="showMemberModal()") diff --git a/website/client/components/groups/myGuilds.vue b/website/client/components/groups/myGuilds.vue index 68ca0edf15..a75aaf71b4 100644 --- a/website/client/components/groups/myGuilds.vue +++ b/website/client/components/groups/myGuilds.vue @@ -60,6 +60,12 @@ } } } + + @media only screen and (max-width: 768px) { + .no-guilds-wrapper { + width: 100% !important; + } + }