From e7886cdcb37575772f2712eab7c3bec97fb28489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 25 Sep 2014 17:16:43 +0200 Subject: [PATCH] Added logo in navigation page --- app/coffee/modules/nav.coffee | 13 +++++---- app/styles/modules/common/nav.scss | 14 ++++++---- app/svg/logo-nav.svg | 44 ++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 app/svg/logo-nav.svg diff --git a/app/coffee/modules/nav.coffee b/app/coffee/modules/nav.coffee index 2cb201f4..ffd77a70 100644 --- a/app/coffee/modules/nav.coffee +++ b/app/coffee/modules/nav.coffee @@ -275,11 +275,10 @@ ProjectMenuDirective = ($log, $compile, $auth, $rootscope, $tgAuth, $location, $ """) mainTemplate = _.template(""" -

- - Taiga - -

+ """) @@ -319,8 +318,10 @@ ProjectMenuDirective = ($log, $compile, $auth, $rootscope, $tgAuth, $location, $ renderMainMenu($el) project = null - $el.on "click", ".logo > a", (event) -> + $el.on "click", ".logo", (event) -> event.preventDefault() + target = angular.element(event.currentTarget) + console.log target $rootscope.$broadcast("nav:projects-list:open") $el.on "click", ".user-settings .avatar", (event) -> diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss index a117807d..48c3fdfa 100644 --- a/app/styles/modules/common/nav.scss +++ b/app/styles/modules/common/nav.scss @@ -10,14 +10,18 @@ width: 90px; z-index: 999; } - -.logo { - line-height: inherit; - margin: 0 0 .9rem; +.logo-container { + margin: 20%; + object, img { - padding: 17%; width: 100%; } + span { + @extend %large; + color: $white; + display: block; + text-align: center; + } } .main-nav { diff --git a/app/svg/logo-nav.svg b/app/svg/logo-nav.svg new file mode 100644 index 00000000..f18d9ef6 --- /dev/null +++ b/app/svg/logo-nav.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file