Download as
Browse Code »

Commit 3f4d901055cd31d5412f1f5ed095b1b1e3375618

Authored by Matheus Machado Monteiro - SUPDE/DEDES/DEDS1
2 parents e9684ea6 5cb36f33
Exists in master and in 4 other branches feature-captcha, production, staging, the_glorious_return_of_piwik

Merge branch 'css-qtd-propostas'

Showing 2 changed files with 11 additions and 6 deletions   Show diff stats
src/app/components/article-box/article-box.html
  Diff comments   View file @3f4d901
... ... @@ -17,11 +17,10 @@
17 17 </div>
18 18 <div class="article-box--abstract" ng-bind-html="vm.article.summary"></div>
19 19 <div class="row">
20   - <div class="col-sm-4 col-middle text-center">
21   - <span>{{::vm.article.children_count}} Propostas nesse programa</span>
22   - {{::vm.article}}
  20 + <div class="col-sm-5 text-center">
  21 + <span class="qtd-propostas">{{::vm.article.children_count}} propostas nesse programa</span>
23 22 </div>
24   - <div class="col-sm-8">
  23 + <div class="col-sm-7">
25 24 <div class="button--themed">
26 25 <button class="btn btn-block">
27 26 <span ng-show="{{::vm.article.archived}}">Veja as respostas</span>
... ...
src/app/components/article-box/article-box.scss
  Diff comments   View file @3f4d901
... ... @@ -112,7 +112,7 @@ $article-box-space: 20px;
112 112  
113 113 margin-bottom: 10px;
114 114 min-height: 170px;
115   -
  115 +
116 116 @media screen and (max-width: $screen-lg) {
117 117 min-height: 135px;
118 118 }
... ... @@ -140,7 +140,7 @@ $article-box-space: 20px;
140 140 -moz-transition: all $time ease-in-out;
141 141 -o-transition: all $time ease-in-out;
142 142 transition: all $time ease-in-out;
143   -
  143 +
144 144 @media screen and (max-width: $screen-lg) {
145 145 min-height: 135px;
146 146 }
... ... @@ -158,6 +158,12 @@ $article-box-space: 20px;
158 158 }
159 159 }
160 160  
  161 + .qtd-propostas {
  162 + display: block;
  163 + margin-top: 25px;
  164 + margin-left: 10px;
  165 + }
  166 +
161 167 .button--themed {
162 168 padding: 20px;
163 169 }
... ...