moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/messed-up-long-polls' into 'develop' 

Fix/messed up long polls

See merge request pleroma/pleroma-fe!843
This commit is contained in:
Shpuld Shpludson 2019-06-20 13:00:10 +00:00
parent 752ee9d70c 44a03922e6
commit eca533aab6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.scss
View File

@ -200,6 +200,7 @@ input, textarea, .select {
} }
} }
+ label::before { + label::before {
flex-shrink: 0;
display: inline-block; display: inline-block;
content: ''; content: '';
transition: box-shadow 200ms; transition: box-shadow 200ms;
@ -236,6 +237,7 @@ input, textarea, .select {
} }
} }
+ label::before { + label::before {
flex-shrink: 0;
display: inline-block; display: inline-block;
content: '✔'; content: '✔';
transition: color 200ms; transition: color 200ms;

12
src/components/poll/poll.vue
View File

@ -31,8 +31,8 @@
:disabled="loading" :disabled="loading"
:value="index" :value="index"
> >
<label> <label class="option-vote">
{{option.title}} <div>{{option.title}}</div>
</label> </label>
</div> </div>
</div> </div>
@ -68,8 +68,7 @@
margin: 0 0 0.5em; margin: 0 0 0.5em;
} }
.poll-option { .poll-option {
margin: 0.5em 0; margin: 0.75em 0.5em;
height: 1.5em;
} }
.option-result { .option-result {
height: 100%; height: 100%;
@ -87,6 +86,7 @@
} }
.result-percentage { .result-percentage {
width: 3.5em; width: 3.5em;
flex-shrink: 0;
} }
.result-fill { .result-fill {
height: 100%; height: 100%;
@ -99,6 +99,10 @@
left: 0; left: 0;
transition: width 0.5s; transition: width 0.5s;
} }
.option-vote {
display: flex;
align-items: center;
}
input { input {
width: 3.5em; width: 3.5em;
} }