From 0187462216c9892cee800a2c52f44fc5f5015336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Fri, 13 Feb 2015 08:10:26 +0100 Subject: [PATCH] Fix wrong button extend in lightbox --- .../modules/lightbox-task-create-edit.jade | 4 ++-- .../modules/lightbox-us-create-edit.jade | 6 ++--- app/styles/components/buttons.scss | 2 +- app/styles/modules/common/lightbox.scss | 22 ------------------- 4 files changed, 6 insertions(+), 28 deletions(-) diff --git a/app/partials/includes/modules/lightbox-task-create-edit.jade b/app/partials/includes/modules/lightbox-task-create-edit.jade index c07b101a..4541d3a4 100644 --- a/app/partials/includes/modules/lightbox-task-create-edit.jade +++ b/app/partials/includes/modules/lightbox-task-create-edit.jade @@ -24,13 +24,13 @@ form 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!") 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 Iocaine fieldset.blocking-flag 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") diff --git a/app/partials/includes/modules/lightbox-us-create-edit.jade b/app/partials/includes/modules/lightbox-us-create-edit.jade index 0a6d73e7..9fcbd723 100644 --- a/app/partials/includes/modules/lightbox-us-create-edit.jade +++ b/app/partials/includes/modules/lightbox-us-create-edit.jade @@ -23,16 +23,16 @@ form fieldset.team-requirement input(type="checkbox", name="team_requirement", ng-model="us.team_requirement", 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 input(type="checkbox", name="client_requirement", ng-model="us.client_requirement", 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 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") diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss index baf0ea05..b8755325 100755 --- a/app/styles/components/buttons.scss +++ b/app/styles/components/buttons.scss @@ -29,7 +29,7 @@ } .trans-button { - @extend %large; + @extend %medium; @extend %title; @extend %button; span, diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss index e2fa350f..9824ce43 100644 --- a/app/styles/modules/common/lightbox.scss +++ b/app/styles/modules/common/lightbox.scss @@ -2,27 +2,6 @@ @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 { form { flex-basis: 600px; @@ -41,7 +20,6 @@ } label { - @extend %button; border: 1px solid $gray-light; color: $grayer; cursor: pointer;