Skip to content

E
edx-platform
Commit 6d7cfe08 by Valera Rozuvan Committed by Alexander Kryklia
Options

Slight UI modification.

parent 15ffc1f6
Showing with 17 additions and 13 deletions
common/static/js/capa/drag_and_drop/config_parser.js
...@@ -89,7 +89,7 @@ define(['logme'], function (logme) { ...@@ -89,7 +89,7 @@ define(['logme'], function (logme) {
returnStatus = false; returnStatus = false;
} }
state.config.labelBgColor = 'yellow'; state.config.labelBgColor = '#d6d6d6';
if (typeof config.label_bg_color === 'string') { if (typeof config.label_bg_color === 'string') {
state.config.labelBgColor = config.label_bg_color; state.config.labelBgColor = config.label_bg_color;
} else if (typeof config.label_bg_color !== 'undefined') { } else if (typeof config.label_bg_color !== 'undefined') {
......
common/static/js/capa/drag_and_drop/draggables.js
...@@ -144,6 +144,8 @@ define(['logme', 'update_input'], function (logme, updateInput) { ...@@ -144,6 +144,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
'<div ' + '<div ' +
'style=" ' + 'style=" ' +
'position: absolute; ' + 'position: absolute; ' +
'color: black; ' +
'font-size: 0.95em; ' +
'" ' + '" ' +
'>' + '>' +
obj.label + obj.label +
...@@ -187,6 +189,8 @@ define(['logme', 'update_input'], function (logme, updateInput) { ...@@ -187,6 +189,8 @@ define(['logme', 'update_input'], function (logme, updateInput) {
'<div ' + '<div ' +
'style=" ' + 'style=" ' +
'position: absolute; ' + 'position: absolute; ' +
'color: black; ' +
'font-size: 0.95em; ' +
'" ' + '" ' +
'>' + '>' +
obj.label + obj.label +
...@@ -261,18 +265,18 @@ define(['logme', 'update_input'], function (logme, updateInput) { ...@@ -261,18 +265,18 @@ define(['logme', 'update_input'], function (logme, updateInput) {
draggableObj.containerEl.hide(); draggableObj.containerEl.hide();
draggableObj.iconEl.detach(); draggableObj.iconEl.detach();
draggableObj.iconEl.css( draggableObj.iconEl.css(
'background-color', draggableObj.iconElBGColor 'background-color', draggableObj.iconElBGColor
); );
draggableObj.iconEl.css( draggableObj.iconEl.css(
'padding-left', draggableObj.iconElPadding 'padding-left', draggableObj.iconElPadding
); );
draggableObj.iconEl.css( draggableObj.iconEl.css(
'padding-right', draggableObj.iconElPadding 'padding-right', draggableObj.iconElPadding
); );
draggableObj.iconEl.css( draggableObj.iconEl.css(
'border', draggableObj.iconElBorder 'border', draggableObj.iconElBorder
); );
draggableObj.iconEl.css( draggableObj.iconEl.css(
'width', 'width',
draggableObj.iconWidth draggableObj.iconWidth
......
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