From 01f12164a804d2fa44991e1ead0c3694171727d4 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Fri, 10 Aug 2012 14:08:58 -0400 Subject: [PATCH 1/8] added spinner gif --- common/lib/xmodule/xmodule/css/capa/display.scss | 13 +++++++++++++ common/static/images/spinner.gif | Bin 0 -> 6942 bytes 2 files changed, 13 insertions(+) create mode 100644 common/static/images/spinner.gif diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss index 2088e8baa3e7..560df2a1784e 100644 --- a/common/lib/xmodule/xmodule/css/capa/display.scss +++ b/common/lib/xmodule/xmodule/css/capa/display.scss @@ -77,6 +77,19 @@ div { } } + &.checking { + p.status { + @include inline-block(); + background: url('../images/spinner.gif') center center no-repeat; + height: 20px; + width: 20px; + } + + input { + border-color: green; + } + } + &.incorrect, &.ui-icon-close { p.status { @include inline-block(); diff --git a/common/static/images/spinner.gif b/common/static/images/spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..b2f94cd12c351160f0a5ec8aa0a9b7f7f2e16d81 GIT binary patch literal 6942 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 c+Urdh#iqlzMkC{Kbk4KSn`>Ip Date: Fri, 10 Aug 2012 14:17:59 -0400 Subject: [PATCH 2/8] changed field border color --- common/lib/xmodule/xmodule/css/capa/display.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss index 560df2a1784e..6ef0d40176bf 100644 --- a/common/lib/xmodule/xmodule/css/capa/display.scss +++ b/common/lib/xmodule/xmodule/css/capa/display.scss @@ -77,7 +77,7 @@ div { } } - &.checking { + &.processing { p.status { @include inline-block(); background: url('../images/spinner.gif') center center no-repeat; @@ -86,7 +86,7 @@ div { } input { - border-color: green; + border-color: #aaa; } } From 5811f520838e9eb0b4205b3afebfec1213a56e63 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Fri, 10 Aug 2012 15:48:58 -0400 Subject: [PATCH 3/8] added a cleaner arrow implementation --- lms/static/sass/multicourse/_dashboard.scss | 23 ++++++++------------- lms/templates/dashboard.html | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index 9c2b71f5c043..9581f5e01646 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -203,28 +203,23 @@ display: block; left: 0px; position: absolute; + z-index: 50; top: 0px; @include transition(all, 0.15s, linear); right: 0px; } .arrow { - border-top: 8px solid; - border-left: 8px solid; - border-color: rgba(0,0,0, 0.7); - @include box-shadow(inset 0 1px 0 0 rgba(255,255,255, 0.8), -1px 0 1px 0 rgba(255,255,255, 0.8)); - content: ""; - display: block; - height: 55px; - left: 50%; - margin-left: -10px; - margin-top: -30px; - opacity: 0; position: absolute; - top: 50%; - @include transform(rotate(-45deg)); + z-index: 100; + width: 100%; + font-size: 70px; + line-height: 110px; + text-align: center; + text-decoration: none; + color: rgba(0, 0, 0, .7); + opacity: 0; @include transition(all, 0.15s, linear); - width: 55px; } &:hover { diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 480568a5b997..fc8e9abf3003 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -73,7 +73,7 @@

Current Courses

%>
-
+
❯
From 6cfb9ca41cd95687198845ea1ed51b056eb7ecc6 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Fri, 10 Aug 2012 15:54:00 -0400 Subject: [PATCH 4/8] added additional processing class --- common/lib/xmodule/xmodule/css/capa/display.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss index 6ef0d40176bf..7832d95cb458 100644 --- a/common/lib/xmodule/xmodule/css/capa/display.scss +++ b/common/lib/xmodule/xmodule/css/capa/display.scss @@ -147,6 +147,15 @@ div { width: 14px; } + &.processing, &.ui-icon-processing { + @include inline-block(); + background: url('../images/spinner.gif') center center no-repeat; + height: 20px; + position: relative; + top: 6px; + width: 25px; + } + &.correct, &.ui-icon-check { @include inline-block(); background: url('../images/correct-icon.png') center center no-repeat; From f14d8be3a85c9c5fe39520198c1ddf9a3696c301 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Fri, 10 Aug 2012 14:08:58 -0400 Subject: [PATCH 5/8] added spinner gif --- common/lib/xmodule/xmodule/css/capa/display.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss index 6b1c32ae6552..d209f2d157ae 100644 --- a/common/lib/xmodule/xmodule/css/capa/display.scss +++ b/common/lib/xmodule/xmodule/css/capa/display.scss @@ -89,6 +89,19 @@ div { } } + &.checking { + p.status { + @include inline-block(); + background: url('../images/spinner.gif') center center no-repeat; + height: 20px; + width: 20px; + } + + input { + border-color: green; + } + } + &.incorrect, &.ui-icon-close { p.status { @include inline-block(); From ced410c6b97c4b2ab46737470d9d0b3f7c25c3c9 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Fri, 10 Aug 2012 14:17:59 -0400 Subject: [PATCH 6/8] changed field border color --- common/lib/xmodule/xmodule/css/capa/display.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss index d209f2d157ae..9a5aa82f6f27 100644 --- a/common/lib/xmodule/xmodule/css/capa/display.scss +++ b/common/lib/xmodule/xmodule/css/capa/display.scss @@ -89,7 +89,7 @@ div { } } - &.checking { + &.processing { p.status { @include inline-block(); background: url('../images/spinner.gif') center center no-repeat; @@ -98,7 +98,7 @@ div { } input { - border-color: green; + border-color: #aaa; } } From 7afe2e95498a0cfbc5c52cfe40d7056bc825a4b3 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Fri, 10 Aug 2012 15:48:58 -0400 Subject: [PATCH 7/8] added a cleaner arrow implementation --- lms/static/sass/multicourse/_dashboard.scss | 23 ++++++++------------- lms/templates/dashboard.html | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index 9c2b71f5c043..9581f5e01646 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -203,28 +203,23 @@ display: block; left: 0px; position: absolute; + z-index: 50; top: 0px; @include transition(all, 0.15s, linear); right: 0px; } .arrow { - border-top: 8px solid; - border-left: 8px solid; - border-color: rgba(0,0,0, 0.7); - @include box-shadow(inset 0 1px 0 0 rgba(255,255,255, 0.8), -1px 0 1px 0 rgba(255,255,255, 0.8)); - content: ""; - display: block; - height: 55px; - left: 50%; - margin-left: -10px; - margin-top: -30px; - opacity: 0; position: absolute; - top: 50%; - @include transform(rotate(-45deg)); + z-index: 100; + width: 100%; + font-size: 70px; + line-height: 110px; + text-align: center; + text-decoration: none; + color: rgba(0, 0, 0, .7); + opacity: 0; @include transition(all, 0.15s, linear); - width: 55px; } &:hover { diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 480568a5b997..fc8e9abf3003 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -73,7 +73,7 @@

Current Courses

%>
-
+
❯
From f4ce49420ed8115285859ea18315fe40992df694 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Fri, 10 Aug 2012 15:54:00 -0400 Subject: [PATCH 8/8] added additional processing class --- common/lib/xmodule/xmodule/css/capa/display.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss index 9a5aa82f6f27..6a9b57cfef9b 100644 --- a/common/lib/xmodule/xmodule/css/capa/display.scss +++ b/common/lib/xmodule/xmodule/css/capa/display.scss @@ -159,7 +159,7 @@ div { width: 14px; } - &.processing, &.ui-icon-check { + &.processing, &.ui-icon-processing { @include inline-block(); background: url('../images/spinner.gif') center center no-repeat; height: 20px;