Merge branch 'correcao-ranking'

Rafael Diego
2 parents 42ecec40 a24950ab
Showing 2 changed files with 3 additions and 2 deletions Show diff stats
src/app/components/article-box/article-box.html
src/app/pages/inicio/inicio.scss
@@ -18,7 +18,8 @@
         <div class="article-box--abstract" ng-bind-html="vm.article.summary"></div>
         <div class="button--themed">
             <button class="btn btn-block">
-                Participe
+                <span ng-show="{{::vm.article.archived}}">Veja as respostas</span>
+                <span ng-show="{{::!vm.article.archived}}">Participe</span>
             </button>
         </div>
     </div>
@@ -188,7 +188,7 @@
         left: 0;
         display: block;
         width: 100%;
-        height: $bannerBottomHeight;
+        //height: $bannerBottomHeight;
         background-color: #dfa821;
         border-bottom-left-radius: 5px;
         border-bottom-right-radius: 5px;
...	...	@@ -18,7 +18,8 @@
18	18	<div class="article-box--abstract" ng-bind-html="vm.article.summary"></div>
19	19	<div class="button--themed">
20	20	<button class="btn btn-block">
21		- Participe
	21	+ <span ng-show="{{::vm.article.archived}}">Veja as respostas</span>
	22	+ <span ng-show="{{::!vm.article.archived}}">Participe</span>
22	23	</button>
23	24	</div>
24	25	</div>
...	...
...	...	@@ -188,7 +188,7 @@
188	188	left: 0;
189	189	display: block;
190	190	width: 100%;
191		- height: $bannerBottomHeight;
	191	+ //height: $bannerBottomHeight;
192	192	background-color: #dfa821;
193	193	border-bottom-left-radius: 5px;
194	194	border-bottom-right-radius: 5px;
...	...