From 500aadbeba96baadf51a228d83c4a624053acbb3 Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Tue, 23 Sep 2014 23:52:15 -0400
Subject: [PATCH] Adds two themes to progress

---
 .../striped/modules/progress.overrides        |  4 +--
 build/packaged/definitions/css/semantic.css   |  6 ++--
 .../definitions/globals/reset.css             |  6 ++--
 server/documents/elements/progress.html.eco   |  2 +-
 server/files/javascript/semantic.js           | 28 ++++++++++---------
 .../striped/modules/progress.overrides        |  4 +--
 6 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/build/less/themes/packages/striped/modules/progress.overrides b/build/less/themes/packages/striped/modules/progress.overrides
index 054cb419d..606cfe469 100644
--- a/build/less/themes/packages/striped/modules/progress.overrides
+++ b/build/less/themes/packages/striped/modules/progress.overrides
@@ -6,8 +6,8 @@
   background-size: 30px 30px;
   background-image:
     linear-gradient(
-      135deg, rgba(255, 255, 255, .05) 25%, transparent 25%,
-      transparent 50%, rgba(255, 255, 255, .05) 50%, rgba(255, 255, 255, .05) 75%,
+      135deg, rgba(255, 255, 255, 0.08) 25%, transparent 25%,
+      transparent 50%, rgba(255, 255, 255, 0.08) 50%, rgba(255, 255, 255, 0.08) 75%,
       transparent 75%, transparent
     )
   ;
diff --git a/build/packaged/definitions/css/semantic.css b/build/packaged/definitions/css/semantic.css
index e67b2638e..0eb970a0f 100644
--- a/build/packaged/definitions/css/semantic.css
+++ b/build/packaged/definitions/css/semantic.css
@@ -16878,12 +16878,12 @@ ol.ui.horizontal.list li:before,
 /*---  Standard  ---*/
 /*---  Emotive  ---*/
 /*---  Neutrals  ---*/
-/*******************************
-             Reset
-*******************************/
 /*------------------
      Load Theme
 -------------------*/
+/*******************************
+             Reset
+*******************************/
 /*------------------
      Load Site
 -------------------*/
diff --git a/build/uncompressed/definitions/globals/reset.css b/build/uncompressed/definitions/globals/reset.css
index 52fbde2dd..6fd5a9eae 100644
--- a/build/uncompressed/definitions/globals/reset.css
+++ b/build/uncompressed/definitions/globals/reset.css
@@ -136,12 +136,12 @@
 /*---  Standard  ---*/
 /*---  Emotive  ---*/
 /*---  Neutrals  ---*/
-/*******************************
-             Reset
-*******************************/
 /*------------------
      Load Theme
 -------------------*/
+/*******************************
+             Reset
+*******************************/
 /*------------------
      Load Site
 -------------------*/
diff --git a/server/documents/elements/progress.html.eco b/server/documents/elements/progress.html.eco
index 4c32a2e24..fa5796e9c 100755
--- a/server/documents/elements/progress.html.eco
+++ b/server/documents/elements/progress.html.eco
@@ -9,7 +9,7 @@ title       : 'Progress'
 description : 'A progress bar shows the progression of a task'
 type        : 'UI Module'
 
-themes      : ['Default', 'Striped']
+themes      : ['Default', 'Basic', 'Striped']
 ---
 <link rel="stylesheet/less" type="text/css" href="/build/less/definitions/modules/progress.less" />
 <script src="/javascript/progress.js"></script>
diff --git a/server/files/javascript/semantic.js b/server/files/javascript/semantic.js
index 855168acc..9dca0f087 100755
--- a/server/files/javascript/semantic.js
+++ b/server/files/javascript/semantic.js
@@ -341,20 +341,22 @@ semantic.ready = function() {
           name,
           value
         ;
-        $.each(lines, function(index, line) {
-          // clear whitespace
-          line = $.trim(line);
-          // match variables only
-          if(line[0] == '@') {
-            name = line.match(/^@(.+):/);
-            value = line.match(/:\s*([\s|\S]+?;)/);
-            if( ($.isArray(name) && name.length >= 2) && ($.isArray(value) && value.length >= 2) ) {
-              name = name[1];
-              value = value[1];
-              variables[name] = value;
+        if(lines) {
+          $.each(lines, function(index, line) {
+            // clear whitespace
+            line = $.trim(line);
+            // match variables only
+            if(line[0] == '@') {
+              name = line.match(/^@(.+):/);
+              value = line.match(/:\s*([\s|\S]+?;)/);
+              if( ($.isArray(name) && name.length >= 2) && ($.isArray(value) && value.length >= 2) ) {
+                name = name[1];
+                value = value[1];
+                variables[name] = value;
+              }
             }
-          }
-        });
+          });
+        }
         return variables;
       },
 
diff --git a/src/themes/packages/striped/modules/progress.overrides b/src/themes/packages/striped/modules/progress.overrides
index 054cb419d..606cfe469 100755
--- a/src/themes/packages/striped/modules/progress.overrides
+++ b/src/themes/packages/striped/modules/progress.overrides
@@ -6,8 +6,8 @@
   background-size: 30px 30px;
   background-image:
     linear-gradient(
-      135deg, rgba(255, 255, 255, .05) 25%, transparent 25%,
-      transparent 50%, rgba(255, 255, 255, .05) 50%, rgba(255, 255, 255, .05) 75%,
+      135deg, rgba(255, 255, 255, 0.08) 25%, transparent 25%,
+      transparent 50%, rgba(255, 255, 255, 0.08) 50%, rgba(255, 255, 255, 0.08) 75%,
       transparent 75%, transparent
     )
   ;