Skip to content

Commit

Permalink
#55 dei um grau nas fontes em perguntas e no perfil do candidato
Browse files Browse the repository at this point in the history
  • Loading branch information
notnotgabriel committed Sep 21, 2016
1 parent e29f99e commit 7e63911
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<link rel="stylesheet" href="/css/materialize.css">
<link rel="stylesheet" href="/css/normalize.css">
<link rel="stylesheet" href="/css/flexboxgrid.css">
<link href='https://fonts.googleapis.com/css?family=Quicksand:400,700' rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/css?family=Quicksand" rel="stylesheet">
<link rel="stylesheet" href="/css/votacampinas.css">
<link rel="stylesheet" href="/css/font-awesome.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
Expand Down
2 changes: 1 addition & 1 deletion app/partials/candidato/candidato.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h2>Respostas</h2>

<div class="perguntasErespostas" ng-repeat="pergunta in perguntas">
<p class="pergunta">{{$index + 1}}. <strong>{{pergunta.pergunta}}</strong></p>
<p>
<p class="respostas">
<strong>Sua Resposta: </strong> <span>{{possiveisRespostas[respostasEleitor[$index].resposta]}}</span><br>
<strong>Resposta do candidato:</strong> <span>{{possiveisRespostas[candidato.respostas[$index].resposta]}}</span><br>
<strong ng-show="candidato.respostas[$index].justificativa">Justificativa do candidato:</strong> <span>{{candidato.respostas[$index].justificativa}}</span>
Expand Down
3 changes: 2 additions & 1 deletion public/css/materialize.css
Original file line number Diff line number Diff line change
Expand Up @@ -3375,7 +3375,7 @@ small {
transition: box-shadow .25s;
border-radius: 2px; }
.card .card-title {
font-size: 24px;
font-size: 30px;
font-weight: 300; }
.card .card-title.activator {
cursor: pointer; }
Expand Down Expand Up @@ -3446,6 +3446,7 @@ small {
padding: 20px;
border-radius: 0 0 2px 2px; }
.card .card-content p {
font-size: 20px;
margin: 0;
color: inherit; }
.card .card-content .card-title {
Expand Down
15 changes: 14 additions & 1 deletion public/css/votacampinas.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
html,
body {
font-family: 'Quicksand', sans-serif;
font-weight: normal;
position: relative; }

body {
Expand Down Expand Up @@ -148,7 +149,7 @@ nav ul a:hover {
background-color: #866f8c; }

.questoes h1 {
font-size: 1.5em;
font-size: 2em;
display: inline-block; }

.questoes span {
Expand All @@ -158,6 +159,12 @@ nav ul a:hover {
border-radius: 2px;
box-shadow: 1px 2px 6px #ccc; }

.questoes form p {
font-size: 1.5em; }

.questoes form [type="radio"]:not(:checked) + label, .questoes form [type="radio"]:checked + label {
font-size: 1.3rem; }

@media only screen and (max-width: 600px) {
.questoes span {
margin-bottom: 20px;
Expand Down Expand Up @@ -322,6 +329,12 @@ nav ul a:hover {
width: 100%;
max-width: 180px; }

.perguntasErespostas .pergunta {
font-size: 25px; }

.perguntasErespostas .respostas {
font-size: 20px; }

@media only screen and (max-width: 770px) {
.card-panel {
padding: 0; }
Expand Down
3 changes: 2 additions & 1 deletion src/assets/scss/components/_cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@


.card-title {
font-size: 24px;
font-size: 30px;
font-weight: 300;
&.activator {
cursor: pointer;
Expand Down Expand Up @@ -142,6 +142,7 @@
border-radius: 0 0 2px 2px;

p {
font-size: 20px;
margin: 0;
color: inherit;
}
Expand Down
3 changes: 1 addition & 2 deletions src/assets/scss/styles/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ html,
body
{
font-family: 'Quicksand', sans-serif;

font-weight: normal;
position: relative;
}

body
{
display: flex;
flex-direction: column;

min-height: 100vh;
}

Expand Down
8 changes: 8 additions & 0 deletions src/assets/scss/styles/_perfil.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
.foto-candidato { img { width: 100%; max-width: 180px; }}
}

.perguntasErespostas {
.pergunta {
font-size: 25px;
}
.respostas {
font-size: 20px;
}
}
@media only screen and (max-width : 770px) {
.card-panel { padding: 0; }
.card .card-content .card-title.nome-candidato { font-size: 20px; line-height: 20px; }
Expand Down
12 changes: 11 additions & 1 deletion src/assets/scss/styles/_questoes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{
h1
{
font-size: 1.5em;
font-size: 2em;

display: inline-block;
}
Expand All @@ -36,6 +36,16 @@
border-radius: 2px;
box-shadow: 1px 2px 6px #ccc;
}

form {
p{

font-size: 1.5em;
}
[type="radio"]:not(:checked) + label, [type="radio"]:checked + label {
font-size: 1.3rem;
}
}
}

@media only screen and (max-width : 600px)
Expand Down

0 comments on commit 7e63911

Please sign in to comment.