Merge pull request #70 from palantirnet/FS-45-remove-grid

FS-45: Remove grid and tweaks

src/components/_fs-aside.scss

@@ -5,7 +5,12 @@
  * @copyright Copyright (c) 2017-2019 Palantir.net
  */
 
-aside.fs-aside {
+.fs-aside {
+  width: 22.85714%;
+  float: left;
+  margin-right: -100%;
+  margin-left: 0;
+  clear: both;
   margin-bottom: rhythm(1);
   background-color: $c-bg-gray;
 

src/components/_fs-main.scss

@@ -0,0 +1,19 @@
+/**
+ * aside.scss
+ * Define aside styles.
+ *
+ * @copyright Copyright (c) 2017-2020 Palantir.net
+ */
+
+.fs-main {
+  width: 74.28571%;
+  float: right;
+  margin-left: 0;
+  margin-right: 0;
+  clear: none;
+  margin-bottom: rhythm(1);
+
+  @include breakpoint($bp2) {
+    padding-top: rhythm(1);
+  }
+}

src/components/federated-solr-faceted-search.js

@@ -101,7 +101,7 @@ class FederatedSolrFacetedSearch extends React.Component {
     return (
       <LiveAnnouncer>
         <div className="fs-container">
-          <aside className="fs-aside fs-l-25-75--1">
+          <aside className="fs-aside">
             <SearchFieldContainerComponent
               bootstrapCss={bootstrapCss}
               onNewSearch={this.resetFilters}
@@ -137,7 +137,7 @@ class FederatedSolrFacetedSearch extends React.Component {
               }
             </SearchFieldContainerComponent>
           </aside>
-          <div className="fs-l-25-75--2">
+          <div className="fs-main">
             {pageTitle}
             <div className="fs-search-form" autoComplete="on">
               <FederatedTextSearch

src/components/sort-menu/_fs-search-scope.scss

@@ -11,35 +11,6 @@
 }
 
 .fs-search-scope__filter {
-  @include float-span(6);
-
-  @include breakpoint($bp1) {
-    @include float-span(4);
-  }
-
-  &:nth-of-type(3n+1) {
-    @include float-span(6, 'first');
-
-    @include breakpoint($bp1) {
-      @include isolation-span(4, 1, 'both');
-    }
-  }
-
-  &:nth-of-type(3n+2) {
-    @include float-span(6, 'last');
-
-    @include breakpoint($bp1) {
-      @include isolation-span(4, 5, 'none');
-    }
-  }
-
-  &:nth-of-type(3n+3) {
-    @include float-span(6, 'first');
-
-    @include breakpoint($bp1) {
-      @include isolation-span(4, 9, 'none');
-    }
-  }
 }
 
 .fs-search-scope__select {
@@ -53,15 +24,15 @@
   width: 100% !important;
   background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 10 10'%3E%3Cpath d='M8.3 2.8c.3-.3.7-.3 1 0 .3.3.3.7 0 1L5.4 7.6c-.3.3-.7.3-1 0L.5 3.7c-.3-.3-.3-.7 0-1 .3-.3.7-.3 1 0l3.4 3.1 3.4-3z'%3E%3C/path%3E%3C/svg%3E");
   background-repeat: no-repeat;
-  background-position: 90% 50%;
+  background-position: 96% 50%;
   background-size: .6em .6em;
   background-color: $white;
   padding: .7rem 1.5rem .7rem .7rem;
 
   @include breakpoint($bp2) {
     padding: .35rem 1rem .35rem .35rem;
     margin-bottom: rhythm(.5);
-    background-position: 97% 50%;
+    background-position: 99% 50%;
   }
 
   &::-ms-expand {

src/components/text-search/_fs-autocomplete.scss

@@ -8,18 +8,6 @@
 
 .fs-search-form__autocomplete-container {
   display: flex;
-
-  @include breakpoint($bp1) {
-    width: 75%;
-  }
-
-  @include breakpoint($bp3) {
-    width: 50%;
-  }
-
-  .fs-search-form__input-wrapper {
-    width: 100%;
-  }
 }
 
 /** These classes are outside of Federated Search app namespace. **/

src/components/text-search/_fs-search-form.scss

@@ -21,14 +21,6 @@
   border-radius: 3px;
   display: flex;
   justify-content: space-between;
-
-  @include breakpoint($bp1) {
-    width: 75%;
-  }
-
-  @include breakpoint($bp3) {
-    width: 50%;
-  }
 }
 
 .fs-search-form__input {

src/global-scss/_fs-init.scss

@@ -126,8 +126,6 @@ $indent-amount: 1em;
 // Partials to be shared with all .scss files.
 // =============================================================================
 
-// Add the Singularity Grids responsive layout mixins.
-@import '../node_modules/singularitygs/stylesheets/singularitygs';
 // Add the Breakpoint mixin.
 @import '../node_modules/breakpoint-sass/stylesheets/breakpoint';