Merge pull request #72 from palantirnet/FS-48-linting

FS-48: Cleanup and Linting and long hand for flex properties
palantirnet · Mar 19, 2020 · 196df31 · 196df31
2 parents 2823237 + 9099950
commit 196df31
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 13 deletions.
diff --git a/src/components/results/_fs-search-results.scss b/src/components/results/_fs-search-results.scss
@@ -15,12 +15,16 @@
 }
 
 .fs-search-results__container--left {
-  flex: 1 0 0;
+  flex-grow: 1;
+  flex-shrink: 0;
+  flex-basis: 0;
   margin-right: 3%;
 }
 
 .fs-search-results__container--right {
-  flex: 3 0 0;
+  flex-grow: 3;
+  flex-shrink: 0;
+  flex-basis: 0;
 }
 
 .fs-search-results__image {

diff --git a/src/components/sort-menu/_fs-search-scope.scss b/src/components/sort-menu/_fs-search-scope.scss
@@ -10,9 +10,6 @@
   margin: rhythm(1) 0;
 }
 
-.fs-search-scope__filter {
-}
-
 .fs-search-scope__select {
   @extend %select;
   @include adjust-font-size-to($label, .8);

diff --git a/src/components/text-search/_fs-autocomplete.scss b/src/components/text-search/_fs-autocomplete.scss
@@ -15,12 +15,16 @@
 .react-autosuggest {
   &__container {
     position: relative;
-    flex: 1;
+    flex-grow: 1;
+    flex-shrink: 1;
+    flex-basis: 0;
   }
 
   &__input {
     @include adjust-font-size-to($label, .8);
-    flex: 1;
+    flex-grow: 1;
+    flex-shrink: 1;
+    flex-basis: 0;
     border: 1px solid $gray-light;
     border-top-left-radius: 4px;
     border-bottom-left-radius: 4px;

diff --git a/src/components/text-search/_fs-search-form.scss b/src/components/text-search/_fs-search-form.scss
@@ -29,7 +29,9 @@
   -webkit-appearance: none;
   /* stylelint-enable */
   border-radius: 3px 0 0 3px;
-  flex: 1;
+  flex-grow: 1;
+  flex-shrink: 1;
+  flex-basis: 0;
   border: 1px solid $gray-light;
   padding: .5rem;
 

diff --git a/src/styles.css b/src/styles.css
@@ -216,7 +216,9 @@
   -webkit-appearance: none;
   /* stylelint-enable */
   border-radius: 3px 0 0 3px;
-  flex: 1;
+  flex-grow: 1;
+  flex-shrink: 1;
+  flex-basis: 0;
   border: 1px solid #e5e5e5;
   padding: .5rem; }
   @media (min-width: 900px) {
@@ -259,12 +261,16 @@
 /** These classes are outside of Federated Search app namespace. **/
 .react-autosuggest__container {
   position: relative;
-  flex: 1; }
+  flex-grow: 1;
+  flex-shrink: 1;
+  flex-basis: 0; }
 
 .react-autosuggest__input {
   font-size: 0.8em;
   line-height: 1.46667em;
-  flex: 1;
+  flex-grow: 1;
+  flex-shrink: 1;
+  flex-basis: 0;
   border: 1px solid #e5e5e5;
   border-top-left-radius: 4px;
   border-bottom-left-radius: 4px;
@@ -564,11 +570,15 @@
   display: flex; }
 
 .fs-search-results__container--left {
-  flex: 1 0 0;
+  flex-grow: 1;
+  flex-shrink: 0;
+  flex-basis: 0;
   margin-right: 3%; }
 
 .fs-search-results__container--right {
-  flex: 3 0 0; }
+  flex-grow: 3;
+  flex-shrink: 0;
+  flex-basis: 0; }
 
 .fs-search-results__label {
   color: #555;