mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-15 05:37:22 +01:00
Compare commits
3 Commits
fiz/item-c
...
fiz/task-m
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
17caa2159d | ||
|
|
36520ae6a5 | ||
|
|
315a942c69 |
@@ -203,4 +203,4 @@ describe('Blocker middleware', () => {
|
|||||||
expect(calledWith[0] instanceof Forbidden).to.equal(true);
|
expect(calledWith[0] instanceof Forbidden).to.equal(true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -130,4 +130,4 @@ export default {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
class="btn btn-secondary d-flex align-items-center justify-content-center"
|
class="btn btn-secondary d-flex align-items-center justify-content-center"
|
||||||
:class="{disabled: !canSave}"
|
:class="{'btn-disabled': !canSave}"
|
||||||
type="button"
|
type="button"
|
||||||
@click="submit()"
|
@click="submit()"
|
||||||
>
|
>
|
||||||
@@ -162,13 +162,13 @@
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="habit-option-icon svg-icon no-transition"
|
class="habit-option-icon svg-icon no-transition"
|
||||||
:class="task.up ? '' : 'disabled'"
|
:class="task.up ? '' : 'icon-disabled'"
|
||||||
v-html="icons.positive"
|
v-html="icons.positive"
|
||||||
></div>
|
></div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="habit-option-label no-transition"
|
class="habit-option-label no-transition"
|
||||||
:class="task.up ? cssClass('icon') : 'disabled'"
|
:class="task.up ? cssClass('icon') : 'label-disabled'"
|
||||||
>
|
>
|
||||||
{{ $t('positive') }}
|
{{ $t('positive') }}
|
||||||
</div>
|
</div>
|
||||||
@@ -188,13 +188,13 @@
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="habit-option-icon no-transition svg-icon negative mx-auto"
|
class="habit-option-icon no-transition svg-icon negative mx-auto"
|
||||||
:class="task.down ? '' : 'disabled'"
|
:class="task.down ? '' : 'icon-disabled'"
|
||||||
v-html="icons.negative"
|
v-html="icons.negative"
|
||||||
></div>
|
></div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="habit-option-label no-transition"
|
class="habit-option-label no-transition"
|
||||||
:class="task.down ? cssClass('icon') : 'disabled'"
|
:class="task.down ? cssClass('icon') : 'label-disabled'"
|
||||||
>
|
>
|
||||||
{{ $t('negative') }}
|
{{ $t('negative') }}
|
||||||
</div>
|
</div>
|
||||||
@@ -592,7 +592,7 @@
|
|||||||
<button
|
<button
|
||||||
class="btn btn-primary btn-footer
|
class="btn btn-primary btn-footer
|
||||||
d-flex align-items-center justify-content-center"
|
d-flex align-items-center justify-content-center"
|
||||||
:class="{disabled: !canSave}"
|
:class="{'btn-disabled': !canSave}"
|
||||||
type="button"
|
type="button"
|
||||||
@click="submit()"
|
@click="submit()"
|
||||||
>
|
>
|
||||||
@@ -881,12 +881,14 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.disabled {
|
.btn-disabled {
|
||||||
background-color: $white;
|
background-color: $white;
|
||||||
border: 2px solid transparent;
|
border: 2px solid transparent;
|
||||||
color: $gray-200;
|
color: $gray-200;
|
||||||
line-height: 1.714;
|
line-height: 1.714;
|
||||||
box-shadow: 0px 1px 3px 0px rgba(26, 24, 29, 0.12), 0px 1px 2px 0px rgba(26, 24, 29, 0.24);
|
box-shadow: 0px 1px 3px 0px rgba(26, 24, 29, 0.12), 0px 1px 2px 0px rgba(26, 24, 29, 0.24);
|
||||||
|
cursor: not-allowed;
|
||||||
|
opacity: 0.6;
|
||||||
|
|
||||||
&:focus {
|
&:focus {
|
||||||
background-color: $white;
|
background-color: $white;
|
||||||
@@ -948,7 +950,7 @@
|
|||||||
height: 10px;
|
height: 10px;
|
||||||
color: $white;
|
color: $white;
|
||||||
|
|
||||||
&.disabled {
|
&.icon-disabled {
|
||||||
color: $gray-200;
|
color: $gray-200;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -962,7 +964,7 @@
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
||||||
&.disabled {
|
&.label-disabled {
|
||||||
color: $gray-100;
|
color: $gray-100;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
@@ -1018,7 +1020,7 @@
|
|||||||
border: 0;
|
border: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.disabled .input-group-text {
|
.input-group-outer.disabled .input-group-text {
|
||||||
color: $gray-200;
|
color: $gray-200;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -66,4 +66,4 @@ export default function ipBlocker (req, res, next) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return next();
|
return next();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user