Merge branch 'merlin'

Leonardo Merlin
2 parents b9fd6152 8af2a2ee
Showing 2 changed files with 5 additions and 0 deletions Show diff stats
images/icons/icon-user-contrast.png
sass/style.sass
@@ -739,6 +739,8 @@ h1
     vertical-align: middle
     border: 1px solid #ccc !important
     background: url(images/icons/icon-user.png) no-repeat 20px 50%
+    .contrast &
+      background-image: url(images/icons/icon-user-contrast.png)
   .login
     margin-left: 20px
   .logout
@@ -753,6 +755,9 @@ h1
   border: 1px solid #ccc
   .loading
     display: none
+  .contrast &
+    background-color: #000
+
 .login,
 .signup
   text-align: left
...	...	@@ -739,6 +739,8 @@ h1
739	739	vertical-align: middle
740	740	border: 1px solid #ccc !important
741	741	background: url(images/icons/icon-user.png) no-repeat 20px 50%
	742	+ .contrast &
	743	+ background-image: url(images/icons/icon-user-contrast.png)
742	744	.login
743	745	margin-left: 20px
744	746	.logout
...	...	@@ -753,6 +755,9 @@ h1
753	755	border: 1px solid #ccc
754	756	.loading
755	757	display: none
	758	+ .contrast &
	759	+ background-color: #000
	760	+
756	761	.login,
757	762	.signup
758	763	text-align: left
...	...