Download as
Browse Code »

Commit 66053b7a3ba7ba56280a67a57585eb3c829cc90d

Authored by Caio Almeida
2 parents 325b5190 2c019e2d
Exists in master and in 2 other branches production, staging

Merge branch 'master' into 'master' 

Update Cascading Style Sheets

Atualização de CSS

See merge request !4
Showing 4 changed files with 23 additions and 25 deletions   Show diff stats
ConfJuvApp/scss/_proposal_list.scss
  Diff comments   View file @66053b7
1 #proposals { 1 #proposals {
2 background: $ice; 2 background: $ice;
3 padding-top: 70px; 3 padding-top: 70px;
  4 + min-height: 800px;
4 5
5 h2 { 6 h2 {
6 color: $orange; 7 color: $orange;
@@ -21,26 +22,24 @@ @@ -21,26 +22,24 @@
21 22
22 .card { 23 .card {
23 padding: 0; 24 padding: 0;
  25 + min-height: 350px;
24 26
25 h3 { 27 h3 {
26 - font-size: 20px;  
27 - background: $diamond;  
28 - padding: 2 * $unit;  
29 - height: 135px;  
30 - min-height: 135px;  
31 - overflow: hidden;  
32 - text-overflow: ellipsis; 28 + font-size: 20px;
  29 + background: $diamond;
  30 + overflow: hidden;
  31 + text-overflow: ellipsis;
  32 + padding: 12px;
  33 +
33 } 34 }
34 } 35 }
35 36
36 .card-body { 37 .card-body {
37 - color: $black;  
38 - font-size: 16px;  
39 - padding: 2 * $unit;  
40 - white-space: normal;  
41 - height: 100px;  
42 - min-height: 100px;  
43 - overflow: hidden; 38 + color: $black;
  39 + font-size: 16px;
  40 + padding: 5px 10px 10px 10px;
  41 + white-space: normal;
  42 + overflow: hidden;
44 text-overflow: ellipsis; 43 text-overflow: ellipsis;
45 } 44 }
46 45
@@ -93,6 +92,7 @@ @@ -93,6 +92,7 @@
93 text-transform: uppercase; 92 text-transform: uppercase;
94 margin: $unit; 93 margin: $unit;
95 cursor: pointer; 94 cursor: pointer;
  95 + margin-top:80px;
96 } 96 }
97 } 97 }
98 } 98 }
ConfJuvApp/scss/_stagebar.scss
  Diff comments   View file @66053b7
@@ -4,15 +4,13 @@ @@ -4,15 +4,13 @@
4 4
5 .stage, .stage:hover 5 .stage, .stage:hover
6 { 6 {
7 - color: white;  
8 - /*text-transform: uppercase;*/  
9 - width: 100%;  
10 - cursor: default;  
11 - font-size: 11px;  
12 - color: #212121;  
13 - line-height: 18px;  
14 - border: 0;  
15 - background-color: #e0e0e0; 7 + width: 100%;
  8 + cursor: default;
  9 + font-size: 11px;
  10 + color: #bdbdbd;
  11 + line-height: 18px;
  12 + border: 0px none;
  13 + background-color: #E0E0E0;
16 } 14 }
17 15
18 .stage-first, .stage-first:hover, .stage-first:active { 16 .stage-first, .stage-first:hover, .stage-first:active {
ConfJuvApp/www/html/_proposal_list.html
  Diff comments   View file @66053b7
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 on-swipe-left="" on-swipe-right="" on-partial-swipe="cardPartialSwipe(amt)"> 21 on-swipe-left="" on-swipe-right="" on-partial-swipe="cardPartialSwipe(amt)">
22 <div class="card animate-show" ng-show="proposal.topic.selected"> 22 <div class="card animate-show" ng-show="proposal.topic.selected">
23 <h3> 23 <h3>
24 - {{proposal.title | limitTo:100}} 24 + <a ng-click="openProposal(proposal)">{{proposal.title | limitTo:100}}</a>
25 <br /> 25 <br />
26 <small>Autoria: {{proposal.author.name}}</small> 26 <small>Autoria: {{proposal.author.name}}</small>
27 <p><img ng-src="img/badge-{{proposal.topic.id}}.svg" alt="" /></p> 27 <p><img ng-src="img/badge-{{proposal.topic.id}}.svg" alt="" /></p>
@@ -14,7 +14,7 @@ A gente faz aberto, a gente faz colaborativo. Para contribuir com a 3a Conferên @@ -14,7 +14,7 @@ A gente faz aberto, a gente faz colaborativo. Para contribuir com a 3a Conferên
14 1. Registrar um bug ou uma sugestão: [Página das "issues"](https://gitlab.com/participa/confjuvapp/issues), basta clicar em "+New Issue" 14 1. Registrar um bug ou uma sugestão: [Página das "issues"](https://gitlab.com/participa/confjuvapp/issues), basta clicar em "+New Issue"
15 2. Contribuir com código, fazendo melhorias, vamos avaliar com carinho os seus "merge requests" ;-) 15 2. Contribuir com código, fazendo melhorias, vamos avaliar com carinho os seus "merge requests" ;-)
16 16
17 -Tá esperando o que? Faz um fork e vem ajudar mudar a participação social no Brasil! 17 +Tá esperando o que? Faz um fork e vem ajudar mudar a participação social no Brasil!!
18 18
19 19
20 =====English version====== 20 =====English version======