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

Fixes in filters styles

stable
Xavier Julián 2014-07-31 10:10:53 +02:00
parent 747d55c172
commit 88ccc4b153
9 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,13 +75,13 @@ BacklogFiltersDirective = ($log, $location) ->
showFilters = (title) -> showFilters = (title) ->
$el.find(".filters-cats").hide() $el.find(".filters-cats").hide()
$el.find(".filter-list").show() $el.find(".filter-list").show()
$el.find("h1 a.subfilter").removeClass("hidden") $el.find("h2 a.subfilter").removeClass("hidden")
$el.find("h1 a.subfilter span.title").html(title) $el.find("h2 a.subfilter span.title").html(title)
showCategories = -> showCategories = ->
$el.find(".filters-cats").show() $el.find(".filters-cats").show()
$el.find(".filter-list").hide() $el.find(".filter-list").hide()
$el.find("h1 a.subfilter").addClass("hidden") $el.find("h2 a.subfilter").addClass("hidden")
initializeSelectedFilters = (filters) -> initializeSelectedFilters = (filters) ->
for name, values of filters for name, values of filters

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

@ -404,13 +404,13 @@ IssuesFiltersDirective = ($log, $location) ->
showFilters = (title) -> showFilters = (title) ->
$el.find(".filters-cats").hide() $el.find(".filters-cats").hide()
$el.find(".filter-list").show() $el.find(".filter-list").show()
$el.find("h1 a.subfilter").removeClass("hidden") $el.find("h2 a.subfilter").removeClass("hidden")
$el.find("h1 a.subfilter span.title").html(title) $el.find("h2 a.subfilter span.title").html(title)
showCategories = -> showCategories = ->
$el.find(".filters-cats").show() $el.find(".filters-cats").show()
$el.find(".filter-list").hide() $el.find(".filter-list").hide()
$el.find("h1 a.subfilter").addClass("hidden") $el.find("h2 a.subfilter").addClass("hidden")
initializeSelectedFilters = (filters) -> initializeSelectedFilters = (filters) ->
for name, values of filters for name, values of filters

7
app/partials/views/modules/backlog-filters.jade
View File

@ -2,9 +2,7 @@ section.filters
div.filters-inner div.filters-inner
h1 h1
a.title(href="", title="back to categories") filters a.title(href="", title="back to categories") filters
a.hidden.subfilter(href="", title="cat-name")
span.icon.icon-arrow-right
span.title status
form form
fieldset fieldset
input(type="text", placeholder="Search by subject...", ng-model="filtersSubject") input(type="text", placeholder="Search by subject...", ng-model="filtersSubject")
@ -12,6 +10,9 @@ section.filters
div.filters-step-cat div.filters-step-cat
div.filters-applied div.filters-applied
h2
a.hidden.subfilter(href="", title="cat-name")
span.title status
div.filters-cats div.filters-cats
ul ul
li li

10
app/partials/views/modules/filters.jade
View File

@ -1,18 +1,18 @@
// This template is now not used. It is replaced with // This template is now not used. It is replaced with
// filters-issues.jade and filters-backlog.jade. // issues-filters.jade and filters-backlog.jade.
section.filters section.filters
div.filters-inner div.filters-inner
h1 h1
a.title(href="", title="back to categories") filters a.title(href="", title="back to categories") filters
a.hidden.subfilter(href="", title="cat-name")
span.icon.icon-arrow-right
span.title status
form form
fieldset fieldset
input(type="text", placeholder="Search by subject...", ng-model="filtersSubject") input(type="text", placeholder="Search by subject...", ng-model="filtersSubject")
a.icon.icon-search(href="", title="search") a.icon.icon-search(href="", title="search")
h2
a.hidden(href="", title="cat-name")
span.title status
div.filters-step-cat div.filters-step-cat
div.filters-applied div.filters-applied
div.filters-cats div.filters-cats

7
app/partials/views/modules/issues-filters.jade
View File

@ -2,16 +2,15 @@ section.filters
div.filters-inner div.filters-inner
h1 h1
a.title(href="", title="back to categories") filters a.title(href="", title="back to categories") filters
a.hidden.subfilter(href="", title="cat-name")
span.icon.icon-arrow-right
span.title status
form form
fieldset fieldset
input(type="text", placeholder="Search by subject...", ng-model="filtersSubject") input(type="text", placeholder="Search by subject...", ng-model="filtersSubject")
a.icon.icon-search(href="", title="search") a.icon.icon-search(href="", title="search")
div.filters-step-cat div.filters-step-cat
div.filters-applied div.filters-applied
h2
a.hidden.subfilter(href="", title="cat-name")
span.title status
div.filters-cats div.filters-cats
ul ul
li li

1
app/styles/modules/admin/admin-project-profile.scss
View File

@ -2,7 +2,6 @@
input[type="text"], input[type="text"],
textarea { textarea {
@extend %title; @extend %title;
background-color: $very-light-gray;
} }
fieldset { fieldset {
@include table-flex(); @include table-flex();

2
app/styles/modules/backlog/sprints.scss
View File

@ -221,6 +221,6 @@
@include slide(1000px, overflow-y); @include slide(1000px, overflow-y);
} }
.button-gray { .button-gray {
background: lighten($grayer, 40%); background: $very-light-gray;
} }
} }

20
app/styles/modules/filters/filters.scss
View File

@ -19,9 +19,6 @@
.filters { .filters {
h1 { h1 {
vertical-align: baseline; vertical-align: baseline;
.subfilter {
@extend %large;
}
.icon { .icon {
margin: 0; margin: 0;
} }
@ -29,8 +26,21 @@
vertical-align: baseline; vertical-align: baseline;
} }
} }
h2 {
margin-top: 1rem;
.subfilter {
@extend %large;
}
}
form { form {
input {
background: $grayer;
@include placeholder {
color: $gray-light;
}
}
.icon-search { .icon-search {
color: $gray-light;
position: absolute; position: absolute;
right: .7rem; right: .7rem;
top: .7rem; top: .7rem;
@ -50,10 +60,6 @@
} }
} }
.filter-list {
margin-top: 2rem;
}
.filters-cats { .filters-cats {
margin-top: 2rem; margin-top: 2rem;
li { li {

7
app/styles/modules/wiki/wiki-nav.scss
View File

@ -23,6 +23,13 @@
float: right; float: right;
opacity: 0; opacity: 0;
} }
input {
background: $grayer;
color: $whitish;
@include placeholder {
color: $gray-light;
}
}
} }
.button { .button {
color: $white; color: $white;