From 57a3f1b0bd97962fcd0c024b6e08859770fcd660 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Mon, 11 Jan 2016 16:35:45 -0300 Subject: [PATCH] Display profile information in navbar --- gulp/server.js | 1 + src/app/components/navbar/navbar.html | 24 +++++++++++++++++++++++- src/app/components/navbar/navbar.scss | 19 +++++++++++++++++-- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/gulp/server.js b/gulp/server.js index 54adfa5..8a0ae69 100644 --- a/gulp/server.js +++ b/gulp/server.js @@ -29,6 +29,7 @@ function browserSyncInit(baseDir, browser) { server.middleware = [proxyMiddleware('http://localhost:3000/api', {changeOrigin:true}), proxyMiddleware('http://localhost:3000/myprofile', {changeOrigin:true}), proxyMiddleware('http://localhost:3000/designs', {changeOrigin:true}), + proxyMiddleware('http://localhost:3000/image_uploads', {changeOrigin:true}), proxyMiddleware('http://localhost:3000/images', {changeOrigin:true})]; // proxyMiddleware('http://localhost:3000/assets', {changeOrigin:true})]; diff --git a/src/app/components/navbar/navbar.html b/src/app/components/navbar/navbar.html index bfc1fd6..9d66e98 100644 --- a/src/app/components/navbar/navbar.html +++ b/src/app/components/navbar/navbar.html @@ -12,7 +12,29 @@ diff --git a/src/app/components/navbar/navbar.scss b/src/app/components/navbar/navbar.scss index 06522d4..889adfd 100644 --- a/src/app/components/navbar/navbar.scss +++ b/src/app/components/navbar/navbar.scss @@ -1,3 +1,18 @@ -.noosfero-logo img { - height: 35px; +.navbar { + + .noosfero-logo img { + height: 35px; + } + + .navbar-nav { + .profile-menu .profile-image { + height: 30px; + width: 30px; + @extend .img-circle; + } + + .profile-menu a { + padding: 10px 15px; + } + } } -- libgit2 0.21.2