From 88ccc4b1538960b42c3f10e11b53d9598b9d85cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 31 Jul 2014 10:10:53 +0200 Subject: [PATCH] Fixes in filters styles --- app/coffee/modules/backlog/filters.coffee | 6 +++--- app/coffee/modules/issues/list.coffee | 6 +++--- .../views/modules/backlog-filters.jade | 7 ++++--- app/partials/views/modules/filters.jade | 10 +++++----- .../views/modules/issues-filters.jade | 7 +++---- .../modules/admin/admin-project-profile.scss | 1 - app/styles/modules/backlog/sprints.scss | 2 +- app/styles/modules/filters/filters.scss | 20 ++++++++++++------- app/styles/modules/wiki/wiki-nav.scss | 7 +++++++ 9 files changed, 39 insertions(+), 27 deletions(-) diff --git a/app/coffee/modules/backlog/filters.coffee b/app/coffee/modules/backlog/filters.coffee index 68d8405a..0ed28db6 100644 --- a/app/coffee/modules/backlog/filters.coffee +++ b/app/coffee/modules/backlog/filters.coffee @@ -75,13 +75,13 @@ BacklogFiltersDirective = ($log, $location) -> showFilters = (title) -> $el.find(".filters-cats").hide() $el.find(".filter-list").show() - $el.find("h1 a.subfilter").removeClass("hidden") - $el.find("h1 a.subfilter span.title").html(title) + $el.find("h2 a.subfilter").removeClass("hidden") + $el.find("h2 a.subfilter span.title").html(title) showCategories = -> $el.find(".filters-cats").show() $el.find(".filter-list").hide() - $el.find("h1 a.subfilter").addClass("hidden") + $el.find("h2 a.subfilter").addClass("hidden") initializeSelectedFilters = (filters) -> for name, values of filters diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee index bcede694..b2292a5f 100644 --- a/app/coffee/modules/issues/list.coffee +++ b/app/coffee/modules/issues/list.coffee @@ -404,13 +404,13 @@ IssuesFiltersDirective = ($log, $location) -> showFilters = (title) -> $el.find(".filters-cats").hide() $el.find(".filter-list").show() - $el.find("h1 a.subfilter").removeClass("hidden") - $el.find("h1 a.subfilter span.title").html(title) + $el.find("h2 a.subfilter").removeClass("hidden") + $el.find("h2 a.subfilter span.title").html(title) showCategories = -> $el.find(".filters-cats").show() $el.find(".filter-list").hide() - $el.find("h1 a.subfilter").addClass("hidden") + $el.find("h2 a.subfilter").addClass("hidden") initializeSelectedFilters = (filters) -> for name, values of filters diff --git a/app/partials/views/modules/backlog-filters.jade b/app/partials/views/modules/backlog-filters.jade index deddaf9b..aa98ad52 100644 --- a/app/partials/views/modules/backlog-filters.jade +++ b/app/partials/views/modules/backlog-filters.jade @@ -2,9 +2,7 @@ section.filters div.filters-inner h1 a.title(href="", title="back to categories") filters - a.hidden.subfilter(href="", title="cat-name") - span.icon.icon-arrow-right - span.title status + form fieldset input(type="text", placeholder="Search by subject...", ng-model="filtersSubject") @@ -12,6 +10,9 @@ section.filters div.filters-step-cat div.filters-applied + h2 + a.hidden.subfilter(href="", title="cat-name") + span.title status div.filters-cats ul li diff --git a/app/partials/views/modules/filters.jade b/app/partials/views/modules/filters.jade index df362b9b..79b70554 100644 --- a/app/partials/views/modules/filters.jade +++ b/app/partials/views/modules/filters.jade @@ -1,18 +1,18 @@ // 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 div.filters-inner h1 a.title(href="", title="back to categories") filters - a.hidden.subfilter(href="", title="cat-name") - span.icon.icon-arrow-right - span.title status + form fieldset input(type="text", placeholder="Search by subject...", ng-model="filtersSubject") a.icon.icon-search(href="", title="search") - + h2 + a.hidden(href="", title="cat-name") + span.title status div.filters-step-cat div.filters-applied div.filters-cats diff --git a/app/partials/views/modules/issues-filters.jade b/app/partials/views/modules/issues-filters.jade index b9d650e0..13a9a2d1 100644 --- a/app/partials/views/modules/issues-filters.jade +++ b/app/partials/views/modules/issues-filters.jade @@ -2,16 +2,15 @@ section.filters div.filters-inner h1 a.title(href="", title="back to categories") filters - a.hidden.subfilter(href="", title="cat-name") - span.icon.icon-arrow-right - span.title status form fieldset input(type="text", placeholder="Search by subject...", ng-model="filtersSubject") a.icon.icon-search(href="", title="search") - div.filters-step-cat div.filters-applied + h2 + a.hidden.subfilter(href="", title="cat-name") + span.title status div.filters-cats ul li diff --git a/app/styles/modules/admin/admin-project-profile.scss b/app/styles/modules/admin/admin-project-profile.scss index 0a441a84..39d266cb 100644 --- a/app/styles/modules/admin/admin-project-profile.scss +++ b/app/styles/modules/admin/admin-project-profile.scss @@ -2,7 +2,6 @@ input[type="text"], textarea { @extend %title; - background-color: $very-light-gray; } fieldset { @include table-flex(); diff --git a/app/styles/modules/backlog/sprints.scss b/app/styles/modules/backlog/sprints.scss index dbdc7046..521a8578 100644 --- a/app/styles/modules/backlog/sprints.scss +++ b/app/styles/modules/backlog/sprints.scss @@ -221,6 +221,6 @@ @include slide(1000px, overflow-y); } .button-gray { - background: lighten($grayer, 40%); + background: $very-light-gray; } } diff --git a/app/styles/modules/filters/filters.scss b/app/styles/modules/filters/filters.scss index 4a9554a9..ca01a5f7 100644 --- a/app/styles/modules/filters/filters.scss +++ b/app/styles/modules/filters/filters.scss @@ -19,9 +19,6 @@ .filters { h1 { vertical-align: baseline; - .subfilter { - @extend %large; - } .icon { margin: 0; } @@ -29,8 +26,21 @@ vertical-align: baseline; } } + h2 { + margin-top: 1rem; + .subfilter { + @extend %large; + } + } form { + input { + background: $grayer; + @include placeholder { + color: $gray-light; + } + } .icon-search { + color: $gray-light; position: absolute; right: .7rem; top: .7rem; @@ -50,10 +60,6 @@ } } -.filter-list { - margin-top: 2rem; -} - .filters-cats { margin-top: 2rem; li { diff --git a/app/styles/modules/wiki/wiki-nav.scss b/app/styles/modules/wiki/wiki-nav.scss index 10928487..a8e53663 100644 --- a/app/styles/modules/wiki/wiki-nav.scss +++ b/app/styles/modules/wiki/wiki-nav.scss @@ -23,6 +23,13 @@ float: right; opacity: 0; } + input { + background: $grayer; + color: $whitish; + @include placeholder { + color: $gray-light; + } + } } .button { color: $white;