From 6f9ffdd327dbbc77456a490abefca241bb1b39ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 6 Nov 2014 16:12:22 +0100 Subject: [PATCH] Team Filters module --- .../views/modules/team/team-filters.jade | 40 +++++++++++++++++++ app/partials/views/team/team.jade | 4 +- app/styles/extras/dependencies.scss | 6 +-- app/styles/modules/team/team-filters.scss | 36 +++++++++++++++++ gulpfile.coffee | 4 +- main-sass.js | 3 ++ 6 files changed, 87 insertions(+), 6 deletions(-) create mode 100644 app/partials/views/modules/team/team-filters.jade create mode 100644 app/styles/modules/team/team-filters.scss diff --git a/app/partials/views/modules/team/team-filters.jade b/app/partials/views/modules/team/team-filters.jade new file mode 100644 index 00000000..6f4a93d6 --- /dev/null +++ b/app/partials/views/modules/team/team-filters.jade @@ -0,0 +1,40 @@ +section.team-filters + div.team-filters-inner + header + h1 filters + + form.search-in + fieldset + input(type="text", placeholder="Search by username or role...") + a.icon.icon-search(href="", title="search") + + nav + ul + li + a(href="", title="") + span.title Team + span.icon.icon-arrow-right + li + a(href="", title="") + span.title UX + span.icon.icon-arrow-right + li + a(href="", title="") + span.title Design + span.icon.icon-arrow-right + li + a(href="", title="") + span.title Front + span.icon.icon-arrow-right + li + a(href="", title="") + span.title Back + span.icon.icon-arrow-right + li + a(href="", title="") + span.title Product Owner + span.icon.icon-arrow-right + li + a(href="", title="") + span.title StakeHolders + span.icon.icon-arrow-right diff --git a/app/partials/views/team/team.jade b/app/partials/views/team/team.jade index ee552348..1da24898 100644 --- a/app/partials/views/team/team.jade +++ b/app/partials/views/team/team.jade @@ -5,4 +5,6 @@ block head block content div.wrapper(ng-controller="TeamController as ctrl", ng-init="section='team'") - div Team + sidebar.menu-secondary + include ../modules/team/team-filters + section.main.backlog diff --git a/app/styles/extras/dependencies.scss b/app/styles/extras/dependencies.scss index 89a7026d..6d90bfb8 100644 --- a/app/styles/extras/dependencies.scss +++ b/app/styles/extras/dependencies.scss @@ -1,9 +1,9 @@ // Bourbon $prefix-for-webkit: true; $prefix-for-mozilla: true; -$prefix-for-microsoft: true; -$prefix-for-opera: true; -$prefix-for-spec: true; +//$prefix-for-microsoft: true; +//$prefix-for-opera: true; +//$prefix-for-spec: true; @import '../bourbon/bourbon'; //################################################# diff --git a/app/styles/modules/team/team-filters.scss b/app/styles/modules/team/team-filters.scss new file mode 100644 index 00000000..e0adda09 --- /dev/null +++ b/app/styles/modules/team/team-filters.scss @@ -0,0 +1,36 @@ +.team-filters { + .search-in { + margin-bottom: 1rem; + position: relative; + } + nav { + li { + @extend %larger; + @extend %title; + border-bottom: 1px solid $gray-light; + text-transform: uppercase; + &:last-child { + border-bottom: 0; + } + } + a { + display: block; + padding: 1rem 0 1rem 1rem; + &:hover { + .icon { + @include transition (opacity .3s linear); + opacity: 1; + } + } + } + .active { + @include transition (opacity .3s linear); + opacity: 1; + } + .icon { + color: $blackish; + float: right; + opacity: 0; + } + } +} diff --git a/gulpfile.coffee b/gulpfile.coffee index f00c0f73..b5804bbc 100644 --- a/gulpfile.coffee +++ b/gulpfile.coffee @@ -156,8 +156,8 @@ gulp.task "sass-compile", ["sass-lint"], -> .pipe(gulp.dest(paths.tmpStyles)) csslintChannel = lazypipe() - .pipe(csslint, "csslintrc.json") - .pipe(csslint.reporter) + .pipe(csslint, "csslintrc.json") + .pipe(csslint.reporter) gulp.task "css-lint-app", -> gulp.src(mainSass.concat([paths.tmpStylesExtras])) diff --git a/main-sass.js b/main-sass.js index 2693462e..b6944227 100644 --- a/main-sass.js +++ b/main-sass.js @@ -129,6 +129,9 @@ exports.files = function () { 'modules/user-settings/user-change-password', 'modules/user-settings/mail-notifications-table', + //Team + 'modules/team/team-filters', + //################################################# // Help //#################################################