Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xblock-poll
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
xblock-poll
Commits
e37ca68f
Commit
e37ca68f
authored
Sep 22, 2017
by
murad
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream_master' into surveryResponseLable
# Conflicts: # setup.py
parents
bdb9581c
85169129
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
poll/poll.py
+2
-0
poll/public/css/poll.css
+1
-4
No files found.
poll/poll.py
View file @
e37ca68f
...
@@ -396,6 +396,7 @@ class PollBlock(PollBase):
...
@@ -396,6 +396,7 @@ class PollBlock(PollBase):
return
None
return
None
@XBlock.supports
(
"multi_device"
)
# Mark as mobile-friendly
def
student_view
(
self
,
context
=
None
):
def
student_view
(
self
,
context
=
None
):
"""
"""
The primary view of the PollBlock, shown to students
The primary view of the PollBlock, shown to students
...
@@ -655,6 +656,7 @@ class SurveyBlock(PollBase):
...
@@ -655,6 +656,7 @@ class SurveyBlock(PollBase):
choices
=
Dict
(
help
=
_
(
"The user's answers"
),
scope
=
Scope
.
user_state
)
choices
=
Dict
(
help
=
_
(
"The user's answers"
),
scope
=
Scope
.
user_state
)
event_namespace
=
'xblock.survey'
event_namespace
=
'xblock.survey'
@XBlock.supports
(
"multi_device"
)
# Mark as mobile-friendly
def
student_view
(
self
,
context
=
None
):
def
student_view
(
self
,
context
=
None
):
"""
"""
The primary view of the SurveyBlock, shown to students
The primary view of the SurveyBlock, shown to students
...
...
poll/public/css/poll.css
View file @
e37ca68f
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
.percentage-gauge-container
{
.percentage-gauge-container
{
display
:
inline-block
;
display
:
inline-block
;
width
:
87%
;
width
:
calc
(
100%
-
75px
)
;
vertical-align
:
middle
;
vertical-align
:
middle
;
position
:
relative
;
position
:
relative
;
background-color
:
#fafbfc
;
background-color
:
#fafbfc
;
...
@@ -367,9 +367,6 @@ th.survey-answer {
...
@@ -367,9 +367,6 @@ th.survey-answer {
max-width
:
none
;
max-width
:
none
;
}
}
.percentage-gauge-container
{
width
:
calc
(
100%
-
70px
);
}
.percentage-gauge-container
label
.poll-answer-label
p
{
.percentage-gauge-container
label
.poll-answer-label
p
{
margin-top
:
0
;
margin-top
:
0
;
line-height
:
24px
;
line-height
:
24px
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment