taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wrong button extend in lightbox

stable
Xavier Julián 2015-02-13 08:10:26 +01:00
parent a8aae53c00
commit 0187462216
4 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/partials/includes/modules/lightbox-task-create-edit.jade
View File

@ -24,13 +24,13 @@ form
div.settings div.settings
fieldset.iocaine-flag(title="Feeling a bit overwhelmed by a task? Make sure others know about it by clicking on Iocaine when editing a task. It's possible to become immune to this (fictional) deadly poison by consuming small amounts over time just as it's possible to get better at what you do by occasionally taking on extra challenges!") fieldset.iocaine-flag(title="Feeling a bit overwhelmed by a task? Make sure others know about it by clicking on Iocaine when editing a task. It's possible to become immune to this (fictional) deadly poison by consuming small amounts over time just as it's possible to get better at what you do by occasionally taking on extra challenges!")
input(type="checkbox", ng-model="task.is_iocaine", name="iocaine-task", id="iocaine-task", ng-value="true") input(type="checkbox", ng-model="task.is_iocaine", name="iocaine-task", id="iocaine-task", ng-value="true")
label.iocaine(for="iocaine-task") label.iocaine.trans-button(for="iocaine-task")
span.icon.icon-iocaine(for="iocaine-task icon-iocaine") span.icon.icon-iocaine(for="iocaine-task icon-iocaine")
span Iocaine span Iocaine
fieldset.blocking-flag fieldset.blocking-flag
input(type="checkbox", ng-model="task.is_blocked", name="blocked-task", id="blocked-task", ng-value="true") input(type="checkbox", ng-model="task.is_blocked", name="blocked-task", id="blocked-task", ng-value="true")
label.blocked(for="blocked-task", tr="common.blocked") label.blocked.trans-button(for="blocked-task", tr="common.blocked")
tg-blocking-message-input(watch="task.is_blocked", ng-model="task.blocked_note") tg-blocking-message-input(watch="task.is_blocked", ng-model="task.blocked_note")

6
app/partials/includes/modules/lightbox-us-create-edit.jade
View File

@ -23,16 +23,16 @@ form
fieldset.team-requirement fieldset.team-requirement
input(type="checkbox", name="team_requirement", ng-model="us.team_requirement", input(type="checkbox", name="team_requirement", ng-model="us.team_requirement",
id="team-requirement", ng-value="true") id="team-requirement", ng-value="true")
label.requirement(for="team-requirement", tr="us.team-requirement") label.requirement.trans-button(for="team-requirement", tr="us.team-requirement")
fieldset.client-requirement fieldset.client-requirement
input(type="checkbox", name="client_requirement", ng-model="us.client_requirement", input(type="checkbox", name="client_requirement", ng-model="us.client_requirement",
id="client-requirement", ng-value="true") id="client-requirement", ng-value="true")
label.requirement(for="client-requirement", tr="us.client-requirement") label.requirement.trans-button(for="client-requirement", tr="us.client-requirement")
fieldset.blocking-flag fieldset.blocking-flag
input(type="checkbox", name="is_blocked", ng-model="us.is_blocked", id="blocked-us" ng-value="true") input(type="checkbox", name="is_blocked", ng-model="us.is_blocked", id="blocked-us" ng-value="true")
label.blocked(for="blocked-us", tr="common.blocked") label.blocked.trans-button(for="blocked-us", tr="common.blocked")
tg-blocking-message-input(watch="us.is_blocked", ng-model="us.blocked_note") tg-blocking-message-input(watch="us.is_blocked", ng-model="us.blocked_note")

2
app/styles/components/buttons.scss
View File

@ -29,7 +29,7 @@
} }
.trans-button { .trans-button {
@extend %large; @extend %medium;
@extend %title; @extend %title;
@extend %button; @extend %button;
span, span,

22
app/styles/modules/common/lightbox.scss
View File

@ -2,27 +2,6 @@
@extend %lightbox; @extend %lightbox;
} }
.markdown-preview {
display: inline-block;
margin-bottom: .5rem;
a {
@extend %button;
@extend %small;
color: $gray-light;
padding: 3px 20px;
&:first-child {
border-right: 1px solid $gray-light;
}
&:hover {
color: $grayer;
transition: color .2s linear;
}
}
.active {
color: $grayer;
}
}
.lightbox-generic-form { .lightbox-generic-form {
form { form {
flex-basis: 600px; flex-basis: 600px;
@ -41,7 +20,6 @@
} }
label { label {
@extend %button;
border: 1px solid $gray-light; border: 1px solid $gray-light;
color: $grayer; color: $grayer;
cursor: pointer; cursor: pointer;