krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(teams): Stealth calc and small screens

Browse Source
This commit is contained in:
SabreCat
2022-08-29 17:09:06 -05:00
parent 14441701c9
commit 6c1b21117f
2 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
website/client/src/components/group-plans/taskInformation.vue
View File

@@ -19,21 +19,18 @@
:task="editingTask" :task="editingTask"
@cancel="cancelTaskModal()" @cancel="cancelTaskModal()"
/> />
<div class="row tasks-navigation mb-4"> <div class="d-flex flex-wrap align-items-center mb-4">
<div class="col-12 col-md-4 d-flex align-items-center"> <div class="mr-auto">
<h1>{{ group.name }}</h1> <h1>{{ group.name }}</h1>
</div> </div>
<!-- @TODO: Abstract to component!--> <input
<div class="col-12 col-md-4 d-flex justify-content-center align-items-center"> v-model="searchText"
<input class="form-control input-search"
v-model="searchText" type="text"
class="form-control input-search" :placeholder="$t('search')"
type="text" >
:placeholder="$t('search')"
>
</div>
<div <div
class="col-12 col-md-4 create-task-area d-flex align-items-center" class="d-flex flex-wrap align-items-center justify-content-end ml-auto"
> >
<toggle-switch <toggle-switch
id="taskMirrorToggle" id="taskMirrorToggle"
@@ -44,11 +41,11 @@
@change="changeMirrorPreference" @change="changeMirrorPreference"
/> />
<div <div
class="day-start d-flex align-items-center mr-2" class="day-start d-flex align-items-center"
v-html="$t('dayStart', { startTime: groupStartTime } )" v-html="$t('dayStart', { startTime: groupStartTime } )"
> >
</div> </div>
<div> <div class="ml-2">
<button <button
id="create-task-btn" id="create-task-btn"
v-if="canCreateTasks" v-if="canCreateTasks"
@@ -135,21 +132,31 @@
margin-bottom: 0px; margin-bottom: 0px;
} }
.create-task-area { .day-start {
top: 1.5rem; height: 2rem;
height: 40px; padding: 0.25rem 0.75rem;
border-radius: 2px;
color: $gray-100;
background-color: $gray-600;
}
.day-start { @media screen and (min-width: 1200px) {
height: 2rem; .input-search {
padding: 0.25rem 0.75rem; margin-left: 12.5rem;
border-radius: 2px; width: 25%;
color: $gray-100;
background-color: $gray-600;
} }
} }
.input-search { @media screen and (max-width: 1200px) {
max-width: 458px; .input-search {
width: 50%;
}
}
@media screen and (max-width: 500px) {
#create-task-btn {
margin-top: 4px;
}
} }
.positive { .positive {

2
website/client/src/components/tasks/spells.vue
View File

@@ -461,7 +461,7 @@ export default {
spellDisabled (skill) { spellDisabled (skill) {
const incompleteDailiesDue = this const incompleteDailiesDue = this
.getUnfilteredTaskList('daily') .getUnfilteredTaskList('daily')
.filter(daily => !daily.completed && daily.isDue) .filter(daily => !daily.completed && !daily.group.id && daily.isDue)
.length; .length;
if (skill === 'frost' && this.user.stats.buffs.streaks) { if (skill === 'frost' && this.user.stats.buffs.streaks) {