Merge remote-tracking branch 'grrrero/FLOE-508'

* grrrero/FLOE-508:
  FLOE-508: Changed ui-options.php version to 0.3.
  FLOE-508: Removed normalizeDependencies.json
  FLOE-508: Removed folders and updated Version.md
  FLOE-508: Removed folders/json dependencies, updated uiOptions.js
  FLOE-508: Changed grunt build command on Version.md
  FLOE-508: Amended gitignore.
  FLOE-508: Removed vagrant files, added gitignore.
  FLOE-508: Stripped out dependencies, removed a line from template.
  FLOE-508: Updated UIO to latest version, fixed permissions.
  FLOE-508: Updated Infusion for responsivness.

.gitignore

@@ -0,0 +1,2 @@
+/node_modules/
+/.vagrant/

lib/infusion/Version.md

@@ -1,5 +1,6 @@
-Uses the infusion-uiOptions-2.0.0-minified.zip custom Infusion 2.0 build provided on
-the [Infusion 2.0 release page](https://github.com/fluid-project/infusion/releases/tag/infusion-2.0).
+The version of Infusion included in this folder was created using a custom build from commit 4612ab559ec9610b5fe22eb43c9af041ced82ab0 of the Infusion master branch https://github.com/fluid-project/infusion/ using the command line:
+
+`grunt custom --include="uiOptions" --name="uiOptions"`
 
 The following directories and files were removed from the build, because they are already included in infusion-uiOptions.js file, or are no longer needed:
 
@@ -8,19 +9,29 @@ The following directories and files were removed from the build, because they ar
 * src/components/tableOfContents/js/
 * src/components/tableOfContents/tableOfContentsDependencies.json
 * src/components/textfieldSlider/
+* src/components/switch/js/
+* src/components/switch/css/stylus/
+* src/components/switch/js/switchDependencies.json
+* src/components/textfieldControl/js/
+* src/components/textfieldControl/textfieldConrtolDependencies.json
 * src/components/textToSpeech/
 * src/components/uiOptions/
 * src/framework/core/js/
+* src/framework/core/frameworkDependencies.json
 * src/framework/core/coreDependencies.json
-* src/framework/enhancement/
+* src/framework/enhancement/js/
+* src/framework/enhancement/enhancementDependencies.json
 * src/framework/preferences/js/
 * src/framework/preferences/preferencesDependencies.json
 * src/framework/renderer/
+* src/framework/preferences/css/stylus/
+* src/framework/preferences/js/
 * src/lib/fastXmlPull/
 * src/lib/fonts/fontsDependencies.json
-* src/lib/jquery/core/jQueryDependencies.json
+* src/lib/jquery/core/
 * src/lib/jquery/plugins/touchPunch/jQueryTouchPunchPluginDependencies.json
 * src/lib/jquery/ui/jQueryUIDependencies.json
+* src/lib/jquery/ui/js/
 * src/lib/normamlize/normalizeDependencies.json
 * README.md
 * ReleaseNotes.md

lib/infusion/src/components/switch/css/Switch.css

@@ -0,0 +1,33 @@
+.fl-switchUI {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.fl-switchUI-control {
+  width: 5.4em;
+  border: 0.15em solid currentColor;
+  border-radius: 2em;
+  margin: 0 1em;
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+}
+.fl-switchUI-control:focus {
+  outline: none;
+  box-shadow: 0 0 0 0.2em #fff, 0 0 0 0.35em #000;
+}
+.fl-switchUI-control[aria-checked=true] {
+  justify-content: flex-end;
+}
+.fl-switchUI-controlKnob {
+  height: 1.8em;
+  width: 1.8em;
+  background-color: currentColor;
+  border-radius: 1.8em;
+  display: inline-block;
+  margin: 0.2em;
+}
+.fl-switchUI-text {
+  text-transform: uppercase;
+  font-weight: 600;
+}

lib/infusion/src/components/textfieldControl/css/TextfieldSlider.css

@@ -0,0 +1,116 @@
+.fl-textfieldSlider {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+/* Textfield Stlying */
+
+.fl-textfieldSlider .fl-textfieldSlider-textField {
+    margin: 0;
+    margin-left: 1rem;
+    width: 2.5rem;
+    text-align: center;
+}
+
+/* Slider Styling */
+
+/*
+Native slider appearance based on techniques described at
+https://css-tricks.com/styling-cross-browser-compatible-range-inputs-css/
+and
+http://brennaobrien.com/blog/2014/05/style-input-type-range-in-every-browser.html
+*/
+
+.fl-textfieldSlider input[type=range].fl-slider {
+  -webkit-appearance: none;
+  flex-grow: 1;
+  margin: 0 1rem;
+}
+
+/* webkit browsers */
+.fl-textfieldSlider input[type=range].fl-slider::-webkit-slider-runnable-track {
+  height: 1rem;
+  cursor: pointer;
+  animate: 0.2s;
+  background: #dad6d3;
+  border-radius: 0.3rem;
+  border: 1px solid #b3b3b3;
+}
+.fl-textfieldSlider input[type=range].fl-slider::-webkit-slider-thumb {
+    height: 1.5rem;
+    width: 1.5rem;
+    background-color: #fff;
+    border: 1px solid #b3b3b3;
+    border-radius: 2rem;
+    box-shadow: 4px 2px 3px rgba(0,0,0,0.3);
+    background-image: linear-gradient(right top, #fff 46%, #e9eaea 73%);
+    -webkit-appearance: none;
+    margin-top: -0.3rem;
+}
+
+/* Firefox */
+.fl-textfieldSlider input[type=range].fl-slider::-moz-range-track {
+  height: 1rem;
+  cursor: pointer;
+  animate: 0.2s;
+  background: #dad6d3;
+  border-radius: 0.3rem;
+  border: 1px solid #b3b3b3;
+}
+.fl-textfieldSlider input[type=range].fl-slider::-moz-range-thumb {
+    height: 1.5rem;
+    width: 1.5rem;
+    background-color: #fff;
+    border: 1px solid #b3b3b3;
+    border-radius: 2rem;
+    box-shadow: 4px 2px 3px rgba(0,0,0,0.3);
+    background-image: linear-gradient(right top, #fff 46%, #e9eaea 73%);
+}
+
+/* ms browsers */
+.fl-textfieldSlider input[type=range].fl-slider::-ms-track {
+  height: 1rem;
+  animate: 0.2s;
+  background: transparent;
+  border-color: transparent;
+  border-width: 0.5rem 0;
+  color: transparent;
+}
+.fl-textfieldSlider input[type=range].fl-slider::-ms-fill-lower {
+  background: #dad6d3;
+  border: 1px solid #b3b3b3;
+  border-radius: 0.3rem;
+}
+.fl-textfieldSlider input[type=range].fl-slider::-ms-fill-upper {
+  background: #dad6d3;
+  border: 1px solid #b3b3b3;
+  border-radius: 0.3rem;
+}
+.fl-textfieldSlider input[type=range].fl-slider::-ms-thumb {
+    height: 1.5rem;
+    width: 1.5rem;
+    background-color: #fff;
+    border: 1px solid #b3b3b3;
+    border-radius: 2rem;
+    box-shadow: 4px 2px 3px rgba(0,0,0,0.3);
+    background-image: linear-gradient(right top, #fff 46%, #e9eaea 73%);
+}
+
+/* Put focus on the slider thumb only */
+
+.fl-textfieldSlider input[type=range].fl-slider:focus {
+    outline: none;
+}
+
+.fl-textfieldSlider input[type=range].fl-slider:focus::-webkit-slider-thumb {
+    outline: 2px solid black;
+}
+
+.fl-textfieldSlider input[type=range].fl-slider:focus::-moz-range-thumb {
+    outline: 2px solid black;
+}
+
+.fl-textfieldSlider input[type=range].fl-slider:focus::-ms-thumb {
+    outline: 2px solid black;
+}

lib/infusion/src/components/textfieldControl/css/TextfieldStepper.css

@@ -0,0 +1,42 @@
+/* Default Textfield Stepper styling */
+
+.fl-textfieldStepper {
+    display: flex;
+    flex-basis: auto;
+    justify-content: center;
+    align-items: center;
+}
+
+.fl-textfieldStepper *:focus {
+    outline: none;
+}
+
+.fl-textfieldStepper-focus {
+    outline: solid 0.2rem #000000;
+}
+
+.fl-textfieldStepper-focusContainer {
+    padding: 0.2rem;
+    margin: 0 0.5rem;
+}
+
+/* Textfield Styling */
+
+.fl-textfieldStepper .fl-textfieldStepper-textField {
+    margin: 0 0.5rem;
+    width: 7rem;
+    text-align: center;
+}
+
+/* Textfield Button Styling */
+
+.fl-textfieldStepper .fl-textfieldStepper-button {
+    border: 2px solid #000000;
+    border-radius: 0.4rem;
+    height: 2.4375rem;
+    width: 2.4375rem;
+}
+
+.fl-textfieldStepper .fl-textfieldStepper-button:disabled {
+    opacity: 0.3;
+}

lib/infusion/src/framework/enhancement/css/ProgressiveEnhancement.css

@@ -0,0 +1,4 @@
+/* Progressive Enhancement: JS will reverse the display setup if it is enabled */
+.fl-progEnhance-enhanced {display:none}
+
+.fl-progEnhance-basic {}

lib/infusion/src/framework/preferences/css/FullNoPreviewPrefsEditor.css

@@ -1 +1,33 @@
-body{max-width:60em;min-width:56em}.fl-prefsEditor-fullNoPreview .fl-prefsEditor-category{border-top:2px solid #ddd;clear:both;-webkit-column-break-inside:avoid;page-break-inside:avoid;break-inside:avoid;}.fl-prefsEditor-fullNoPreview .fl-prefsEditor-category h2 img{padding-top:10px;margin-bottom:-4px}.fl-prefsEditor-fullNoPreview .fl-prefsEditor-buttons{text-align:right}.fl-prefsEditor-fullNoPreview .fl-prefsEditors-controls{-webkit-columns:15.625rem 4;-moz-columns:15.625rem 4;columns:15.625rem 4}.fl-prefsEditor-fullNoPreview ul{float:left;}.fl-prefsEditor-fullNoPreview ul li{clear:left}.fl-prefsEditor-fullNoPreview label,.fl-prefsEditor-fullNoPreview .fl-inputs{margin-bottom:15px}
+body {
+  max-width: 60em;
+  min-width: 56em;
+}
+.fl-prefsEditor-fullNoPreview .fl-prefsEditor-category {
+  border-top: 2px solid #ddd;
+  clear: both;
+  -webkit-column-break-inside: avoid;
+  page-break-inside: avoid;
+  break-inside: avoid;
+}
+.fl-prefsEditor-fullNoPreview .fl-prefsEditor-category h2 img {
+  padding-top: 10px;
+  margin-bottom: -4px;
+}
+.fl-prefsEditor-fullNoPreview .fl-prefsEditor-buttons {
+  text-align: right;
+}
+.fl-prefsEditor-fullNoPreview .fl-prefsEditors-controls {
+  -webkit-columns: 15.625rem 4;
+  -moz-columns: 15.625rem 4;
+  columns: 15.625rem 4;
+}
+.fl-prefsEditor-fullNoPreview ul {
+  float: left;
+}
+.fl-prefsEditor-fullNoPreview ul li {
+  clear: left;
+}
+.fl-prefsEditor-fullNoPreview label,
+.fl-prefsEditor-fullNoPreview .fl-inputs {
+  margin-bottom: 15px;
+}

lib/infusion/src/framework/preferences/css/FullPrefsEditor.css

@@ -1 +1,40 @@
-.fl-prefsEditor h2{font-size:1.29em;font-weight:bold;clear:both;color:#444;padding:14px 0 5px 25px}.fl-prefsEditor .fl-prefsEditor-buttons{margin-top:1em;float:left;width:100%;}.fl-prefsEditor .fl-prefsEditor-buttons input{text-transform:uppercase;text-decoration:underline;font-weight:bold;border:2px solid #cecece;font-size:1em;padding:5px;height:2.5em;margin-right:3px;background-color:#f0f0f0}.fl-prefsEditor h2 img{margin-bottom:-3px;padding-right:5px}.fl-prefsEditor .fl-prefsEditor-text ul li{clear:left;height:3.5em}.fl-prefsEditor .fl-slider-input{float:right}
+.fl-prefsEditor h2 {
+  font-size: 1.29em;
+  font-weight: bold;
+  clear: both;
+  color: #444;
+  padding: 14px 0px 5px 25px;
+}
+.fl-prefsEditor .fl-prefsEditor-buttons {
+  margin-top: 1em;
+  float: left;
+  width: 100%;
+}
+.fl-prefsEditor .fl-prefsEditor-buttons input {
+  text-transform: uppercase;
+  text-decoration: underline;
+  font-weight: bold;
+  border: 2px solid #cecece;
+  font-size: 1em;
+  padding: 5px;
+  height: 2.5em;
+  margin-right: 3px;
+  background-color: #f0f0f0;
+}
+.fl-prefsEditor h2 img {
+  margin-bottom: -3px;
+  padding-right: 5px;
+}
+.fl-prefsEditor .fl-prefsEditor-text ul li {
+  clear: left;
+  height: 3.5em;
+}
+.fl-prefsEditor .fl-choices {
+  justify-content: flex-start;
+}
+.fl-prefsEditor .fl-textfieldStepper {
+  justify-content: flex-start;
+}
+.fl-prefsEditor .fl-prefsEditor-onoff .fl-switchUI {
+  justify-content: flex-start;
+}

lib/infusion/src/framework/preferences/css/FullPreviewPrefsEditor.css

@@ -1 +1,54 @@
-.fl-prefsEditor-fullPreview{min-width:800px;}.fl-prefsEditor-fullPreview ul li{clear:left}.fl-prefsEditor-fullPreview .fl-prefsEditor-fullPreview-adjusters{width:60%}.fl-prefsEditor-fullPreview .fl-prefsEditor-fullPreview-previewContainer{width:35%}.fl-prefsEditor-fullPreview h2{border-top:2px solid #ddd;margin-bottom:20px}.fl-prefsEditor-fullPreview .fl-prefsEditor-category{padding-bottom:20px}.fl-prefsEditor-fullPreview ul{margin-left:0;}.fl-prefsEditor-fullPreview ul li{list-style:none;width:100%}.fl-prefsEditor-fullPreview .fl-slider{float:left}.fl-prefsEditor-fullPreview label{display:block;width:16em}.fl-prefsEditor-fullPreview .fl-prefsEditor-layout li,.fl-prefsEditor-fullPreview .fl-prefsEditor-links li{padding-bottom:10px}.fl-prefsEditor-fullPreview .fl-prefsEditor-preview iframe{height:480px;width:100%;border:2px solid #d7d7d7}.fl-prefsEditor-fullPreview .fl-prefsEditor-preview h2{font-weight:lighter;font-size:1.8em;color:#4d4d4d;padding:18px 0 0 0}.fl-prefsEditor .fl-inputs{float:left}.fl-prefsEditor input[type="text"]{width:2em}
+.fl-prefsEditor-fullPreview {
+  min-width: 800px;
+}
+.fl-prefsEditor-fullPreview ul li {
+  clear: left;
+}
+.fl-prefsEditor-fullPreview .fl-prefsEditor-fullPreview-adjusters {
+  width: 60%;
+}
+.fl-prefsEditor-fullPreview .fl-prefsEditor-fullPreview-previewContainer {
+  width: 35%;
+}
+.fl-prefsEditor-fullPreview h2 {
+  border-top: 2px solid #ddd;
+  margin-bottom: 20px;
+}
+.fl-prefsEditor-fullPreview .fl-prefsEditor-category {
+  padding-bottom: 20px;
+}
+.fl-prefsEditor-fullPreview ul {
+  margin-left: 0px;
+}
+.fl-prefsEditor-fullPreview ul li {
+  list-style: none;
+  width: 100%;
+}
+.fl-prefsEditor-fullPreview .fl-slider {
+  float: left;
+}
+.fl-prefsEditor-fullPreview label {
+  display: block;
+  width: 16em;
+}
+.fl-prefsEditor-fullPreview .fl-prefsEditor-layout li,
+.fl-prefsEditor-fullPreview .fl-prefsEditor-links li {
+  padding-bottom: 10px;
+}
+.fl-prefsEditor-fullPreview .fl-prefsEditor-preview iframe {
+  height: 480px;
+  width: 100%;
+  border: 2px solid #d7d7d7;
+}
+.fl-prefsEditor-fullPreview .fl-prefsEditor-preview h2 {
+  font-weight: lighter;
+  font-size: 1.8em;
+  color: #4d4d4d;
+  padding: 18px 0px 0px 0px;
+}
+.fl-prefsEditor .fl-inputs {
+  float: left;
+}
+.fl-prefsEditor input[type="text"] {
+  width: 2em;
+}