diff --git a/app/partials/admin/admin-memberships.jade b/app/partials/admin/admin-memberships.jade index cf996944..880ccb68 100644 --- a/app/partials/admin/admin-memberships.jade +++ b/app/partials/admin/admin-memberships.jade @@ -9,7 +9,7 @@ div.wrapper.memberships(ng-controller="MembershipsController as ctrl", include ../includes/components/mainTitle .action-buttons - a.button.button-green(title="Add new member" href="" ng-click="ctrl.addNewMembers()") + a.button-green(title="Add new member" href="" ng-click="ctrl.addNewMembers()") span.text + New member include ../includes/modules/admin/admin-membership-table diff --git a/app/partials/admin/admin-project-export.jade b/app/partials/admin/admin-project-export.jade index ccac3ecb..807897e8 100644 --- a/app/partials/admin/admin-project-export.jade +++ b/app/partials/admin/admin-project-export.jade @@ -12,7 +12,8 @@ div.wrapper(ng-controller="ProjectProfileController as ctrl", p.admin-subtitle Export your project to save a backup or to create a new one based on this. div.admin-project-export-buttons - a.button.button-green.button-export(href="", title="Export your project") Export + a.button-green.button-export(href="", title="Export your project") + span Export div.admin-project-export-result.hidden div.spin.hidden diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade index 4b8010c7..6ee7c272 100644 --- a/app/partials/admin/admin-project-profile.jade +++ b/app/partials/admin/admin-project-profile.jade @@ -41,10 +41,12 @@ div.wrapper(tg-project-profile, ng-controller="ProjectProfileController as ctrl" div.privacy-settings div input.hidden(type="radio", disabled="disabled") - label.button(for="public-project") Public Project + label.trans-button(for="public-project") + span Public Project div input.hidden(type="radio", checked="checked", disabled="disabled") - label.button(for="private-project") Private Project + label.trans-button(for="private-project") + span Private Project p All projects are private during Taiga's beta period. diff --git a/app/partials/admin/admin-project-values-issue-priorities.jade b/app/partials/admin/admin-project-values-issue-priorities.jade index cb2a2116..be45b28d 100644 --- a/app/partials/admin/admin-project-values-issue-priorities.jade +++ b/app/partials/admin/admin-project-values-issue-priorities.jade @@ -12,7 +12,7 @@ div.wrapper(tg-project-values, ng-controller="ProjectValuesController as ctrl", p.admin-subtitle Specify the priority levels users can assign to issues div.project-values-options - a.button.button-green.show-add-new(href="", title="Add New") + a.button-green.show-add-new(href="", title="Add New") span Add new priority include ../includes/modules/admin/project-types diff --git a/app/partials/admin/admin-project-values-issue-severities.jade b/app/partials/admin/admin-project-values-issue-severities.jade index 57fea5a7..25d17ced 100644 --- a/app/partials/admin/admin-project-values-issue-severities.jade +++ b/app/partials/admin/admin-project-values-issue-severities.jade @@ -12,7 +12,7 @@ div.wrapper(tg-project-values, ng-controller="ProjectValuesController as ctrl", p.admin-subtitle Specify the severity level users can select to classify issues div.project-values-options - a.button.button-green.show-add-new(href="", title="Add New") + a.button-green.show-add-new(href="", title="Add New") span Add new severity include ../includes/modules/admin/project-types diff --git a/app/partials/admin/admin-project-values-issue-status.jade b/app/partials/admin/admin-project-values-issue-status.jade index b02c72e6..629b7fdd 100644 --- a/app/partials/admin/admin-project-values-issue-status.jade +++ b/app/partials/admin/admin-project-values-issue-status.jade @@ -12,7 +12,7 @@ div.wrapper(tg-project-values, ng-controller="ProjectValuesController as ctrl", p.admin-subtitle Specify the column headers that you will use to classify Issues div.project-values-options - a.button.button-green.show-add-new(href="", title="Add New") + a.button-green.show-add-new(href="", title="Add New") span Add new status include ../includes/modules/admin/project-status diff --git a/app/partials/admin/admin-project-values-issue-types.jade b/app/partials/admin/admin-project-values-issue-types.jade index 20072b9e..4d702362 100644 --- a/app/partials/admin/admin-project-values-issue-types.jade +++ b/app/partials/admin/admin-project-values-issue-types.jade @@ -12,7 +12,7 @@ div.wrapper(tg-project-values, ng-controller="ProjectValuesController as ctrl", p.admin-subtitle Specify the categories users can select to classify issues div.project-values-options - a.button.button-green.show-add-new(href="", title="Add New") + a.button-green.show-add-new(href="", title="Add New") span Add new type include ../includes/modules/admin/project-types diff --git a/app/partials/admin/admin-project-values-task-status.jade b/app/partials/admin/admin-project-values-task-status.jade index be883b1f..5d6fa0ba 100644 --- a/app/partials/admin/admin-project-values-task-status.jade +++ b/app/partials/admin/admin-project-values-task-status.jade @@ -12,7 +12,7 @@ div.wrapper(tg-project-values, ng-controller="ProjectValuesController as ctrl", p.admin-subtitle Specify the column headers that you will use to classify Tasks related to each User Stories div.project-values-options - a.button.button-green.show-add-new(href="", title="Add New") + a.button-green.show-add-new(href="", title="Add New") span Add new status include ../includes/modules/admin/project-status diff --git a/app/partials/admin/admin-project-values-us-points.jade b/app/partials/admin/admin-project-values-us-points.jade index 4483a03f..41b434ae 100644 --- a/app/partials/admin/admin-project-values-us-points.jade +++ b/app/partials/admin/admin-project-values-us-points.jade @@ -15,7 +15,7 @@ div.wrapper(tg-project-values, ng-controller="ProjectValuesController as ctrl", include ../includes/components/help-notion-button div.project-values-options - a.button.button-green.show-add-new(href="", title="Add New") + a.button-green.show-add-new(href="", title="Add New") span Add new point include ../includes/modules/admin/project-points diff --git a/app/partials/admin/admin-project-values-us-status.jade b/app/partials/admin/admin-project-values-us-status.jade index eb6980cc..c87811ce 100644 --- a/app/partials/admin/admin-project-values-us-status.jade +++ b/app/partials/admin/admin-project-values-us-status.jade @@ -12,7 +12,7 @@ div.wrapper(tg-project-values, ng-controller="ProjectValuesController as ctrl", p.admin-subtitle Specify the column headers that you will use to classify User Stories div.project-values-options - a.button.button-green.show-add-new(href="", title="Add New") + a.button-green.show-add-new(href="", title="Add New") span Add new status include ../includes/modules/admin/project-us-status diff --git a/app/partials/admin/admin-roles.jade b/app/partials/admin/admin-roles.jade index 335cef2d..52dc954f 100644 --- a/app/partials/admin/admin-roles.jade +++ b/app/partials/admin/admin-roles.jade @@ -9,7 +9,8 @@ div.wrapper.roles(ng-controller="RolesController as ctrl", .header-with-actions include ../includes/components/mainTitle .action-buttons - a.button.button-red.delete-role(href="", title="Delete", ng-click="ctrl.delete()") Delete + a.button-red.delete-role(href="", title="Delete", ng-click="ctrl.delete()") + span Delete div(tg-edit-role) diff --git a/app/partials/admin/admin-third-parties-webhooks.jade b/app/partials/admin/admin-third-parties-webhooks.jade index e56468a5..4262608c 100644 --- a/app/partials/admin/admin-third-parties-webhooks.jade +++ b/app/partials/admin/admin-third-parties-webhooks.jade @@ -14,7 +14,7 @@ block content p.admin-subtitle Webhooks notify external services about events in Taiga, like comments, user stories.... div.webhooks-options - a.button.button-green.hidden.add-webhook(href="",title="Add a New Webhook") Add Webhook + a.utton-green.hidden.add-webhook(href="",title="Add a New Webhook") Add Webhook section.webhooks-table.basic-table div.table-header diff --git a/app/partials/backlog/backlog.jade b/app/partials/backlog/backlog.jade index e8b4dd55..1b96fa32 100644 --- a/app/partials/backlog/backlog.jade +++ b/app/partials/backlog/backlog.jade @@ -9,16 +9,17 @@ div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl", div.burndown(tg-gm-backlog-graph) include ../includes/modules/burndown div.backlog-menu - a.trans-button.move-to-current-sprint(href="", title="Move to Current Sprint", - id="move-to-current-sprint") - span.icon.icon-move - span.text Move to current Sprint - a.trans-button(href="", title="Show Filters", id="show-filters-button") - span.icon.icon-filter - span.text Show Filters - a.trans-button(href="", title="Show Tags", id="show-tags") - span.icon.icon-tag - span.text Show Tags + div.backlog-table-options + a.trans-button.move-to-current-sprint(href="", title="Move to Current Sprint", + id="move-to-current-sprint") + span.icon.icon-move + span.text Move to current Sprint + a.trans-button(href="", title="Show Filters", id="show-filters-button") + span.icon.icon-filter + span.text Show Filters + a.trans-button(href="", title="Show Tags", id="show-tags") + span.icon.icon-tag + span.text Show Tags include ../includes/components/addnewus section.backlog-table(ng-class="{'hidden': !visibleUserstories.length}") include ../includes/modules/backlog-table diff --git a/app/partials/common/components/block-button.jade b/app/partials/common/components/block-button.jade index 354ec00d..7e187687 100644 --- a/app/partials/common/components/block-button.jade +++ b/app/partials/common/components/block-button.jade @@ -1,2 +1,4 @@ -a(href="#", class="button button-gray item-block") Block -a(href="#", class="button button-red item-unblock") Unblock \ No newline at end of file +a(href="#", class="button button-gray item-block") + span Block +a(href="#", class="button button-red item-unblock") + span Unblock diff --git a/app/partials/common/components/delete-button.jade b/app/partials/common/components/delete-button.jade index c33733cf..dc2f2065 100644 --- a/app/partials/common/components/delete-button.jade +++ b/app/partials/common/components/delete-button.jade @@ -1 +1,2 @@ -a(href="", class="button button-red") Delete \ No newline at end of file +a(href="", class="button button-red") + span Delete diff --git a/app/partials/common/lightbox/lightbox-block.jade b/app/partials/common/lightbox/lightbox-block.jade index b80a0177..a6290d16 100644 --- a/app/partials/common/lightbox/lightbox-block.jade +++ b/app/partials/common/lightbox/lightbox-block.jade @@ -5,5 +5,5 @@ div.form fieldset textarea.reason(placeholder="Please explain the reason") - a.button.button-green(href="") + a.button-green(href="") span Save diff --git a/app/partials/includes/components/addnewus.jade b/app/partials/includes/components/addnewus.jade index 815ca0b1..403c271c 100644 --- a/app/partials/includes/components/addnewus.jade +++ b/app/partials/includes/components/addnewus.jade @@ -1,9 +1,9 @@ div.new-us - a.button.button-green(href="", title="Add a new User Story", + a.button-green(href="", title="Add a new User Story", ng-click="ctrl.addNewUs('standard')", tg-check-permission="add_us") span.text + Add a new User Story - a.button.button-bulk(href="", title="Add some new User Stories in bulk", + a.button-bulk(href="", title="Add some new User Stories in bulk", ng-click="ctrl.addNewUs('bulk')", tg-check-permission="add_us") span.icon.icon-bulk diff --git a/app/partials/includes/components/large-summary.jade b/app/partials/includes/components/large-summary.jade index a20b326d..ed410e63 100644 --- a/app/partials/includes/components/large-summary.jade +++ b/app/partials/includes/components/large-summary.jade @@ -1,37 +1,35 @@ div.summary.large-summary - div - div.summary-progress-bar - div.current-progress - div.data - span.number 30% - span.description completed - ul - li + div.large-summary-wrapper + div + div.summary-progress-bar + div.current-progress + div.data + span.number 30% + span.description completed + div.summary-stats span.number 12 span.description project
points - li + div.summary-stats span.number 23 span.description defined
points - li + div.summary-stats span.number 12 span.description assigned
points - li + div.summary-stats.summary-stats-divider span.number 23 span.description closed
points - ul - li + div.summary-stats span.icon.icon-bulk span.number 73 span.description created
tasks - li + div.summary-stats span.number 72 span.description closed
tasks - li + div.summary-stats span.number 18 span.description remaining
tasks - ul - li + div.summary-stats span.icon.icon-iocaine span.number 10 span.description iocanie
doses diff --git a/app/partials/includes/components/sprint-summary.jade b/app/partials/includes/components/sprint-summary.jade index 585f7b25..64d6bdbb 100644 --- a/app/partials/includes/components/sprint-summary.jade +++ b/app/partials/includes/components/sprint-summary.jade @@ -1,28 +1,26 @@ div.summary.large-summary - div - div.summary-progress-bar(tg-progress-bar="stats.completedPercentage") - div.data - span.number(ng-bind="stats.completedPercentage + '%'") + div.large-summary-wrapper + div.summary-progress-wrapper + div.summary-progress-bar(tg-progress-bar="stats.completedPercentage") + div.data + span.number(ng-bind="stats.completedPercentage + '%'") - ul - li + div.summary-stats span.number(ng-bind="stats.totalPointsSum|default:'--'") span.description total
points - li + div.summary-stats span.number(ng-bind="stats.completedPointsSum|default:'--'") span.description completed
points - ul - li + div.summary-stats span.icon.icon-bulk span.number(ng-bind="stats.openTasks|default:'--'") span.description open
tasks - li + div.summary-stats span.number(ng-bind="stats.completed_tasks|default:'--'") span.description closed
tasks - ul - li(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!") + div.summary-stats(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!") span.icon.icon-iocaine span.number(ng-bind="stats.iocaine_doses|default:'--'") span.description iocaine
doses diff --git a/app/partials/includes/components/summary.jade b/app/partials/includes/components/summary.jade index 9af07112..11624d8d 100644 --- a/app/partials/includes/components/summary.jade +++ b/app/partials/includes/components/summary.jade @@ -3,16 +3,16 @@ div.summary div.data span.number(ng-bind="stats.completedPercentage + '%'") - ul - li - span.number(ng-bind="stats.total_points") -- - span.description project
points - li - span.number(ng-bind="stats.defined_points") -- - span.description defined
points - li - span.number(ng-bind="stats.closed_points") -- - span.description closed
points - li - span.number(ng-bind="stats.speed | number:0") -- - span.description points /
sprint + + div.summary-stats + span.number(ng-bind="stats.total_points") -- + span.description project
points + div.summary-stats + span.number(ng-bind="stats.defined_points") -- + span.description defined
points + div.summary-stats + span.number(ng-bind="stats.closed_points") -- + span.description closed
points + div.summary-stats + span.number(ng-bind="stats.speed | number:0") -- + span.description points /
sprint diff --git a/app/partials/includes/modules/admin-submenu-roles.jade b/app/partials/includes/modules/admin-submenu-roles.jade index b4ee5663..3b5b12e0 100644 --- a/app/partials/includes/modules/admin-submenu-roles.jade +++ b/app/partials/includes/modules/admin-submenu-roles.jade @@ -10,6 +10,6 @@ section.admin-submenu-roles span.icon.icon-arrow-right div(tg-new-role) - a.button.button-gray.add-button(href="", title="Add New Role") + a.button-gray.add-button(href="", title="Add New Role") span.text + New role input(type="text", class="hidden new") diff --git a/app/partials/includes/modules/admin-submenu.jade b/app/partials/includes/modules/admin-submenu.jade index f6b296ca..ecd19c37 100644 --- a/app/partials/includes/modules/admin-submenu.jade +++ b/app/partials/includes/modules/admin-submenu.jade @@ -20,5 +20,5 @@ section.admin-submenu a(href="") Front span.icon.icon-arrow-right - a.button.button-gray(href="", title="Add New role") + a.button-gray(href="", title="Add New role") span.text + New role diff --git a/app/partials/includes/modules/cancel-account-form.jade b/app/partials/includes/modules/cancel-account-form.jade index 5e99a94b..28f34d34 100644 --- a/app/partials/includes/modules/cancel-account-form.jade +++ b/app/partials/includes/modules/cancel-account-form.jade @@ -8,5 +8,5 @@ div.change-email-form-container(tg-cancel-account) input(type="hidden", name="cancel_token", ng-model="data.cancel_token", data-required="true", placeholder="cancel account token") - a.button.button-cancel-account.button-gray(href="", title="Yes, I'm leaving") Yes, I'm leaving! + a.button-cancel-account.button-gray(href="", title="Yes, I'm leaving") Yes, I'm leaving! button(type="submit", class="hidden") diff --git a/app/partials/includes/modules/change-email-form.jade b/app/partials/includes/modules/change-email-form.jade index 4acd78fb..bd980f8b 100644 --- a/app/partials/includes/modules/change-email-form.jade +++ b/app/partials/includes/modules/change-email-form.jade @@ -8,5 +8,5 @@ div.change-email-form-container(tg-change-email) input(type="hidden", name="email_token", ng-model="data.email_token", data-required="true", placeholder="change email token") - a.button.button-change-email.button-gray(href="", title="Change email") Change email + a.button-change-email.button-gray(href="", title="Change email") Change email button(type="submit", class="hidden") diff --git a/app/partials/includes/modules/help-notions/lightbox-generic-notion.jade b/app/partials/includes/modules/help-notions/lightbox-generic-notion.jade index 00ce3a93..1c312656 100644 --- a/app/partials/includes/modules/help-notions/lightbox-generic-notion.jade +++ b/app/partials/includes/modules/help-notions/lightbox-generic-notion.jade @@ -8,5 +8,5 @@ section block content div.options - a.button.button-green(href="", title="Accept") + a.button-green(href="", title="Accept") span Accept diff --git a/app/partials/includes/modules/lightbox-ask-choice.jade b/app/partials/includes/modules/lightbox-ask-choice.jade index 4e69be3b..815c1076 100644 --- a/app/partials/includes/modules/lightbox-ask-choice.jade +++ b/app/partials/includes/modules/lightbox-ask-choice.jade @@ -9,7 +9,7 @@ form p.warning div.options - a.button.button-green(href="", title="Accept") + a.button-green(href="", title="Accept") span Accept - a.button.button-red(href="", title="Delete") + a.button-red(href="", title="Delete") span Cancel diff --git a/app/partials/includes/modules/lightbox-attachments.jade b/app/partials/includes/modules/lightbox-attachments.jade index b8d4cd19..8e86d3d5 100644 --- a/app/partials/includes/modules/lightbox-attachments.jade +++ b/app/partials/includes/modules/lightbox-attachments.jade @@ -4,7 +4,7 @@ fieldset.attachments span.icon.icon-attachment span.attachments-num 1 span.attachments-text attachment - a.button.button-gray(href="", title="Add new attachment") + a.button-gray(href="", title="Add new attachment") span + add attachment div.attachment-body - for(var x = 0; x < 1; x++) @@ -14,4 +14,4 @@ fieldset.attachments a(href="", title="Attachment pefildeusuario.png") pefildeusuariopefildeusuariopefildeusuario.png div.attachment-comment span Comentario sobre el contenido - span.attachment-size (125kb.) \ No newline at end of file + span.attachment-size (125kb.) diff --git a/app/partials/includes/modules/lightbox-delete-project.jade b/app/partials/includes/modules/lightbox-delete-project.jade index b05fb346..843f80f7 100644 --- a/app/partials/includes/modules/lightbox-delete-project.jade +++ b/app/partials/includes/modules/lightbox-delete-project.jade @@ -6,7 +6,7 @@ form span.question Are you sure you want to delete this project? span.subtitle All project data US/Tasks/Issues/Sprints/WikiPages will be lost! :-( div.options - a.button.button-green(href="", title="Yes, I'm really sure") + a.button-green(href="", title="Yes, I'm really sure") span Yes, I'm really sure - a.button.button-red(href="", title="Cancel") + a.button-red(href="", title="Cancel") span Cancel diff --git a/app/partials/includes/modules/lightbox-generic-ask.jade b/app/partials/includes/modules/lightbox-generic-ask.jade index af346d15..e09ef2ae 100644 --- a/app/partials/includes/modules/lightbox-generic-ask.jade +++ b/app/partials/includes/modules/lightbox-generic-ask.jade @@ -6,7 +6,7 @@ form span.subtitle span.message div.options - a.button.button-green(href="", title="Accept") + a.button-green(href="", title="Accept") span Accept - a.button.button-red(href="", title="Delete") + a.button-red(href="", title="Delete") span Cancel diff --git a/app/partials/includes/modules/lightbox-generic-error.jade b/app/partials/includes/modules/lightbox-generic-error.jade index e8277d96..75fc6022 100644 --- a/app/partials/includes/modules/lightbox-generic-error.jade +++ b/app/partials/includes/modules/lightbox-generic-error.jade @@ -3,5 +3,5 @@ a.close(href="", title="close") section h2.title div.options - a.button.button-green(href="", title="Accept") + a.button-green(href="", title="Accept") span Accept diff --git a/app/partials/includes/modules/lightbox-generic-success.jade b/app/partials/includes/modules/lightbox-generic-success.jade index 02230f5d..1fd9208b 100644 --- a/app/partials/includes/modules/lightbox-generic-success.jade +++ b/app/partials/includes/modules/lightbox-generic-success.jade @@ -4,5 +4,5 @@ section h2.title p.message div.options - a.button.button-green(href="", title="Accept") + a.button-green(href="", title="Accept") span Accept 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/partials/includes/modules/list-filters-kanban.jade b/app/partials/includes/modules/list-filters-kanban.jade index f97b82e7..75151fb0 100644 --- a/app/partials/includes/modules/list-filters-kanban.jade +++ b/app/partials/includes/modules/list-filters-kanban.jade @@ -6,8 +6,7 @@ section.list-filters | SHOW FILTERS div.new-issue - a.button.button-green(href="") - span.text - | + NEW TASK + a.button-green(href="") + span.text + NEW TASK a.button-bulk(href="") span.icon.icon-bulk diff --git a/app/partials/includes/modules/list-filters.jade b/app/partials/includes/modules/list-filters.jade index f4b4d71e..459540c9 100644 --- a/app/partials/includes/modules/list-filters.jade +++ b/app/partials/includes/modules/list-filters.jade @@ -1,17 +1,6 @@ section.list-filters(tg-check-permission="add_issue") - ul - // li - // a(href="#").active - // span.icon.icon-issues - // | SHOW LIST - - // li - // a(href="#") - // span.icon.icon-graph - // | SHOW GRAPH - div.new-issue - a.button.button-green(href="", ng-click="ctrl.addNewIssue()") + a.button-green(href="", ng-click="ctrl.addNewIssue()") span.text | + NEW ISSUE a.button-bulk(href="", ng-click="ctrl.addIssuesInBulk()") diff --git a/app/partials/includes/modules/sprint.jade b/app/partials/includes/modules/sprint.jade index ab3f19f6..6ceb219f 100644 --- a/app/partials/includes/modules/sprint.jade +++ b/app/partials/includes/modules/sprint.jade @@ -12,7 +12,7 @@ div.sprint-table span(tg-bo-bind="us.subject") div.column-points.width-1(tg-bo-bind="us.total_points", ng-class="{closed: us.is_closed, blocked: us.is_blocked}") -a.button.button-gray(tg-bo-title="'Go to Taskboard of ' + sprint.name", +a.button-gray(tg-bo-title="'Go to Taskboard of ' + sprint.name", tg-nav="project-taskboard:project=project.slug,sprint=sprint.slug", tg-check-permission="view_milestones") diff --git a/app/partials/includes/modules/sprints.jade b/app/partials/includes/modules/sprints.jade index f5b147bc..2974915a 100644 --- a/app/partials/includes/modules/sprints.jade +++ b/app/partials/includes/modules/sprints.jade @@ -2,15 +2,11 @@ section.sprints header h1 SPRINTS div.summary - ul - li - span.number(ng-bind="project.total_milestones") -- - span.description
sprints - div.new-sprint - a.button.button-green(href="", title="Add New sprint", - ng-click="ctrl.addNewSprint()", - tg-check-permission="add_milestone") - span.text + New sprint + div.total-sprints + span.number(ng-bind="project.total_milestones") -- + span.description
sprints + a.button-green.add-sprint(href="", title="Add New sprint", ng-click="ctrl.addNewSprint()", tg-check-permission="add_milestone") + span.text + New sprint div.sprint.sprint-open(ng-repeat="sprint in openSprints track by sprint.id", tg-backlog-sprint="sprint", tg-sprint-sortable) include sprint diff --git a/app/partials/issue/promote-issue-to-us-button.jade b/app/partials/issue/promote-issue-to-us-button.jade index baf86991..6bbd17c5 100644 --- a/app/partials/issue/promote-issue-to-us-button.jade +++ b/app/partials/issue/promote-issue-to-us-button.jade @@ -1,2 +1,2 @@ a(class="button button-gray editable", tg-check-permission="add_us") - | Promote to User Story + span Promote to User Story diff --git a/app/partials/kanban/kanban.jade b/app/partials/kanban/kanban.jade index b8354946..606098d0 100644 --- a/app/partials/kanban/kanban.jade +++ b/app/partials/kanban/kanban.jade @@ -2,15 +2,6 @@ div.wrapper(tg-kanban, ng-controller="KanbanController as ctrl" ng-init="section='kanban'") section.main.kanban include ../includes/components/mainTitle - //- div.kanban-settings - //- // a.button.button-trans(href="", title="Filter") - //- // span.icon.icon-filter - //- // span Filters - //- //a.button.button-gray(href="", title="Filter") - //- // span Show Statistics - //-include ../includes/components/large-summary - //-include ../includes/modules/burndown - //-include ../includes/modules/list-filters-kanban include ../includes/modules/kanban-table div.lightbox.lightbox-generic-form.lb-create-edit-userstory(tg-lb-create-edit-userstory) diff --git a/app/partials/project/project-colors.jade b/app/partials/project/project-colors.jade index 9867471b..bab64a73 100644 --- a/app/partials/project/project-colors.jade +++ b/app/partials/project/project-colors.jade @@ -10,7 +10,7 @@ div.wrapper include ../includes/components/mainTitle div.project-colors-options - a.button.button-green.new-color(href="") + a.button-green.new-color(href="") span.text | + Add new status diff --git a/app/partials/project/projects.jade b/app/partials/project/projects.jade index ed120fba..f51708fa 100644 --- a/app/partials/project/projects.jade +++ b/app/partials/project/projects.jade @@ -25,10 +25,10 @@ div.home-projects-list(ng-controller="ProjectsController as ctrl") div(tg-projects-list) .create-project-button-wrapper - a.button.button-green.create-project-button(href="", ng-click="ctrl.newProject()", + a.button-green.create-project-button(href="", ng-click="ctrl.newProject()", title="Create new project") Create project div(tg-import-project-button) - a.button.button-blackish.import-project-button(href="", title="Import project") + a.button-blackish.import-project-button(href="", title="Import project") span.icon.icon-upload input.import-file.hidden(type="file") diff --git a/app/partials/task/task-detail.jade b/app/partials/task/task-detail.jade index d8ef1366..dd0075a0 100644 --- a/app/partials/task/task-detail.jade +++ b/app/partials/task/task-detail.jade @@ -4,7 +4,7 @@ div.wrapper(ng-controller="TaskDetailController as ctrl", div.us-detail-header.header-with-actions include ../includes/components/mainTitle .action-buttons - a.button.button-gray( + a.button-gray( tg-check-permission="view_milestones", href="", title="Go to taskboard", tg-nav="project-taskboard:project=project.slug,sprint=sprint.slug", diff --git a/app/partials/us/us-detail.jade b/app/partials/us/us-detail.jade index 6b706ed6..5a78e15c 100644 --- a/app/partials/us/us-detail.jade +++ b/app/partials/us/us-detail.jade @@ -4,7 +4,7 @@ div.wrapper(ng-controller="UserStoryDetailController as ctrl", div.us-detail-header.header-with-actions include ../includes/components/mainTitle .action-buttons - a.button.button-gray( + a.button-gray( tg-check-permission="view_milestones", href="", title="Go to taskboard", tg-nav="project-taskboard:project=project.slug,sprint=sprint.slug", diff --git a/app/partials/user/lightbox/lightbox-delete-account.jade b/app/partials/user/lightbox/lightbox-delete-account.jade index bd7c15af..03b3b528 100644 --- a/app/partials/user/lightbox/lightbox-delete-account.jade +++ b/app/partials/user/lightbox/lightbox-delete-account.jade @@ -6,7 +6,7 @@ form span.question Are you sure you want to delete your Taiga account? span.subtitle We're going to miss you! :-( div.options - a.button.button-green(href="", title="Accept") + a.button-green(href="", title="Accept") span Accept - a.button.button-red(href="", title="Cancel") + a.button-red(href="", title="Cancel") span Cancel diff --git a/app/partials/user/user-profile.jade b/app/partials/user/user-profile.jade index 2d6989e6..9f3dd154 100644 --- a/app/partials/user/user-profile.jade +++ b/app/partials/user/user-profile.jade @@ -20,7 +20,7 @@ div.wrapper(tg-user-profile, ng-controller="UserSettingsController as ctrl", tg-avatar-model="avatarAttachment") p The image will be cropped to 80x80px.
span.size-info.hidden(tg-bo-html="maxFileSizeMsg") - a.button.button-green.change(tg-bo-title="'Change photo. ' + maxFileSizeMsg") Change + a.button-green.change(tg-bo-title="'Change photo. ' + maxFileSizeMsg") Change a.use-gravatar Use gravatar image div.data diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss index 6a270a08..a7e371e5 100755 --- a/app/styles/components/buttons.scss +++ b/app/styles/components/buttons.scss @@ -1,80 +1,98 @@ -// Buttons components -.trans-button { - @extend %large; +.button, +%button { + @extend %medium; @extend %title; + background: transparent; + border: 0; + color: $white; + display: inline-block; + padding: .4rem 2.5rem; text-transform: uppercase; - &:hover, - &.active { - color: $green-taiga; - transition: color .3s linear; + transition: all .3s linear; + vertical-align: middle; + &:hover { + color: $white; + transition: all .3s linear; + } + &.loading { + span { + animation: loading .5s linear; + } + } + span { + color: $white; } .icon { + color: $white; margin-right: .3rem; } } -.button { +.trans-button { + @extend %medium; + @extend %title; @extend %button; + span, + .icon { + color: $blackish; + transition: color .2s linear; + } + &:hover, + &.active { + span, + .icon { + color: $green-taiga; + } + } } -button { - @extend %button; -} .submit-button { width: 100%; } .button-green { + @extend %button; background: $green-taiga; - border: 0; - color: $white; - vertical-align: middle; &:hover, &.active { background: $fresh-taiga; } - span { - color: $white; - } } -.button-gray, -a.button-gray { +.button-gray { + @extend %button; background: $gray; - &:hover { + &:hover, + &.active { background: $fresh-taiga; color: $white; } - span { - color: $white; - } } -a.button-blackish { +.button-blackish { + @extend %button; background: $blackish; color: $whitish; &:hover { background: $blackish; color: $white; } - span { - color: $white; - } } -a.button-red { +.button-red { + @extend %button; background: $red-light; &:hover { background: $red; color: $white; } - span { + .icon { color: $white; } } -a.button-block { +.button-block { background: $white; color: $red; &:hover { @@ -83,35 +101,28 @@ a.button-block { } } -a.button-bulk { +.button-bulk { @extend %button; background: $green-taiga; - font-size: 22px; - margin-left: 2px; - padding: .3rem .5rem; - vertical-align: middle; + padding: .35rem .5rem; .icon { - @extend %medium; - color: $white; margin-right: 0; } &:hover { background: $fresh-taiga; - transition: background .3s linear; } } + .button-auth { @extend %button; background: $grayer; - vertical-align: middle; - .icon, img { + .icon, + img { @extend %large; color: $white; margin-right: .5rem; - vertical-align: text-bottom; } &:hover { background: $black; - transition: background .3s linear; } } diff --git a/app/styles/components/summary.scss b/app/styles/components/summary.scss index 7eb54e96..0c50809c 100644 --- a/app/styles/components/summary.scss +++ b/app/styles/components/summary.scss @@ -1,21 +1,17 @@ .summary { - @include clearfix; + align-content: center; background: $grayer; color: $white; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; margin-bottom: 2rem; padding: 1em; - ul { - display: inline-block; - margin: 0; - padding: 0; - } - li { - display: inline-block; - margin-right: 1rem; + .summary-stats { + display: flex; + margin: 0 .5rem; } .data { - float: left; - margin-right: 1em; margin-top: 4px; .number { color: $fresh-taiga; @@ -25,29 +21,24 @@ } .icon { @extend %large; - float: left; } .number { @extend %xlarge; @extend %bold; - float: left; margin-right: .3rem; position: relative; top: 5px; } .description { - // line-height: 0; @extend %small; @extend %text; - float: left; line-height: .9rem; } } .summary-progress-bar { - background: $whitish; - float: left; + background: $white; height: 30px; margin-bottom: 0; margin-right: 10px; @@ -78,15 +69,30 @@ .large-summary { - ul { - border-right: 1px solid $whitish; + justify-content: space-between; + .large-summary-wrapper { + align-content: center; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + } + .summary-progress-wrapper { + display: flex; + } + .summary-progress-bar { + flex-basis: 200px; + min-width: 200px; + } + .summary-stats { margin-right: 1rem; - vertical-align: top; - &:last-of-type { + &:last-child { border: 0; margin: 0; } } + .summary-stats-divider { + margin-right: 2rem; + } .icon { @extend %xlarge; margin-right: .4rem; diff --git a/app/styles/dependencies/helpers.scss b/app/styles/dependencies/helpers.scss index b259563d..9440bf64 100644 --- a/app/styles/dependencies/helpers.scss +++ b/app/styles/dependencies/helpers.scss @@ -61,31 +61,6 @@ } } -.loading-spinner { - @extend %loading-spinner; -} - -%button { - @extend %medium; - @extend %title; - display: inline-block; - padding: 7px 40px 6px; - transition: background .3s linear; - text-transform: uppercase; - &:hover { - transition: background .3s linear; - } - &.loading { - span { - animation: loading .5s linear; - animation: spin 1s linear infinite; - } - } - .icon { - margin-right: .3rem; - } -} - // Background %triangled-bg { background: url('/images/bg.png') no-repeat center center; @@ -105,3 +80,7 @@ max-width: 1rem; transform-origin: 32 32; } + +.loading-spinner { + @extend %loading-spinner; +} diff --git a/app/styles/layout/backlog.scss b/app/styles/layout/backlog.scss index 324d0eb5..65941a74 100644 --- a/app/styles/layout/backlog.scss +++ b/app/styles/layout/backlog.scss @@ -1,13 +1,8 @@ -.backlog { - .new-us { - float: right; - } -} - .backlog-menu { - @include clearfix; background: $whitish; color: $blackish; + display: flex; + justify-content: space-between; margin-bottom: 1rem; padding: .5rem; .trans-button { @@ -21,4 +16,7 @@ vertical-align: middle; } } + .button-bulk { + margin-left: .2rem; + } } diff --git a/app/styles/modules/admin/admin-project-profile.scss b/app/styles/modules/admin/admin-project-profile.scss index 01049811..0339fc66 100644 --- a/app/styles/modules/admin/admin-project-profile.scss +++ b/app/styles/modules/admin/admin-project-profile.scss @@ -28,17 +28,26 @@ margin-right: .5rem; } } + // TODO: This should change when public projects available label { @extend %title; - background: $white; - border: 1px solid $whitish; - cursor: pointer; + border: 1px solid $gray-light; + cursor: not-allowed; display: block; text-align: center; + transition: all .2s linear; + span { + color: $gray-light; + } + // &:hover { + // border: 1px solid $fresh-taiga; + // } } - input { - &:checked+label { - background: $fresh-taiga; + input:checked+label { + background: $fresh-taiga; + border: 1px solid $fresh-taiga; + cursor: default; + span { color: $white; } } diff --git a/app/styles/modules/backlog/sprints.scss b/app/styles/modules/backlog/sprints.scss index cecbd7f0..c6731682 100644 --- a/app/styles/modules/backlog/sprints.scss +++ b/app/styles/modules/backlog/sprints.scss @@ -1,19 +1,17 @@ .sprints { .summary { - @include clearfix; - background: $gray-light; - ul { - width: 40%; - } - li { - color: $grayer; - } + background: darken($whitish, 10%); + display: flex; + justify-content: space-between; } - .new-sprint { - float: right; - .button { - padding: .5rem 1.5rem; - } + .total-sprints { + align-items: flex-start; + color: $grayer; + display: flex; + } + .add-sprint { + margin: 0; + padding: .3rem 1.5rem; } .filter-closed-sprints { @extend %small; 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; diff --git a/app/styles/modules/filters/list-filters.scss b/app/styles/modules/filters/list-filters.scss index 609cb8bd..56e0a7e9 100644 --- a/app/styles/modules/filters/list-filters.scss +++ b/app/styles/modules/filters/list-filters.scss @@ -2,32 +2,10 @@ align-items: center; background-color: $whitish; display: flex; - justify-content: space-between; + justify-content: flex-end; margin-bottom: 2rem; padding: .5rem 1rem; - ul { - display: flex; - margin-bottom: 0; - } - li { - margin-right: 2rem; - a { - @extend %large; - @extend %title; - opacity: .4; - &:hover { - color: $blackish; - opacity: 1; - transition: opacity .3s linear; - } - } - .active { - color: $blackish; - opacity: 1; - transition: opacity .3s linear; - } - .icon { - padding-right: .5rem; - } + .button-bulk { + margin-left: .2rem; } }