nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move poll.scss

Browse source
This commit is contained in:
Steffen van Bergerem 2015-10-05 01:57:34 +02:00
parent e7e1242227
commit 92ba0b6374
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/_application.scss
View file

@ -41,7 +41,7 @@
@import 'footer'; @import 'footer';
@import 'opengraph'; @import 'opengraph';
@import 'single-post-view'; @import 'single-post-view';
@import 'new_styles/poll'; @import 'poll';
/* map*/ /* map*/
@import 'leaflet'; @import 'leaflet';

28
app/assets/stylesheets/new_styles/_poll.scss → app/assets/stylesheets/poll.scss
View file

@ -1,18 +1,20 @@
.poll_form { .poll_form {
border-top: 1px solid $border-grey;
border-bottom: 1px solid $border-grey; border-bottom: 1px solid $border-grey;
margin: 10px 0px 10px 0px; border-top: 1px solid $border-grey;
padding: 10px 0px 5px 0px; margin: 10px 0;
padding: 10px 0 5px;
.poll_content { .poll-content {
margin-top: 5px; margin-top: 5px;
} }
.toggle_result_wrapper {
.toggle-result-wrapper {
display: inline-block; display: inline-block;
margin-top: 10px; margin-top: 10px;
} }
form { form {
margin-bottom: 0px; margin-bottom: 0;
} }
.result-row > label { width: 100%; } .result-row > label { width: 100%; }
@ -20,21 +22,23 @@
.progress { .progress {
background-image: none; background-image: none;
box-shadow: 0 0 0; box-shadow: 0 0 0;
height: 10px;
margin-bottom: 5px; margin-bottom: 5px;
height: 10px !important;
.bar { .bar {
background: $border-dark-grey none; background: $border-dark-grey none;
color: $text-dark-grey; color: $text-dark-grey;
text-align: left;
height: 100%; height: 100%;
text-align: left;
} }
} }
.submit[disabled] {
cursor: default;
color: $text-grey;
&:hover, &:active { .submit[disabled] {
color: $text-grey;
cursor: default;
&:hover,
&:active {
background-image: none; background-image: none;
} }
} }

4
app/assets/templates/poll_tpl.jst.hbs
View file

@ -6,7 +6,7 @@
{{t "poll.count" count=poll.participation_count}} {{t "poll.count" count=poll.participation_count}}
</div> </div>
</div> </div>
<div class="poll_content"> <div class="poll-content">
{{#if show_form}} {{#if show_form}}
<form action="/posts/{{poll.post_id}}/poll_participations" method="POST"> <form action="/posts/{{poll.post_id}}/poll_participations" method="POST">
{{#poll.poll_answers}} {{#poll.poll_answers}}
@ -21,7 +21,7 @@
</label> </label>
</div> </div>
{{/poll.poll_answers}} {{/poll.poll_answers}}
<div class="toggle_result_wrapper"> <div class="toggle-result-wrapper">
<a class="toggle_result" href="#">{{t "poll.show_result"}}</a> <a class="toggle_result" href="#">{{t "poll.show_result"}}</a>
</div> </div>
<input type="submit" class="submit pull-right btn btn-default" value="{{t "poll.vote"}}"/> <input type="submit" class="submit pull-right btn btn-default" value="{{t "poll.vote"}}"/>