Merge branch 'master' into staging

Leandro Santos
2 parents 451db328 45978e40
Showing 1 changed file with 2 additions and 1 deletions Show diff stats
src/app/layout/navbar/navbar.scss
@@ -7,7 +7,8 @@
     .navbar-brand {
       .noosfero-logo {
         background: url("../assets/images/logo-noosfero.png") no-repeat;
-        padding: 0px 62px 64px 15px;
+        padding: 0px 62px 28px 15px;
+        background-size: 46px;
       }
     }
...	...	@@ -7,7 +7,8 @@
7	7	.navbar-brand {
8	8	.noosfero-logo {
9	9	background: url("../assets/images/logo-noosfero.png") no-repeat;
10		- padding: 0px 62px 64px 15px;
	10	+ padding: 0px 62px 28px 15px;
	11	+ background-size: 46px;
11	12	}
12	13	}
13	14
...	...