Skip to content

Commit

Permalink
merge and fix build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@metagrover
metagrover committed Apr 4, 2017
2 parents 5e43cf9 + 2b2806f commit 1696dbf
Show file tree
Hide file tree
Showing 21 changed files with 87 additions and 17 deletions.
41 changes: 34 additions & 7 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,41 +145,44 @@ <h2 class="title">
<a href="manual/v1.0.0/components/DatePicker.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-04.png" alt="ReactiveSearch UI Component">
</a>
</div>
<div class="col-xs-6 col-sm-6">
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-05.png" alt="ReactiveSearch UI Component">
</a>
<div class="small">
</div>
<div class="col-xs-6 col-sm-5">
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-06.png" alt="ReactiveSearch UI Component">
</a>
<div class="medium">
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-07.png" alt="ReactiveSearch UI Component">
</a>
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-08.png" alt="ReactiveSearch UI Component">
</a>
</div>
<a href="manual/v1.0.0/components/RangeSlider.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-09.png" alt="ReactiveSearch UI Component">
</a>
<a href="manual/v1.0.0/components/ToggleButton.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-10.png" alt="ReactiveSearch UI Component">
</a>
</div>
</div>
<div class="col-xs-6 col-sm-3">
<div class="col-xs-6 col-sm-4">
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-11.png" alt="ReactiveSearch UI Component">
</a>
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-12.png" alt="ReactiveSearch UI Component">
</a>
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-12.png" alt="ReactiveSearch UI Component">
<img src="website/assets/images/ui/UIComponents-13.png" alt="ReactiveSearch UI Component">
</a>
<a href="manual/v1.0.0/map-components/GeoDistanceDropdown.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-12.png" alt="ReactiveSearch UI Component">
<img src="website/assets/images/ui/UIComponents-14.png" alt="ReactiveSearch UI Component">
</a>
<a href="manual/v1.0.0/map-components/GeoDistanceDropdown.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-15.png" alt="ReactiveSearch UI Component">
</a>
</div>
</div>
Expand Down Expand Up @@ -307,6 +310,27 @@ <h2 class="title">
</div>
</div>
<!-- search-feeds end -->
<!-- yelp start -->
<div role="tabpanel" class="tab-pane fade in" id="location-search">
<div class="row demo-container-block">
<div class="img-container tab-img col-xs-12 col-sm-7">
<img src="website/assets/images/Use-Cases/location-search.png" alt="image" class="img-responsive" />
</div>
<div class="col-xs-12 col-sm-5 tab-text">
<h2 class="title">
Location Search
</h2>
<p class="description">
A Yelp style location search app.</p>
<p class="description">It uses <a href="manual/v1.0.0/components/SingleList.html">SingleList</a>, <a href="manual/v1.0.0/components/MultiList.html">MultiList</a> and <a href="manual/v1.0.0/map-components/ReactiveMap.html">ReactiveMap</a> components.
</p>
<a href="examples/news" target="_blank">Demo</a>
<span class="fa fa-angle-right"></span>
<a href="https://github.com/appbaseio/reactivesearch/blob/master/examples/news/" target="_blank">Code</a>
</div>
</div>
</div>
<!-- yelp end -->
</div>
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
Expand All @@ -325,6 +349,9 @@ <h2 class="title">
<li role="presentation" class=" col-xs-12 col-sm-2 text-center">
<a href="#search-feeds" aria-controls="search-feeds" role="tab" data-toggle="tab">Search Feeds</a>
</li>
<li role="presentation" class=" col-xs-12 col-sm-2 text-center">
<a href="#location-search" aria-controls="location-search" role="tab" data-toggle="tab">Location Search</a>
</li>
</ul>
</div>
<div class="row text-center m-t-4">
Expand Down
8 changes: 7 additions & 1 deletion website/assets/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ section {
margin-bottom: 10px; } }

#ui-components {
background: #FECABA;
background: #DFDFDF;
color: #333; }
#ui-components .container {
width: 95%;
Expand All @@ -173,6 +173,12 @@ section {
width: calc(33.33% - 28px); }
#ui-components .small img:nth-child(2) {
margin: 0 15px 30px; }
#ui-components .medium {
margin-bottom: 20px; }
#ui-components .medium img {
width: calc(50% - 28px); }
#ui-components .medium img:nth-child(2) {
margin: 0 15px 30px; }

#use-cases .tab-container {
margin: 30px 0; }
Expand Down
Binary file added website/assets/images/Use-Cases/location-search.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/assets/images/ui/UIComponents-02.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/assets/images/ui/UIComponents-03.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/assets/images/ui/UIComponents-04.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/assets/images/ui/UIComponents-05.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/assets/images/ui/UIComponents-06.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/assets/images/ui/UIComponents-07.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/assets/images/ui/UIComponents-08.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/assets/images/ui/UIComponents-09.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/assets/images/ui/UIComponents-10.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/assets/images/ui/UIComponents-11.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/assets/images/ui/UIComponents-12.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added website/assets/images/ui/UIComponents-13.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added website/assets/images/ui/UIComponents-14.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added website/assets/images/ui/UIComponents-15.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 11 additions & 1 deletion website/assets/styles/partials/components/_home.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ section {
}

#ui-components {
background: $primary-color;
background: #DFDFDF;
color: $font-color;

.container {
Expand All @@ -132,6 +132,16 @@ section {
}
}
}

.medium {
margin-bottom: 20px;
img {
width: calc(50% - 28px);
&:nth-child(2) {
margin: 0 15px 30px;
}
}
}
}

#use-cases {
Expand Down
2 changes: 1 addition & 1 deletion website/dist/css/style.min.css
View file

Large diffs are not rendered by default.

Binary file added website/dist/images/brandicon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 34 additions & 7 deletions website/pages/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,41 +122,44 @@ <h2 class="title">
<a href="manual/v1.0.0/components/DatePicker.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-04.png" alt="ReactiveSearch UI Component">
</a>
</div>
<div class="col-xs-6 col-sm-6">
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-05.png" alt="ReactiveSearch UI Component">
</a>
<div class="small">
</div>
<div class="col-xs-6 col-sm-5">
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-06.png" alt="ReactiveSearch UI Component">
</a>
<div class="medium">
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-07.png" alt="ReactiveSearch UI Component">
</a>
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-08.png" alt="ReactiveSearch UI Component">
</a>
</div>
<a href="manual/v1.0.0/components/RangeSlider.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-09.png" alt="ReactiveSearch UI Component">
</a>
<a href="manual/v1.0.0/components/ToggleButton.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-10.png" alt="ReactiveSearch UI Component">
</a>
</div>
</div>
<div class="col-xs-6 col-sm-3">
<div class="col-xs-6 col-sm-4">
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-11.png" alt="ReactiveSearch UI Component">
</a>
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-12.png" alt="ReactiveSearch UI Component">
</a>
<a href="manual/v1.0.0/map-components/ReactiveMap.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-12.png" alt="ReactiveSearch UI Component">
<img src="website/assets/images/ui/UIComponents-13.png" alt="ReactiveSearch UI Component">
</a>
<a href="manual/v1.0.0/map-components/GeoDistanceDropdown.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-12.png" alt="ReactiveSearch UI Component">
<img src="website/assets/images/ui/UIComponents-14.png" alt="ReactiveSearch UI Component">
</a>
<a href="manual/v1.0.0/map-components/GeoDistanceDropdown.html" target="_blank">
<img src="website/assets/images/ui/UIComponents-15.png" alt="ReactiveSearch UI Component">
</a>
</div>
</div>
Expand Down Expand Up @@ -284,6 +287,27 @@ <h2 class="title">
</div>
</div>
<!-- search-feeds end -->
<!-- yelp start -->
<div role="tabpanel" class="tab-pane fade in" id="location-search">
<div class="row demo-container-block">
<div class="img-container tab-img col-xs-12 col-sm-7">
<img src="website/assets/images/Use-Cases/location-search.png" alt="image" class="img-responsive" />
</div>
<div class="col-xs-12 col-sm-5 tab-text">
<h2 class="title">
Location Search
</h2>
<p class="description">
A Yelp style location search app.</p>
<p class="description">It uses <a href="manual/v1.0.0/components/SingleList.html">SingleList</a>, <a href="manual/v1.0.0/components/MultiList.html">MultiList</a> and <a href="manual/v1.0.0/map-components/ReactiveMap.html">ReactiveMap</a> components.
</p>
<a href="examples/news" target="_blank">Demo</a>
<span class="fa fa-angle-right"></span>
<a href="https://github.com/appbaseio/reactivesearch/blob/master/examples/news/" target="_blank">Code</a>
</div>
</div>
</div>
<!-- yelp end -->
</div>
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
Expand All @@ -302,6 +326,9 @@ <h2 class="title">
<li role="presentation" class=" col-xs-12 col-sm-2 text-center">
<a href="#search-feeds" aria-controls="search-feeds" role="tab" data-toggle="tab">Search Feeds</a>
</li>
<li role="presentation" class=" col-xs-12 col-sm-2 text-center">
<a href="#location-search" aria-controls="location-search" role="tab" data-toggle="tab">Location Search</a>
</li>
</ul>
</div>
<div class="row text-center m-t-4">
Expand Down

0 comments on commit 1696dbf

Please sign in to comment.