From 1602eaac52d56666438a229a92b5ac60cbe5f7dd Mon Sep 17 00:00:00 2001 From: Juanfran Date: Thu, 30 Oct 2014 12:31:54 +0100 Subject: [PATCH] scss refactor --- .../modules/admin/project-values.coffee | 15 ++++++------ app/coffee/modules/backlog/filters.coffee | 4 ++-- app/coffee/modules/issues/list.coffee | 4 ++-- app/index.jade | 8 +++---- .../admin-project-default-values.jade | 2 +- ...admin-project-values-issue-priorities.jade | 2 +- ...admin-project-values-issue-severities.jade | 2 +- .../admin-project-values-issue-status.jade | 2 +- .../admin-project-values-issue-types.jade | 2 +- .../admin-project-values-task-status.jade | 2 +- .../admin-project-values-us-points.jade | 2 +- .../admin-project-values-us-status.jade | 2 +- app/partials/admin-roles.jade | 4 ++-- app/partials/issues-detail.jade | 2 +- app/partials/mail-notifications.jade | 2 +- app/partials/task-detail.jade | 2 +- app/partials/us-detail.jade | 6 ++--- app/styles/modules/admin/admin-common.scss | 24 +++++++++++++++++++ app/styles/modules/admin/admin-roles.scss | 14 +---------- main-sass.js | 1 + 20 files changed, 58 insertions(+), 44 deletions(-) create mode 100644 app/styles/modules/admin/admin-common.scss diff --git a/app/coffee/modules/admin/project-values.coffee b/app/coffee/modules/admin/project-values.coffee index 9399e392..fdadaf35 100644 --- a/app/coffee/modules/admin/project-values.coffee +++ b/app/coffee/modules/admin/project-values.coffee @@ -166,8 +166,8 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) -> promise = $repo.save(value) promise.then => row = target.parents(".row.table-main") - row.hide() - row.siblings(".visualization").css("display": "flex") + row.addClass("hidden") + row.siblings(".visualization").removeClass('hidden') promise.then null, (data) -> $confirm.notify("error") @@ -177,9 +177,9 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) -> row = target.parents(".row.table-main") value = target.scope().value $scope.$apply -> - row.hide() + row.addClass("hidden") value.revert() - row.siblings(".visualization").css("display": "flex") + row.siblings(".visualization").removeClass('hidden') $el.on "submit", "form", (event) -> event.preventDefault() @@ -191,7 +191,7 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) -> $el.on "click", ".show-add-new", (event) -> event.preventDefault() - $el.find(".new-value").css('display': 'flex') + $el.find(".new-value").removeClass('hidden') goToBottomList(true) @@ -227,9 +227,10 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) -> target = angular.element(event.currentTarget) row = target.parents(".row.table-main") - row.hide() + row.addClass("hidden") + editionRow = row.siblings(".edition") - editionRow.css("display": "flex") + editionRow.removeClass('hidden') editionRow.find('input:visible').first().focus().select() $el.on "keyup", ".edition input", (event) -> diff --git a/app/coffee/modules/backlog/filters.coffee b/app/coffee/modules/backlog/filters.coffee index 6ce39e8e..ed2422f7 100644 --- a/app/coffee/modules/backlog/filters.coffee +++ b/app/coffee/modules/backlog/filters.coffee @@ -79,14 +79,14 @@ BacklogFiltersDirective = ($log, $location) -> showFilters = (title, type) -> $el.find(".filters-cats").hide() - $el.find(".filter-list").show() + $el.find(".filter-list").removeClass("hidden") $el.find("h2.breadcrumb").removeClass("hidden") $el.find("h2 a.subfilter span.title").html(title) $el.find("h2 a.subfilter span.title").prop("data-type", type) showCategories = -> $el.find(".filters-cats").show() - $el.find(".filter-list").hide() + $el.find(".filter-list").addClass("hidden") $el.find("h2.breadcrumb").addClass("hidden") initializeSelectedFilters = (filters) -> diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee index 09b11472..5ab0bca7 100644 --- a/app/coffee/modules/issues/list.coffee +++ b/app/coffee/modules/issues/list.coffee @@ -508,14 +508,14 @@ IssuesFiltersDirective = ($log, $location, $rs, $confirm, $loading) -> showFilters = (title, type) -> $el.find(".filters-cats").hide() - $el.find(".filter-list").show() + $el.find(".filter-list").addClass("hidden") $el.find("h2.breadcrumb").removeClass("hidden") $el.find("h2 a.subfilter span.title").html(title) $el.find("h2 a.subfilter span.title").prop("data-type", type) showCategories = -> $el.find(".filters-cats").show() - $el.find(".filter-list").hide() + $el.find(".filter-list").removeClass("hidden") $el.find("h2.breadcrumb").addClass("hidden") initializeSelectedFilters = (filters) -> diff --git a/app/index.jade b/app/index.jade index 87f42db2..3751ee53 100644 --- a/app/index.jade +++ b/app/index.jade @@ -21,13 +21,13 @@ html(lang="en", ng-app="taiga") div.master(ng-view) - div.hidden.lightbox.lightbox-generic-ask + div.lightbox.lightbox-generic-ask include partials/views/modules/lightbox-generic-ask - div.hidden.lightbox.lightbox-ask-choice + div.lightbox.lightbox-ask-choice include partials/views/modules/lightbox-ask-choice - div.hidden.lightbox.lightbox-generic-success + div.lightbox.lightbox-generic-success include partials/views/modules/lightbox-generic-success - div.hidden.lightbox.lightbox-generic-error + div.lightbox.lightbox-generic-error include partials/views/modules/lightbox-generic-error div.lightbox.lightbox-search(tg-search-box) include partials/views/modules/lightbox-search diff --git a/app/partials/admin-project-default-values.jade b/app/partials/admin-project-default-values.jade index ef74b073..e56f9089 100644 --- a/app/partials/admin-project-default-values.jade +++ b/app/partials/admin-project-default-values.jade @@ -12,7 +12,7 @@ block content sidebar.menu-tertiary.sidebar(tg-admin-navigation="default-values") include views/modules/admin-submenu-project-profile - section.main.admin-roles + section.main.admin-common header include views/components/mainTitle diff --git a/app/partials/admin-project-values-issue-priorities.jade b/app/partials/admin-project-values-issue-priorities.jade index d84446c2..d0e06689 100644 --- a/app/partials/admin-project-values-issue-priorities.jade +++ b/app/partials/admin-project-values-issue-priorities.jade @@ -13,7 +13,7 @@ block content sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-priorities") include views/modules/admin-submenu-project-values - section.main.admin-roles + section.main.admin-common include views/components/mainTitle p.admin-subtitle Specify the priority levels users can assign to issues diff --git a/app/partials/admin-project-values-issue-severities.jade b/app/partials/admin-project-values-issue-severities.jade index 800ee06d..db23a4cb 100644 --- a/app/partials/admin-project-values-issue-severities.jade +++ b/app/partials/admin-project-values-issue-severities.jade @@ -13,7 +13,7 @@ block content sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-severities") include views/modules/admin-submenu-project-values - section.main.admin-roles + section.main.admin-common include views/components/mainTitle p.admin-subtitle Specify the severity level users can select to classify issues diff --git a/app/partials/admin-project-values-issue-status.jade b/app/partials/admin-project-values-issue-status.jade index d8b5dbf1..be1440e1 100644 --- a/app/partials/admin-project-values-issue-status.jade +++ b/app/partials/admin-project-values-issue-status.jade @@ -13,7 +13,7 @@ block content sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-issue-status") include views/modules/admin-submenu-project-values - section.main.admin-roles + section.main.admin-common include views/components/mainTitle p.admin-subtitle Specify the column headers that you will use to classify Issues diff --git a/app/partials/admin-project-values-issue-types.jade b/app/partials/admin-project-values-issue-types.jade index 4aac095b..5aa01057 100644 --- a/app/partials/admin-project-values-issue-types.jade +++ b/app/partials/admin-project-values-issue-types.jade @@ -13,7 +13,7 @@ block content sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-issue-types") include views/modules/admin-submenu-project-values - section.main.admin-roles + section.main.admin-common include views/components/mainTitle p.admin-subtitle Specify the categories users can select to classify issues diff --git a/app/partials/admin-project-values-task-status.jade b/app/partials/admin-project-values-task-status.jade index ec22b611..5f06174d 100644 --- a/app/partials/admin-project-values-task-status.jade +++ b/app/partials/admin-project-values-task-status.jade @@ -13,7 +13,7 @@ block content sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-task-status") include views/modules/admin-submenu-project-values - section.main.admin-roles + section.main.admin-common include views/components/mainTitle p.admin-subtitle Specify the column headers that you will use to classify Tasks related to each User Stories diff --git a/app/partials/admin-project-values-us-points.jade b/app/partials/admin-project-values-us-points.jade index bba828bb..6c9cbe52 100644 --- a/app/partials/admin-project-values-us-points.jade +++ b/app/partials/admin-project-values-us-points.jade @@ -13,7 +13,7 @@ block content sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-us-points") include views/modules/admin-submenu-project-values - section.main.admin-roles + section.main.admin-common include views/components/mainTitle p.admin-subtitle Specify the numerical system you will use to indicate the level of difficulty for each User Story diff --git a/app/partials/admin-project-values-us-status.jade b/app/partials/admin-project-values-us-status.jade index 85387e32..3fc886ed 100644 --- a/app/partials/admin-project-values-us-status.jade +++ b/app/partials/admin-project-values-us-status.jade @@ -13,7 +13,7 @@ block content sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-us-status") include views/modules/admin-submenu-project-values - section.main.admin-roles + section.main.admin-common include views/components/mainTitle p.admin-subtitle Specify the column headers that you will use to classify User Stories diff --git a/app/partials/admin-roles.jade b/app/partials/admin-roles.jade index 2e7e8091..cb9010b2 100644 --- a/app/partials/admin-roles.jade +++ b/app/partials/admin-roles.jade @@ -11,7 +11,7 @@ block content sidebar.menu-tertiary.sidebar include views/modules/admin-submenu-roles - section.main.admin-roles + section.main.admin-roles.admin-common .header-with-actions include views/components/mainTitle .action-buttons @@ -19,7 +19,7 @@ block content div(tg-edit-role) - .edit-role.hidden + .edit-role input(type="text", value="{{ role.name }}") a.save.icon.icon-floppy(href="", title="Save") diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade index c4cdfb72..5d717f1c 100644 --- a/app/partials/issues-detail.jade +++ b/app/partials/issues-detail.jade @@ -62,6 +62,6 @@ block content on-delete-go-to-url="onDeleteGoToUrl", ng-model="issue") - div.lightbox.lightbox-block.hidden(tg-lb-block, title="Blocking issue", ng-model="issue") + div.lightbox.lightbox-block(tg-lb-block, title="Blocking issue", ng-model="issue") div.lightbox.lightbox-select-user(tg-lb-assignedto) div.lightbox.lightbox-select-user(tg-lb-watchers) diff --git a/app/partials/mail-notifications.jade b/app/partials/mail-notifications.jade index 9e8d8fd2..e03c6b6f 100644 --- a/app/partials/mail-notifications.jade +++ b/app/partials/mail-notifications.jade @@ -9,7 +9,7 @@ block content sidebar.menu-secondary.sidebar(tg-user-settings-navigation="mail-notifications") include views/modules/user-settings-menu - section.main.admin-roles + section.main.admin-common header h1 span.green(tg-bo-html="sectionName") diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade index 052648a1..65fd4c63 100644 --- a/app/partials/task-detail.jade +++ b/app/partials/task-detail.jade @@ -62,6 +62,6 @@ block content on-delete-go-to-url="onDeleteGoToUrl", ng-model="task") - div.lightbox.lightbox-block.hidden(tg-lb-block, title="Blocking task", ng-model="task") + div.lightbox.lightbox-block(tg-lb-block, title="Blocking task", ng-model="task") div.lightbox.lightbox-select-user(tg-lb-assignedto) div.lightbox.lightbox-select-user(tg-lb-watchers) diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade index 93fe31ce..ab4931c9 100644 --- a/app/partials/us-detail.jade +++ b/app/partials/us-detail.jade @@ -68,6 +68,6 @@ block content on-delete-go-to-url="onDeleteGoToUrl", ng-model="us") - div.lightbox.lightbox-block.hidden(tg-lb-block, title="Blocking us", ng-model="us") - div.lightbox.lightbox-select-user.hidden(tg-lb-assignedto) - div.lightbox.lightbox-select-user.hidden(tg-lb-watchers) + div.lightbox.lightbox-block(tg-lb-block, title="Blocking us", ng-model="us") + div.lightbox.lightbox-select-user(tg-lb-assignedto) + div.lightbox.lightbox-select-user(tg-lb-watchers) diff --git a/app/styles/modules/admin/admin-common.scss b/app/styles/modules/admin/admin-common.scss new file mode 100644 index 00000000..13756fe2 --- /dev/null +++ b/app/styles/modules/admin/admin-common.scss @@ -0,0 +1,24 @@ +.admin-common { + header { + h1 { + margin-bottom: 0; + } + } + .admin-subtitle { + color: $gray-light; + margin: 0; + } + .total { + @extend %large; + @extend %title; + background-color: $whitish; + color: $grayer; + padding: 1rem; + &:hover { + .edit-value { + @include transition(opacity .3s linear); + opacity: 1; + } + } + } +} diff --git a/app/styles/modules/admin/admin-roles.scss b/app/styles/modules/admin/admin-roles.scss index fb5b000f..29199cc9 100644 --- a/app/styles/modules/admin/admin-roles.scss +++ b/app/styles/modules/admin/admin-roles.scss @@ -1,17 +1,4 @@ .admin-roles { - .total { - @extend %large; - @extend %title; - background-color: $whitish; - color: $grayer; - padding: 1rem; - &:hover { - .edit-value { - @include transition(opacity .3s linear); - opacity: 1; - } - } - } .role-name { @extend %xlarge; @extend %title; @@ -28,6 +15,7 @@ .edit-role { @include table-flex(stretch, left, center, row, wrap); background-color: $whitish; + display: none; margin-bottom: 1rem; padding: .5rem; input { diff --git a/main-sass.js b/main-sass.js index 6c1b7bdb..b3ebd1da 100644 --- a/main-sass.js +++ b/main-sass.js @@ -111,6 +111,7 @@ exports.files = function () { //modules admin 'modules/admin/admin-menu', + 'modules/admin/admin-common', 'modules/admin/admin-submenu', 'modules/admin/admin-submenu-roles', 'modules/admin/admin-roles',