diff --git a/app/coffee/modules/common/confirm.coffee b/app/coffee/modules/common/confirm.coffee index 8834066e..dbae0425 100644 --- a/app/coffee/modules/common/confirm.coffee +++ b/app/coffee/modules/common/confirm.coffee @@ -50,7 +50,7 @@ class ConfirmService extends taiga.Service el.off(".confirm-dialog") - ask: (title, subtitle, message=null, lightboxSelector=".lightbox_confirm-delete") -> + ask: (title, subtitle, message=null, lightboxSelector=".lightbox-confirm-delete") -> el = angular.element(lightboxSelector) # Render content diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee index 4da59d18..10cad122 100644 --- a/app/coffee/modules/common/lightboxes.coffee +++ b/app/coffee/modules/common/lightboxes.coffee @@ -151,7 +151,7 @@ BlockLightboxDirective = (lightboxService) -> lightboxService.close($el) return { - templateUrl: "/partials/views/modules/lightbox_block.html" + templateUrl: "/partials/views/modules/lightbox-block.html" link:link, require:"ngModel" } @@ -563,7 +563,7 @@ WatchersLightboxDirective = ($repo, lightboxService, lightboxKeyboardNavigationS $el.off() return { - templateUrl: "/partials/views/modules/lightbox_users.html" + templateUrl: "/partials/views/modules/lightbox-users.html" link:link } diff --git a/app/index.jade b/app/index.jade index 4d589b40..6873aa92 100644 --- a/app/index.jade +++ b/app/index.jade @@ -21,8 +21,8 @@ html(lang="en", ng-app="taiga") div.master(ng-view) - div.hidden.lightbox.lightbox_confirm-delete - include partials/views/modules/lightbox_confirm-delete + div.hidden.lightbox.lightbox-confirm-delete + include partials/views/modules/lightbox-confirm-delete div.hidden.lightbox.lightbox-ask-choice include partials/views/modules/lightbox-ask-choice div.hidden.lightbox.lightbox-generic-success diff --git a/app/partials/admin-memberships.jade b/app/partials/admin-memberships.jade index fe4125f2..8eb2f94e 100644 --- a/app/partials/admin-memberships.jade +++ b/app/partials/admin-memberships.jade @@ -22,5 +22,5 @@ block content div.paginator.memberships-paginator - div.lightbox.lightbox_add-member.hidden(tg-lb-create-members) - include views/modules/lightbox_add-member + div.lightbox.lightbox-add-member.hidden(tg-lb-create-members) + include views/modules/lightbox-add-member diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade index 4bcc146b..4cc4db4c 100644 --- a/app/partials/issues-detail-edit.jade +++ b/app/partials/issues-detail-edit.jade @@ -40,7 +40,7 @@ block content a.button.button-gray.clickable(title="Click to block the issue", ng-show="!issue.is_blocked", ng-click="ctrl.block()") Block a.button.button-red(title="Click to delete the issue", tg-check-permission="delete_issue", ng-click="ctrl.delete()", href="") Delete - div.lightbox.lightbox_block.hidden(tg-lb-block, title="Blocking issue", ng-model="issue") + div.lightbox.lightbox-block.hidden(tg-lb-block, title="Blocking issue", ng-model="issue") div.lightbox.lightbox-select-user(tg-lb-assignedto) diff --git a/app/partials/task-detail-edit.jade b/app/partials/task-detail-edit.jade index 7c426f60..a056b697 100644 --- a/app/partials/task-detail-edit.jade +++ b/app/partials/task-detail-edit.jade @@ -44,6 +44,6 @@ block content a.button.button-gray.clickable(ng-show="!task.is_blocked", ng-click="ctrl.block()") Block a.button.button-red(tg-check-permission="delete_task", ng-click="ctrl.delete()", href="") Delete - div.lightbox.lightbox_block.hidden(tg-lb-block, title="Blocking task", ng-model="task") + div.lightbox.lightbox-block.hidden(tg-lb-block, title="Blocking task", ng-model="task") div.lightbox.lightbox-select-user.hidden(tg-lb-assignedto) div.lightbox.lightbox-select-user.hidden(tg-lb-watchers) diff --git a/app/partials/us-detail-edit.jade b/app/partials/us-detail-edit.jade index 21b5b489..43fe65c2 100644 --- a/app/partials/us-detail-edit.jade +++ b/app/partials/us-detail-edit.jade @@ -47,6 +47,6 @@ block content a.button.button-gray.clickable(ng-show="!us.is_blocked", ng-click="ctrl.block()") Block a.button.button-red(tg-check-permission="delete_us", ng-click="ctrl.delete()", href="") Delete - div.lightbox.lightbox_block.hidden(tg-lb-block, title="Blocking issue", ng-model="us") + div.lightbox.lightbox-block.hidden(tg-lb-block, title="Blocking issue", ng-model="us") div.lightbox.lightbox-select-user.hidden(tg-lb-assignedto) div.lightbox.lightbox-select-user.hidden(tg-lb-watchers) diff --git a/app/partials/user-profile.jade b/app/partials/user-profile.jade index 532f6ac0..9b5550c0 100644 --- a/app/partials/user-profile.jade +++ b/app/partials/user-profile.jade @@ -63,5 +63,5 @@ block content div.lightbox.lightbox-delete-account.hidden(tg-lb-delete-user) include views/modules/lightbox-delete-account - div.lightbox.lightbox_confirm-use-gravatar.hidden + div.lightbox.lightbox-confirm-use-gravatar.hidden include views/modules/lightbox-use-gravatar diff --git a/app/partials/views/modules/kanban-table.jade b/app/partials/views/modules/kanban-table.jade index 6e40e0ec..6f29b442 100644 --- a/app/partials/views/modules/kanban-table.jade +++ b/app/partials/views/modules/kanban-table.jade @@ -1,7 +1,7 @@ div.kanban-table div.kanban-table-header div.kanban-table-inner(tg-kanban-row-width-fixer) - h2.task-colum_name(ng-repeat="s in usStatusList track by s.id", + h2.task-colum-name(ng-repeat="s in usStatusList track by s.id", ng-style="{'border-top-color':s.color}") span(tg-bo-bind="s.name") diff --git a/app/partials/views/modules/lightbox_add-member.jade b/app/partials/views/modules/lightbox-add-member.jade similarity index 100% rename from app/partials/views/modules/lightbox_add-member.jade rename to app/partials/views/modules/lightbox-add-member.jade diff --git a/app/partials/views/modules/lightbox_block.jade b/app/partials/views/modules/lightbox-block.jade similarity index 100% rename from app/partials/views/modules/lightbox_block.jade rename to app/partials/views/modules/lightbox-block.jade diff --git a/app/partials/views/modules/lightbox_confirm-delete.jade b/app/partials/views/modules/lightbox-confirm-delete.jade similarity index 100% rename from app/partials/views/modules/lightbox_confirm-delete.jade rename to app/partials/views/modules/lightbox-confirm-delete.jade diff --git a/app/partials/views/modules/lightbox_users.jade b/app/partials/views/modules/lightbox-users.jade similarity index 100% rename from app/partials/views/modules/lightbox_users.jade rename to app/partials/views/modules/lightbox-users.jade diff --git a/app/partials/views/modules/taskboard-table.jade b/app/partials/views/modules/taskboard-table.jade index 41db342c..d9b913b8 100644 --- a/app/partials/views/modules/taskboard-table.jade +++ b/app/partials/views/modules/taskboard-table.jade @@ -1,8 +1,8 @@ div.taskboard-table div.taskboard-table-header div.taskboard-table-inner(tg-taskboard-row-width-fixer) - h2.task-colum_name "User story" - h2.task-colum_name(ng-repeat="s in taskStatusList track by s.id", + h2.task-colum-name "User story" + h2.task-colum-name(ng-repeat="s in taskStatusList track by s.id", ng-style="{'border-top-color':s.color}") span(tg-bo-bind="s.name") diff --git a/app/styles/modules/backlog/taskboard-table.scss b/app/styles/modules/backlog/taskboard-table.scss index 5a219c5b..6d1dcbc3 100644 --- a/app/styles/modules/backlog/taskboard-table.scss +++ b/app/styles/modules/backlog/taskboard-table.scss @@ -20,7 +20,7 @@ $column-margin: 0 10px 0 0; overflow: hidden; position: absolute; } - .task-colum_name { + .task-colum-name { @include table-flex-child($column-flex, $column-width, $column-shrink, $column-width); @extend %large; background: $whitish; diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss index 7bb1210a..f5de2abe 100644 --- a/app/styles/modules/common/lightbox.scss +++ b/app/styles/modules/common/lightbox.scss @@ -188,7 +188,7 @@ } } -.lightbox_add-member { +.lightbox-add-member { .add-member-wrapper { @include table-flex(); } @@ -283,7 +283,7 @@ } } -.lightbox_confirm-delete { +.lightbox-confirm-delete { form { @include table-flex-child(0, 420px, 0, 420px); } @@ -341,7 +341,7 @@ } } -.lightbox_confirm-use-gravatar { +.lightbox-confirm-use-gravatar { form { @include table-flex-child(0, 420px, 0, 420px); } @@ -456,7 +456,7 @@ } } -.lightbox_block { +.lightbox-block { .form { @include table-flex-child(0, 420px, 0, 420px); }