Skip to content

Commit

Permalink
modified styles and icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Earwood committed May 24, 2018
1 parent 3cb10f4 commit ebbcf38
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 74 deletions.
12 changes: 7 additions & 5 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import Totals from "./Totals";
import Facets from "./Facets";

import appSearchIcon from "./icons/icon-app-search-bb.svg";
import packageIcon from "./icons/icon-package.svg";
import poweredBy from "./images/powered-by@2x.png";
import poweredByWhite from "./images/powered-by--white@2x.png";

class App extends Component {
Expand All @@ -31,20 +33,20 @@ class App extends Component {
<div class="search-demo__headings">
<div className="search-demo__icon-wrap">
<img
src={appSearchIcon}
alt="App Search Icon"
src={packageIcon}
alt="Dog Icon"
class="search-demo__icon"
/>
</div>
<h1 class="search-demo__title">Elastic App Search</h1>
<h1 class="search-demo__title">Package Search</h1>
<h3 class="search-demo__sub-heading powered-by">
<img src={poweredByWhite} alt="Powered by Swiftype" />
<img src={poweredBy} alt="Powered by Swiftype" />
</h3>
</div>
<div class="search-demo__input-wrapper">
<input
class="search-demo__text-input"
placeholder="Search npm modules&#8230;"
placeholder="Search node packages&#8230;"
value={query}
onChange={e =>
searchActions.updateQuery(e.target.value)
Expand Down
37 changes: 0 additions & 37 deletions src/icons/icon-app-search-bb.svg

This file was deleted.

13 changes: 13 additions & 0 deletions src/icons/icon-package.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 6 additions & 32 deletions src/styles/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ a.subtle-link {
}

.powered-by {

img {
width: 118.50px;
height: 14px;
Expand All @@ -71,7 +70,6 @@ a.subtle-link {
.app-container {
background: $backgroundColor;
font-family: "Roboto", sans-serif;

}

.search-demo {
Expand All @@ -88,13 +86,11 @@ a.subtle-link {

&__content {
overflow: hidden;
// height: 100vh;
transition-property: height;
transition: 0.5s $easeInOutCubic;

.active-search & {
overflow: auto;
// height: calc(100vh + 175px);
}
}

Expand All @@ -103,7 +99,8 @@ a.subtle-link {
position: absolute;
width: 100vw;
height: 100vh;
background: url($wavesImage);
margin: auto;
background: $backgroundColor;
background-size: cover;
background-position: top;
background-repeat: no-repeat;
Expand Down Expand Up @@ -148,33 +145,28 @@ a.subtle-link {
}

&__icon-wrap {
background: white;
border-radius: 100%;
display: flex;
justify-content: center;
align-items: center;
width: 80px;
height: 80px;
margin: auto auto 20px auto;
// box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.2);
}

&__icon {
margin-left: 4px;
width: 55px;
margin-top: 2px;
width: 80px;
}

&__title {
color: white;
font-weight: 900;
color: #3B454F;
font-weight: 100;
font-size: 34px;
margin-bottom: 0.5em;
}

&__input-wrapper {
display: flex;
// max-width: $widthLimit;
max-width: 80vw;
border-radius: 6px;
border: 1px solid #dce2e9;
Expand All @@ -184,7 +176,7 @@ a.subtle-link {
height: 80px;
align-items: stretch;
padding: 0.5rem;
margin: 20px auto 0 auto;
margin: 60px auto 0 auto;
box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.2);
transition-property: margin, max-width;
transition: 0.5s $easeInOutCubic;
Expand All @@ -204,9 +196,7 @@ a.subtle-link {
border-top-color: white;
border-right-color: white;
border-left-color: white;
// margin: 0vw;
max-width: calc(100% + 0px);
// max-width: 100%;
width: 100%;
margin: auto;
}
Expand Down Expand Up @@ -242,10 +232,6 @@ a.subtle-link {
transition: 0.3s $easeInOutCubic;
transform: translateY(100px);

.active-search & {

}

.active-search & {
position: static;
transform: translateY(0px);
Expand All @@ -254,15 +240,13 @@ a.subtle-link {
}
}


.search-results {
display: flex;
max-width: $widthLimit;
padding: 1rem 2rem 4rem 2rem;
margin: auto;
}


.facets {
padding: 2rem 0;
min-width: 250px;
Expand Down Expand Up @@ -341,7 +325,6 @@ a.subtle-link {

&:after {
content: ' results';

}
}
}
Expand All @@ -362,14 +345,6 @@ a.subtle-link {
font-size: 12px;
color: #4A4B4B;
}

&__body {

}

&__footer {

}
}


Expand Down Expand Up @@ -459,7 +434,6 @@ a.subtle-link {
}
}
}

}
}

Expand Down

0 comments on commit ebbcf38

Please sign in to comment.