unfinished ui2 desktop changes

This commit is contained in:
Devin Smith 2015-03-10 11:34:42 -07:00
parent 457860b848
commit 9a2d15cd1b
3 changed files with 136 additions and 48 deletions

View File

@ -161,26 +161,7 @@
<div class="divider"></div>
<div class="footer">
<div class="divider line"></div>
<div class="content-padding">
<? if (!$this->export) : ?>
<div class="fb-like-box" data-width="200" data-href="https://www.facebook.com/crunchbutton" data-width="The pixel width of the plugin" data-height="The pixel height of the plugin" data-show-faces="false" data-header="false" data-stream="false" data-show-border="false"></div>
<? endif ; ?>
<div class="social">
<a href="http://facebook.com/crunchbutton" target="_blank" class="fa fa-facebook"></a>
<a href="http://twitter.com/crunchbutton" target="_blank" class="fa fa-twitter"></a>
<a href="http://www.linkedin.com/company/crunchbutton" target="_blank" class="fa fa-linkedin"></a>
</div>
<span ng-controller="BottomCtrl">
<div class="divider"></div>
<div class="copyright">&copy; <?=date('Y')?> <a ng-click="navigation.link('/legal')">Crunchbutton</a></div>
<div class="divider"></div>
</span>
<br>
</div>
</div>
</div>
@ -190,6 +171,40 @@
<div class="divider"></div>
</div>
<div class="footer">
<div class="content-padding">
<div class="logo"></div>
<p>Push a button. Get food. We find the best food from the top local restaurants so you dont have to.</p>
<? if (!$this->export) : ?>
<div class="fb-like-box" data-width="200" data-href="https://www.facebook.com/crunchbutton" data-width="The pixel width of the plugin" data-height="The pixel height of the plugin" data-show-faces="false" data-header="false" data-stream="false" data-show-border="false"></div>
<? endif ; ?>
<div class="divider line"></div>
<br><br>
<div class="social">
<a href="http://facebook.com/crunchbutton" target="_blank"><i class="fa fa-facebook"></i></a>
<a href="http://twitter.com/crunchbutton" target="_blank"><i class="fa fa-twitter"></i></a>
<a href="http://instagram.com/crunchbutton" target="_blank"><i class="fa fa-instagram"></i></a>
<a href="http://www.linkedin.com/company/crunchbutton" target="_blank"><i class="fa fa-linkedin"></i></a>
</div>
<div class="footer-download">
<div class="app-store"></div>
<div class="play-store"></div>
</div>
<div class="divider"></div>
<? /*
<span ng-controller="BottomCtrl">
<div class="divider"></div>
<div class="copyright">&copy; <?=date('Y')?> <a ng-click="navigation.link('/legal')">Crunchbutton</a></div>
</span>
<br>
*/ ?>
</div>
</div>
<div ng-include="'assets/view/notification.alert.html'"></div>
<div ng-include="'assets/view/restaurant.closed.html'"></div>
<div ng-include="'assets/view/account.html'"></div>

View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_3_copy_14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
y="0px" viewBox="0 0 141.6 177.1" enable-background="new 0 0 141.6 177.1" xml:space="preserve">
<path fill="#FFFFFF" d="M141.6,142.8c-8.1,7.8-42.9,10.8-67.3,10.8c-24.4,0-59.3-2.9-67.3-10.8v21.8c0,6.9,30.1,12.5,67.3,12.5
c37.2,0,67.3-5.6,67.3-12.5c0,0,0,0,0,0C141.6,164.4,141.6,149.7,141.6,142.8z"/>
<g>
<g>
<path fill="#FFFFFF" d="M99,127.3c-1.3,0-2.5,0-3.7,0c0.9,5.2,0.9,10.5-2.7,14.9c-6.5,8-23.4,6.7-30.1,3
c-6.3-3.5-10-9.8-11.6-16.7c-0.1-0.4-0.2-0.8-0.3-1.2c-0.6,0-1.2,0.1-1.9,0.1C24.3,129.2,7,133.7,7,139c0,6.9,30.1,12.5,67.3,12.5
c37.2,0,67.3-5.6,67.3-12.5C141.6,133.7,124,129.1,99,127.3z M9.9,139.3c0,0,5.2-7.1,40.2-9.5l0.5,2.4
C50.6,132.2,33.5,131.7,9.9,139.3z"/>
</g>
</g>
<g>
<g>
<path fill="#FFFFFF" d="M101.9,30.3c0-15.5-1-29.3-2.8-29.6C88-0.4,76.6,0.3,65.4,0.3c-5.1,0-10.2,0-15.3,0c-1.3,0-5.3-0.7-6.5,0
C33.3,6.7,24.8,16,20.2,27.4c-3.5,8.7-3.2,18.4-7.7,26.8C8.7,61.1-5.3,70.8,2.1,79.3c5.1,5.8,15,4.4,22.8,0.5
c4.3-2.1,8-5.1,10-7.9c2.4-3.5,7.2-16.8,12.9-20.7c-4-5.4-10-11.5-10-11.5c8.8,3.2,17.9,10.1,20.7,19.3c2.7,8.9,0.8,19.1-0.1,28.2
c-1.5,14.7-9.5,44.7,6.9,53.9c5.4,3,19.2,3.5,23.5-1.7c4.7-5.7,0.2-13.5-0.3-20c-1-12.4-0.4-25.6,3.5-37.5
c1.7-5.3,5.6-9.2,8.1-14.1c2.7-5.2,3.3-11.3,2.8-17.1C102.2,43.9,101.9,37.2,101.9,30.3z"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -95,6 +95,15 @@ html {
cursor: pointer;
}
.finger {
background: url(../images/micro/finger.svg) no-repeat;
width: 80px;
height: 50px;
background-size: 100%;
margin: 0 auto;
cursor: pointer;
}
.menu {
background: url(../images/micro/menu.svg) center center no-repeat;
background-size: 100%;
@ -1276,36 +1285,70 @@ p {
font-size: 1.1em;
}
.footer .social {
float: right;
margin-top: 10px;
@media screen and (min-width: 1025px) {
.footer .social {
margin-top: 10px;
float: left;
}
.footer .social a {
display: inline-block;
border-radius: 3em;
height: 2.9em;
width: 2.9em;
overflow: hidden;
background: #565658;
color: #303033;
margin-right: 1.2em;
text-align: center;
@include transition(all 0.2s ease);
text-decoration: none;
}
.footer .social .fa {
font-size: 24px;
padding-top: .2em;
}
.footer .social a:hover, .footer .social a:active {
background: #00bea0;
}
.footer {
background: #303033;
margin-top: 50px;
text-align: center;
color: #b5b5b6;
position: absolute;
left: 0;
bottom: 0;
height: 300px;
width: 100%;
}
html {
position: relative;
min-height: 100%;
}
body {
margin-bottom: 300px;
}
.content {
padding-bottom: 2em;
}
.divider.line {
background: #3a3a3d;
height: 1px;
}
.fb-like-box {
float: left;
}
}
.footer .social .fa {
font-size: 25px;
padding-right: 10px;
color: #4b4855;
cursor: pointer;
text-decoration: none;
@include transition(color 0.2s ease);
}
.footer .social .fa:hover, .footer .social .fa:active {
color: #00bea0;
}
.footer {
margin-top: 50px;
text-align: center;
}
.divider.line {
background: #c7c7c7;
height: 1px;
}
.fb-like-box {
float: left;
}
.copyright {
font-size: 10px;
@ -3740,7 +3783,12 @@ font-familt: "Museo Slab";
z-index: -1;
left: 61.74%;
font-size: 0.84em;
}
.footer-download {
text-align: right;
}
.fb-like-box {
display: none;
}
}