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

scss refactor

stable
Juanfran 2014-10-30 12:31:54 +01:00
parent 54ce888ee4
commit 1602eaac52
20 changed files with 58 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/coffee/modules/admin/project-values.coffee
View File

@ -166,8 +166,8 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) ->
promise = $repo.save(value) promise = $repo.save(value)
promise.then => promise.then =>
row = target.parents(".row.table-main") row = target.parents(".row.table-main")
row.hide() row.addClass("hidden")
row.siblings(".visualization").css("display": "flex") row.siblings(".visualization").removeClass('hidden')
promise.then null, (data) -> promise.then null, (data) ->
$confirm.notify("error") $confirm.notify("error")
@ -177,9 +177,9 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) ->
row = target.parents(".row.table-main") row = target.parents(".row.table-main")
value = target.scope().value value = target.scope().value
$scope.$apply -> $scope.$apply ->
row.hide() row.addClass("hidden")
value.revert() value.revert()
row.siblings(".visualization").css("display": "flex") row.siblings(".visualization").removeClass('hidden')
$el.on "submit", "form", (event) -> $el.on "submit", "form", (event) ->
event.preventDefault() event.preventDefault()
@ -191,7 +191,7 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) ->
$el.on "click", ".show-add-new", (event) -> $el.on "click", ".show-add-new", (event) ->
event.preventDefault() event.preventDefault()
$el.find(".new-value").css('display': 'flex') $el.find(".new-value").removeClass('hidden')
goToBottomList(true) goToBottomList(true)
@ -227,9 +227,10 @@ ProjectValuesDirective = ($log, $repo, $confirm, $location, animationFrame) ->
target = angular.element(event.currentTarget) target = angular.element(event.currentTarget)
row = target.parents(".row.table-main") row = target.parents(".row.table-main")
row.hide() row.addClass("hidden")
editionRow = row.siblings(".edition") editionRow = row.siblings(".edition")
editionRow.css("display": "flex") editionRow.removeClass('hidden')
editionRow.find('input:visible').first().focus().select() editionRow.find('input:visible').first().focus().select()
$el.on "keyup", ".edition input", (event) -> $el.on "keyup", ".edition input", (event) ->

4
app/coffee/modules/backlog/filters.coffee
View File

@ -79,14 +79,14 @@ BacklogFiltersDirective = ($log, $location) ->
showFilters = (title, type) -> showFilters = (title, type) ->
$el.find(".filters-cats").hide() $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.breadcrumb").removeClass("hidden")
$el.find("h2 a.subfilter span.title").html(title) $el.find("h2 a.subfilter span.title").html(title)
$el.find("h2 a.subfilter span.title").prop("data-type", type) $el.find("h2 a.subfilter span.title").prop("data-type", type)
showCategories = -> showCategories = ->
$el.find(".filters-cats").show() $el.find(".filters-cats").show()
$el.find(".filter-list").hide() $el.find(".filter-list").addClass("hidden")
$el.find("h2.breadcrumb").addClass("hidden") $el.find("h2.breadcrumb").addClass("hidden")
initializeSelectedFilters = (filters) -> initializeSelectedFilters = (filters) ->

4
app/coffee/modules/issues/list.coffee
View File

@ -508,14 +508,14 @@ IssuesFiltersDirective = ($log, $location, $rs, $confirm, $loading) ->
showFilters = (title, type) -> showFilters = (title, type) ->
$el.find(".filters-cats").hide() $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.breadcrumb").removeClass("hidden")
$el.find("h2 a.subfilter span.title").html(title) $el.find("h2 a.subfilter span.title").html(title)
$el.find("h2 a.subfilter span.title").prop("data-type", type) $el.find("h2 a.subfilter span.title").prop("data-type", type)
showCategories = -> showCategories = ->
$el.find(".filters-cats").show() $el.find(".filters-cats").show()
$el.find(".filter-list").hide() $el.find(".filter-list").removeClass("hidden")
$el.find("h2.breadcrumb").addClass("hidden") $el.find("h2.breadcrumb").addClass("hidden")
initializeSelectedFilters = (filters) -> initializeSelectedFilters = (filters) ->

8
app/index.jade
View File

@ -21,13 +21,13 @@ html(lang="en", ng-app="taiga")
div.master(ng-view) div.master(ng-view)
div.hidden.lightbox.lightbox-generic-ask div.lightbox.lightbox-generic-ask
include partials/views/modules/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 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 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 include partials/views/modules/lightbox-generic-error
div.lightbox.lightbox-search(tg-search-box) div.lightbox.lightbox-search(tg-search-box)
include partials/views/modules/lightbox-search include partials/views/modules/lightbox-search

2
app/partials/admin-project-default-values.jade
View File

@ -12,7 +12,7 @@ block content
sidebar.menu-tertiary.sidebar(tg-admin-navigation="default-values") sidebar.menu-tertiary.sidebar(tg-admin-navigation="default-values")
include views/modules/admin-submenu-project-profile include views/modules/admin-submenu-project-profile
section.main.admin-roles section.main.admin-common
header header
include views/components/mainTitle include views/components/mainTitle

2
app/partials/admin-project-values-issue-priorities.jade
View File

@ -13,7 +13,7 @@ block content
sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-priorities") sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-priorities")
include views/modules/admin-submenu-project-values include views/modules/admin-submenu-project-values
section.main.admin-roles section.main.admin-common
include views/components/mainTitle include views/components/mainTitle
p.admin-subtitle Specify the priority levels users can assign to issues p.admin-subtitle Specify the priority levels users can assign to issues

2
app/partials/admin-project-values-issue-severities.jade
View File

@ -13,7 +13,7 @@ block content
sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-severities") sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-severities")
include views/modules/admin-submenu-project-values include views/modules/admin-submenu-project-values
section.main.admin-roles section.main.admin-common
include views/components/mainTitle include views/components/mainTitle
p.admin-subtitle Specify the severity level users can select to classify issues p.admin-subtitle Specify the severity level users can select to classify issues

2
app/partials/admin-project-values-issue-status.jade
View File

@ -13,7 +13,7 @@ block content
sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-issue-status") sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-issue-status")
include views/modules/admin-submenu-project-values include views/modules/admin-submenu-project-values
section.main.admin-roles section.main.admin-common
include views/components/mainTitle include views/components/mainTitle
p.admin-subtitle Specify the column headers that you will use to classify Issues p.admin-subtitle Specify the column headers that you will use to classify Issues

2
app/partials/admin-project-values-issue-types.jade
View File

@ -13,7 +13,7 @@ block content
sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-issue-types") sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-issue-types")
include views/modules/admin-submenu-project-values include views/modules/admin-submenu-project-values
section.main.admin-roles section.main.admin-common
include views/components/mainTitle include views/components/mainTitle
p.admin-subtitle Specify the categories users can select to classify issues p.admin-subtitle Specify the categories users can select to classify issues

2
app/partials/admin-project-values-task-status.jade
View File

@ -13,7 +13,7 @@ block content
sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-task-status") sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-task-status")
include views/modules/admin-submenu-project-values include views/modules/admin-submenu-project-values
section.main.admin-roles section.main.admin-common
include views/components/mainTitle include views/components/mainTitle
p.admin-subtitle Specify the column headers that you will use to classify Tasks related to each User Stories p.admin-subtitle Specify the column headers that you will use to classify Tasks related to each User Stories

2
app/partials/admin-project-values-us-points.jade
View File

@ -13,7 +13,7 @@ block content
sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-us-points") sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-us-points")
include views/modules/admin-submenu-project-values include views/modules/admin-submenu-project-values
section.main.admin-roles section.main.admin-common
include views/components/mainTitle include views/components/mainTitle
p.admin-subtitle Specify the numerical system you will use to indicate the level of difficulty for each User Story p.admin-subtitle Specify the numerical system you will use to indicate the level of difficulty for each User Story

2
app/partials/admin-project-values-us-status.jade
View File

@ -13,7 +13,7 @@ block content
sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-us-status") sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-us-status")
include views/modules/admin-submenu-project-values include views/modules/admin-submenu-project-values
section.main.admin-roles section.main.admin-common
include views/components/mainTitle include views/components/mainTitle
p.admin-subtitle Specify the column headers that you will use to classify User Stories p.admin-subtitle Specify the column headers that you will use to classify User Stories

4
app/partials/admin-roles.jade
View File

@ -11,7 +11,7 @@ block content
sidebar.menu-tertiary.sidebar sidebar.menu-tertiary.sidebar
include views/modules/admin-submenu-roles include views/modules/admin-submenu-roles
section.main.admin-roles section.main.admin-roles.admin-common
.header-with-actions .header-with-actions
include views/components/mainTitle include views/components/mainTitle
.action-buttons .action-buttons
@ -19,7 +19,7 @@ block content
div(tg-edit-role) div(tg-edit-role)
.edit-role.hidden .edit-role
input(type="text", value="{{ role.name }}") input(type="text", value="{{ role.name }}")
a.save.icon.icon-floppy(href="", title="Save") a.save.icon.icon-floppy(href="", title="Save")

2
app/partials/issues-detail.jade
View File

@ -62,6 +62,6 @@ block content
on-delete-go-to-url="onDeleteGoToUrl", on-delete-go-to-url="onDeleteGoToUrl",
ng-model="issue") 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-assignedto)
div.lightbox.lightbox-select-user(tg-lb-watchers) div.lightbox.lightbox-select-user(tg-lb-watchers)

2
app/partials/mail-notifications.jade
View File

@ -9,7 +9,7 @@ block content
sidebar.menu-secondary.sidebar(tg-user-settings-navigation="mail-notifications") sidebar.menu-secondary.sidebar(tg-user-settings-navigation="mail-notifications")
include views/modules/user-settings-menu include views/modules/user-settings-menu
section.main.admin-roles section.main.admin-common
header header
h1 h1
span.green(tg-bo-html="sectionName") span.green(tg-bo-html="sectionName")

2
app/partials/task-detail.jade
View File

@ -62,6 +62,6 @@ block content
on-delete-go-to-url="onDeleteGoToUrl", on-delete-go-to-url="onDeleteGoToUrl",
ng-model="task") 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-assignedto)
div.lightbox.lightbox-select-user(tg-lb-watchers) div.lightbox.lightbox-select-user(tg-lb-watchers)

6
app/partials/us-detail.jade
View File

@ -68,6 +68,6 @@ block content
on-delete-go-to-url="onDeleteGoToUrl", on-delete-go-to-url="onDeleteGoToUrl",
ng-model="us") ng-model="us")
div.lightbox.lightbox-block.hidden(tg-lb-block, title="Blocking us", ng-model="us") div.lightbox.lightbox-block(tg-lb-block, title="Blocking us", ng-model="us")
div.lightbox.lightbox-select-user.hidden(tg-lb-assignedto) div.lightbox.lightbox-select-user(tg-lb-assignedto)
div.lightbox.lightbox-select-user.hidden(tg-lb-watchers) div.lightbox.lightbox-select-user(tg-lb-watchers)

24
app/styles/modules/admin/admin-common.scss Normal file
View File

@ -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;
}
}
}
}

14
app/styles/modules/admin/admin-roles.scss
View File

@ -1,17 +1,4 @@
.admin-roles { .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 { .role-name {
@extend %xlarge; @extend %xlarge;
@extend %title; @extend %title;
@ -28,6 +15,7 @@
.edit-role { .edit-role {
@include table-flex(stretch, left, center, row, wrap); @include table-flex(stretch, left, center, row, wrap);
background-color: $whitish; background-color: $whitish;
display: none;
margin-bottom: 1rem; margin-bottom: 1rem;
padding: .5rem; padding: .5rem;
input { input {

1
main-sass.js
View File

@ -111,6 +111,7 @@ exports.files = function () {
//modules admin //modules admin
'modules/admin/admin-menu', 'modules/admin/admin-menu',
'modules/admin/admin-common',
'modules/admin/admin-submenu', 'modules/admin/admin-submenu',
'modules/admin/admin-submenu-roles', 'modules/admin/admin-submenu-roles',
'modules/admin/admin-roles', 'modules/admin/admin-roles',