From 34ea03c8871d84b08da270df3b97acd2effae8e5 Mon Sep 17 00:00:00 2001
From: Frances Botsford <frances@edx.org>
Date: Tue, 11 Feb 2014 13:28:08 -0500
Subject: [PATCH] fixed missing polyfill buttons, adjusted layout of number
input in component editor UX-381
---
cms/envs/common.py | 1 +
cms/static/sass/elements/_xmodules.scss | 2 +-
cms/static/sass/views/_unit.scss | 4 +---
.../css/vendor/html5-input-polyfills/number-polyfill.css | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 012200f8751..ea800316111 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -276,6 +276,7 @@ PIPELINE_CSS = {
'source_filenames': [
'css/vendor/normalize.css',
'css/vendor/font-awesome.css',
+ 'css/vendor/html5-input-polyfills/number-polyfill.css',
'js/vendor/CodeMirror/codemirror.css',
'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css',
'css/vendor/jquery.qtip.min.css',
diff --git a/cms/static/sass/elements/_xmodules.scss b/cms/static/sass/elements/_xmodules.scss
index c889f0fde4d..f1c9c2b480d 100644
--- a/cms/static/sass/elements/_xmodules.scss
+++ b/cms/static/sass/elements/_xmodules.scss
@@ -39,7 +39,7 @@
display: block;
width: 45%;
max-width: auto;
- margin-left: 33%;
+ margin-left: 25%;
padding: 0 13px;
}
diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss
index 1262dfcf87e..839c3010225 100644
--- a/cms/static/sass/views/_unit.scss
+++ b/cms/static/sass/views/_unit.scss
@@ -619,7 +619,6 @@ body.course.unit,.view-unit {
//component-setting-entry
.field.comp-setting-entry {
- @include transition(opacity $tmg-f2 ease-in-out 0s);
background-color: $white;
padding: $baseline;
border-bottom: 1px solid $gray-l2;
@@ -713,8 +712,7 @@ body.course.unit,.view-unit {
}
input[type="number"] {
-
- width: 38.5%;
+ width: 42%;
box-shadow: 0 1px 2px $shadow-l1 inset;
//For webkit browsers which render number fields differently, make input wider.
-moz-column-width: {
diff --git a/common/static/css/vendor/html5-input-polyfills/number-polyfill.css b/common/static/css/vendor/html5-input-polyfills/number-polyfill.css
index f3d88057398..d331b1b3223 100644
--- a/common/static/css/vendor/html5-input-polyfills/number-polyfill.css
+++ b/common/static/css/vendor/html5-input-polyfills/number-polyfill.css
@@ -5,8 +5,8 @@ div.number-spin-btn-container {
vertical-align: middle;
margin: 0 0 0 3px;
padding: 0;
- left: 74%;
- top: 6px;
+ left: 69%;
+ top: 6px;
}
div.number-spin-btn {
--
GitLab