Move css in theirs right places vendors Refs #0026847

3 files changed, 44 insertions, 26 deletions

diff --git a/app/assets/stylesheets/vendor/formtastic.css.scss b/app/assets/stylesheets/vendor/formtastic.css.scss
deleted file mode 100644
index 078cf41ab..000000000
--- a/app/assets/stylesheets/vendor/formtastic.css.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-fieldset.inputs {
-        
-    a.action { float: right; }          
-}
-
-.formtastic .choices .label, .formtastic .fragments .label {
-    width: 25%;
-    border: 0px;
-
-    label {
-        position: relative;
-        font-size: 14px;
-    }
-}
-
-/* Hack to remove!!!! */ 
-.formtastic .inputs input[type="file"] {
-    display: initial;
-}
-/* Hack to remove!!!! */ 
\ No newline at end of file
diff --git a/app/assets/stylesheets/vendor/formtastic_changes.css.scss b/app/assets/stylesheets/vendor/formtastic_changes.css.scss
new file mode 100644
index 000000000..e5ea0fbc6
--- /dev/null
+++ b/app/assets/stylesheets/vendor/formtastic_changes.css.scss
@@ -0,0 +1,27 @@
+.formtastic{
+
+    fieldset.inputs {
+        
+        a.action { float: right; }          
+    }
+    
+    .choices .label, .formtastic .fragments .label {
+        width: 25%;
+        border: 0px;
+        
+        label {
+            position: relative;
+            font-size: 14px;
+        }
+    }
+    
+    .token-input-list {
+        display: inline-block;
+    }
+
+    /* Hack to remove!!!! */ 
+    .inputs input[type="file"] {
+        display: initial;
+    }
+    /* Hack to remove!!!! */
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/main/token-input.css b/app/assets/stylesheets/vendor/token-input.css
index 55a7f5656..cb883729a 100644
--- a/app/assets/stylesheets/main/token-input.css
+++ b/app/assets/stylesheets/vendor/token-input.css
@@ -7,7 +7,7 @@ ul.token-input-list {
     border: 1px solid #999;
     cursor: text;
     font-size: 12px;
-    font-family: Verdana;
+    font-family: Verdana, sans-serif;
     z-index: 999;
     margin: 0;
     padding: 0;
@@ -28,6 +28,21 @@ ul.token-input-list li input {
     -webkit-appearance: caret;
 }
 
+ul.token-input-disabled,
+ul.token-input-disabled li input {
+  background-color: #E8E8E8;
+}
+
+ul.token-input-disabled li.token-input-token {
+  background-color: #D9E3CA;
+  color: #7D7D7D
+}
+
+ul.token-input-disabled li.token-input-token span {
+  color: #CFCFCF;
+  cursor: default;
+}
+
 li.token-input-token {
     overflow: hidden; 
     height: auto !important; 
@@ -72,7 +87,7 @@ div.token-input-dropdown {
     border-bottom: 1px solid #ccc;
     cursor: default;
     font-size: 12px;
-    font-family: Verdana;
+    font-family: Verdana, sans-serif;
     z-index: 1;
 }
 
@@ -109,8 +124,4 @@ div.token-input-dropdown ul li em {
 
 div.token-input-dropdown ul li.token-input-selected-dropdown-item {
     background-color: #d0efa0;
-}
-
-form.formtastic .token-input-list {
-display: inline-block;
 }
\ No newline at end of file