From c2c7fdf67d0ca7b74343a5efa8b0ccbf8ea7c529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Mon, 27 Apr 2015 11:09:07 +0200 Subject: [PATCH] Dropdown project list import button --- .../dropdown-project-list.jade | 14 +++++++------- app/modules/navigation-bar/navigation-bar.scss | 18 +++++++++++++----- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade b/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade index 08f376b3..375a9c1d 100644 --- a/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade +++ b/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade @@ -14,13 +14,13 @@ div.navbar-dropdown.dropdown-project-list title="{{'PROJECT.NAVIGATION.SEE_MORE_PROJECTS' | translate}}", translate="PROJECT.NAVIGATION.SEE_MORE_PROJECTS") - a.create-project-btn.button-green( - href="#", - ng-click="vm.newProject()", - title="{{'PROJECT.NAVIGATION.ACTION_CREATE_PROJECT' | translate}}", - translate="PROJECT.NAVIGATION.ACTION_CREATE_PROJECT") + div.create-options + a.create-project-btn.button-green( + href="#", + ng-click="vm.newProject()", + title="{{'PROJECT.NAVIGATION.ACTION_CREATE_PROJECT' | translate}}", + translate="PROJECT.NAVIGATION.ACTION_CREATE_PROJECT") - div(tg-import-project-button) - a.button-blackish.import-project-button(href="", title="{{'PROJECT.NAVIGATION.TITLE_ACTION_IMPORT' | translate}}") + a.button-blackish.import-project-button(href="", title="{{'PROJECT.NAVIGATION.TITLE_ACTION_IMPORT' | translate}}", tg-import-project-button) span.icon.icon-upload input.import-file.hidden(type="file") diff --git a/app/modules/navigation-bar/navigation-bar.scss b/app/modules/navigation-bar/navigation-bar.scss index 19c95bd6..0338b765 100644 --- a/app/modules/navigation-bar/navigation-bar.scss +++ b/app/modules/navigation-bar/navigation-bar.scss @@ -43,11 +43,6 @@ a { padding: .5rem 2rem; } - .navbar-dropdown { - a { - padding: .8rem .5rem; - } - } } a { color: $white; @@ -124,6 +119,7 @@ a { color: $gray-light; display: block; + padding: .8rem .5rem; &:hover { background: rgba($white, .1); color: $fresh-taiga; @@ -141,5 +137,17 @@ &.see-more-projects-btn { margin-bottom: .3rem; } + &.create-project-btn { + flex: 1; + } + &.import-project-button { + padding-left: .75rem; + padding-right: .75rem; + } + + } + .create-options { + display: flex; + flex-direction: row; } }