Commit e37ca68f by murad

Merge branch 'upstream_master' into surveryResponseLable

# Conflicts:
#	setup.py
parents bdb9581c 85169129
...@@ -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
......
...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment