Merge pull request #11 from moreonion/datasets_app-fixes

Datasets app fixes - mark invalid table fields.
moreonion · Feb 26, 2019 · ad3bdd3 · ad3bdd3
2 parents fcfd59f + c9bd010
commit ad3bdd3
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 20 deletions.
diff --git a/modules_css/vue_app_overrides.css b/modules_css/vue_app_overrides.css
@@ -143,22 +143,6 @@
   font-size: 7px;
   color: #514f4f;
 }
-.el-select .el-input__inner {
-  color: #514f4f;
-  background: #F5F1E8;
-  border: 0 none;
-  padding: 0 1rem 0 0.6rem;
-  height: 1.8rem;
-  width: 4.8rem;
-}
-.el-select .el-input__inner:focus {
-  background-color: #D6D2CC;
-}
-.el-select .el-input .el-input__icon {
-  width: 1rem;
-  font-size: 7px;
-  color: #514f4f;
-}
 .el-dropdown__caret-button {
   padding-left: 0.4rem;
   padding-right: 0.4rem;
@@ -944,15 +928,27 @@
   overflow-x: auto;
 }
 .datasets-app .dsa-edit-dataset-dialog table tr:not(.VueTables__no-results) td {
-  padding-right: 1rem;
+  padding: 0;
 }
 .datasets-app .dsa-edit-dataset-dialog table tr:not(.VueTables__no-results) td:first-of-type {
   min-width: 1.4rem;
   color: #d66540;
   border-right: 0 none;
-  padding-right: 0px;
+  padding: 5px 0 5px 5px;
   font-size: 130%;
 }
+.datasets-app .dsa-edit-dataset-dialog table tr:not(.VueTables__no-results) td:last-of-type {
+  padding: 5px;
+}
+.datasets-app .dsa-edit-dataset-dialog table tr:not(.VueTables__no-results) td .dsa-contact-field {
+  padding: 5px 1rem 5px 5px;
+}
+.datasets-app .dsa-edit-dataset-dialog table tr:not(.VueTables__no-results) td .dsa-contact-field-invalid {
+  background-color: rgba(214, 101, 64, 0.5);
+}
+.datasets-app .dsa-edit-dataset-dialog table tr:not(.VueTables__no-results) td.dsa-edited .dsa-contact-field-invalid {
+  background-color: transparent;
+}
 .datasets-app .dsa-edit-dataset-dialog table tr.VueTables__no-results td {
   color: #d66540;
   text-align: center;

diff --git a/modules_css/vue_app_overrides/_datasets_app.less b/modules_css/vue_app_overrides/_datasets_app.less
@@ -124,15 +124,31 @@
     }
 
     table tr:not(.VueTables__no-results) td {
-      padding-right: 1rem;
+      padding: 0;
 
       &:first-of-type {
         min-width: 1.4rem;
         color: @red;
         border-right: 0 none;
-        padding-right: 0px;
+        padding: 5px 0 5px 5px;
         font-size: 130%;
       }
+
+      &:last-of-type {
+        padding: 5px;
+      }
+
+      .dsa-contact-field {
+        padding: 5px 1rem 5px 5px;
+      }
+
+      .dsa-contact-field-invalid {
+        background-color: @invalid-cell-color;
+      }
+
+      &.dsa-edited .dsa-contact-field-invalid {
+        background-color: transparent;
+      }
     }
 
     table tr.VueTables__no-results td {

diff --git a/modules_css/vue_app_overrides/_variables.less b/modules_css/vue_app_overrides/_variables.less
@@ -39,3 +39,4 @@
 @spinner-mask-color: rgba(242, 242, 242, 0.9);
 
 @active-cell-color: #fff5aa;
+@invalid-cell-color: rgba(214, 101, 64, 0.5);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,3 +39,4 @@
		@spinner-mask-color: rgba(242, 242, 242, 0.9);

		@active-cell-color: #fff5aa;
		@invalid-cell-color: rgba(214, 101, 64, 0.5);