From 6d7cfe08df426f165a1a3d5555d9ecec908d10e6 Mon Sep 17 00:00:00 2001 From: Valera Rozuvan Date: Wed, 9 Jan 2013 13:57:00 +0200 Subject: [PATCH] Slight UI modification. --- .../js/capa/drag_and_drop/config_parser.js | 2 +- .../js/capa/drag_and_drop/draggables.js | 28 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/common/static/js/capa/drag_and_drop/config_parser.js b/common/static/js/capa/drag_and_drop/config_parser.js index 34346eb6f0..b87f618bf4 100644 --- a/common/static/js/capa/drag_and_drop/config_parser.js +++ b/common/static/js/capa/drag_and_drop/config_parser.js @@ -89,7 +89,7 @@ define(['logme'], function (logme) { returnStatus = false; } - state.config.labelBgColor = 'yellow'; + state.config.labelBgColor = '#d6d6d6'; if (typeof config.label_bg_color === 'string') { state.config.labelBgColor = config.label_bg_color; } else if (typeof config.label_bg_color !== 'undefined') { diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js index 980afa2cf6..7d12e0b4fa 100644 --- a/common/static/js/capa/drag_and_drop/draggables.js +++ b/common/static/js/capa/drag_and_drop/draggables.js @@ -144,6 +144,8 @@ define(['logme', 'update_input'], function (logme, updateInput) { '
' + obj.label + @@ -187,6 +189,8 @@ define(['logme', 'update_input'], function (logme, updateInput) { '
' + obj.label + @@ -261,18 +265,18 @@ define(['logme', 'update_input'], function (logme, updateInput) { draggableObj.containerEl.hide(); draggableObj.iconEl.detach(); - draggableObj.iconEl.css( - 'background-color', draggableObj.iconElBGColor - ); - draggableObj.iconEl.css( - 'padding-left', draggableObj.iconElPadding - ); - draggableObj.iconEl.css( - 'padding-right', draggableObj.iconElPadding - ); - draggableObj.iconEl.css( - 'border', draggableObj.iconElBorder - ); + draggableObj.iconEl.css( + 'background-color', draggableObj.iconElBGColor + ); + draggableObj.iconEl.css( + 'padding-left', draggableObj.iconElPadding + ); + draggableObj.iconEl.css( + 'padding-right', draggableObj.iconElPadding + ); + draggableObj.iconEl.css( + 'border', draggableObj.iconElBorder + ); draggableObj.iconEl.css( 'width', draggableObj.iconWidth