Skip to content

Commit

Permalink
Video demo and cloudberry power by change in UI (#267)
Browse files Browse the repository at this point in the history
* Update index.scala.html

* Update main.css

* Update index.scala.html

* Update main.css

* Update main.css

* Update main.css

* Update index.scala.html

* Update index.scala.html

* Update index.scala.html
  • Loading branch information
vidhya567 authored Mar 6, 2017
1 parent 806ae72 commit 7c39cf3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 21 deletions.
23 changes: 11 additions & 12 deletions neo/app/views/index.scala.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

@(title: String) @main(title){
<div xmlns="http://www.w3.org/1999/html" ng-controller="AppCtrl">

Expand All @@ -8,10 +9,16 @@

<div id="logo">
</div>

<div id ='powerby'>
<div class="btn btn-info btn-sm">
<a href="http://cloudberry.ics.uci.edu/" title="A Distributed middleware by ICS,UCI" class="white"> Cloudberry</a>
|
<a href="https://www.youtube.com/watch?v=XwlRm0jcsU4" target="_blank" class="btn btn-info btn-sm">Video</a>
</div>
</div>

<div id='how-to'>
<a href="https://www.youtube.com/watch?v=XwlRm0jcsU4" target="_blank" class="btn btn-info btn-sm">How to use this demo</a>
</div>

</div>

<search-bar></search-bar>
Expand Down Expand Up @@ -62,15 +69,7 @@ <h1> About </h1>
<exception-bar></exception-bar>
</div>

<div id ='powerby'>
<div class="btn btn-info btn-sm">
<a href="http://cloudberry.ics.uci.edu/" title="A Distributed middleware by ICS,UCI" class="white"> Powered by Cloudberry</a>
|
<a href="http://leafletjs.com" title="A JS library for interactive maps" class="white">Leaflet</a>
|
<a href="http://mapbox.com" class="white">Mapbox</a>
</div>
</div>


</div>

Expand Down
13 changes: 4 additions & 9 deletions neo/public/stylesheets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ body {
-o-transition: all 0.5s ease;
transition: all 0.5s ease;
background-color: white;
opacity: 0.9;
opacity: 1.0;
z-index: 1;
}

#sidebar.toggled {
Expand All @@ -40,13 +41,6 @@ search-bar {
width: 50%;
}

#how-to{
position: absolute;
bottom: 0%;
left: -11%;
width: 10%;
z-index: 0;
}

.info {
padding: 6px 8px;
Expand Down Expand Up @@ -114,7 +108,7 @@ search-bar {
#powerby{
position: absolute;
bottom: 0%;
left: 71%;
left: 70%;
width: 10%;
z-index: 0;
}
Expand All @@ -125,6 +119,7 @@ search-bar {

.stats{
position: absolute;

bottom:0;
pointer-events: none;
line-height: 1;
Expand Down

0 comments on commit 7c39cf3

Please sign in to comment.