Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@rbndelrio
rbndelrio committed Mar 9, 2015
2 parents 3291e65 + fa292a0 commit 5598d9d
Show file tree
Hide file tree
Showing 14 changed files with 318 additions and 45 deletions.
21 changes: 13 additions & 8 deletions brewery.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,46 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="theme-color" content="#F15A2A">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Brewery | Florida Beer Co.</title>
<link rel="apple-touch-icon" href="img/touch-icon.png">
<link rel="icon" sizes="192x192" href="img/touch-icon.png">
<link rel="shortcut icon" href="img/fav.ico">
<link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link href='http://fonts.googleapis.com/css?family=Patua+One|Roboto:500,400italic,700,400|Roboto+Condensed:700,400' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="css/fl-beer-soc.css">
<link href='http://fonts.googleapis.com/css?family=Patua+One|Roboto:500,700,400|Roboto+Condensed:700,400' rel='stylesheet' type='text/css'>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="min/modernizr.js" type="text/javascript"></script>
<script src="min/js.js"></script>
</head>
<body class="brewery">
<header>
<header class="collapsed">
<nav>
<ul>
<li class="pull-right">
<a href="index.html" class="logotype navlink">Florida Beer Co.</a>
</li>
<li class="pull-left">
<a href="#" class="menu navlink"><span class="menutext">Menu</span><i class="fa fa-chevron-down darrow"></i></a>
<a href="#" class="menu navlink">
<span class="menutext">Menu</span>
<i class="fa fa-chevron-down darrow"></i>
</a>
<div class="fs-menu">
<ul class="links">
<li><a href="#">Beer</a></li>
<li><a href="brewery.html" class="current">Brewery</a></li>
<li><a href="#" class="current">Brewery</a></li>
<li><a href="#">About</a></li>
<li><a href="#">Blog</a></li>
<li><a href="#">Store</a></li>
<li><a href="#">Contact</a></li>
</ul>
<ul class="social">
<li><a href="#" class="icon"><span>Facebook</span></a></li>
<li><a href="#" class="icon"><span>Twitter</span></a></li>
<li><a href="#" class="icon"><span>Some other shit</span></a></li>
<li><a href="#" class="icon"><span>Instagram</span></a></li>
<li><a href="#" alt="Facebook" class="icon"><i class="icon-facebook"></i></a></li>
<li><a href="#" alt="Twitter" class="icon"><i class="icon-twitter"></i></a></li>
<li><a href="#" alt="Untapped" class="icon"><i class="icon-untapped"></i></a></li>
<li><a href="#" alt="Instagram" class="icon"><i class="icon-instagram"></i></a></li>
</ul>
</div>
</li>
Expand Down
Binary file added font/fl-beer-soc.eot
View file
Binary file not shown.
15 changes: 15 additions & 0 deletions font/fl-beer-soc.svg
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 font/fl-beer-soc.ttf
View file
Binary file not shown.
Binary file added font/fl-beer-soc.woff
View file
Binary file not shown.
Binary file modified img/beer.jpg
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 img/beerpattern.jpg
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 img/ourfacility.jpg
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 img/ourteam.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 53 additions & 10 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,46 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="theme-color" content="#F15A2A">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Florida Beer Co.</title>
<link rel="apple-touch-icon" href="img/touch-icon.png">
<link rel="icon" sizes="192x192" href="img/touch-icon.png">
<link rel="shortcut icon" href="img/fav.ico">
<link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link href='http://fonts.googleapis.com/css?family=Patua+One|Roboto:500,400italic,700,400|Roboto+Condensed:700,400' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="css/fl-beer-soc.css">
<link href='http://fonts.googleapis.com/css?family=Patua+One|Roboto:500,700,400|Roboto+Condensed:700,400' rel='stylesheet' type='text/css'>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="min/modernizr.js" type="text/javascript"></script>
<script src="min/js.js"></script>
</head>
<body class="brewery">
<header>
<body class="beer">
<header class="collapsed">
<nav>
<ul>
<li class="pull-right">
<a href="index.html" class="logotype navlink current">Florida Beer Co.</a>
</li>
<li class="pull-left">
<a href="#" class="menu navlink"><span class="menutext">Menu</span><span class="darrow">&#x2304;</span></a>
<a href="#" class="menu navlink">
<span class="menutext">Menu</span>
<i class="fa fa-chevron-down darrow"></i>
</a>
<div class="fs-menu">
<ul class="links">
<li><a href="#">Beer</a></li>
<li><a href="#" class="current">Beer</a></li>
<li><a href="brewery.html">Brewery</a></li>
<li><a href="#">About</a></li>
<li><a href="#">Blog</a></li>
<li><a href="#">Store</a></li>
<li><a href="#">Contact</a></li>
</ul>
<ul class="social">
<li><a href="#" class="icon"><span>Facebook</span></a></li>
<li><a href="#" class="icon"><span>Twitter</span></a></li>
<li><a href="#" class="icon"><span>Some other shit</span></a></li>
<li><a href="#" class="icon"><span>Instagram</span></a></li>
<li><a href="#" alt="Facebook" class="icon"><i class="icon-facebook"></i></a></li>
<li><a href="#" alt="Twitter" class="icon"><i class="icon-twitter"></i></a></li>
<li><a href="#" alt="Untapped" class="icon"><i class="icon-untapped"></i></a></li>
<li><a href="#" alt="Instagram" class="icon"><i class="icon-instagram"></i></a></li>
</ul>
</div>
</li>
Expand All @@ -48,7 +53,45 @@
</nav>
</header>
<div class="bodywrap">

<section class="subpage">
<article class="fs-img bgcoverize">
<div class="imgwrap">
<img src="img/beer.jpg" alt="Beer!">
</div>
<div class="overlay"></div>
<div class="content box">
<h1>Beer Menu</h1>
<hr>
<p>There are many variations of passages of Lorem Ipsum available, but the majority have</p>
<a href="#" alt="Beer Menu">
<div class="bttn go">
<i class="fa fa-chevron-right darrow"></i>
</div>
</a>
</div>
<div class="nextpage">
<i class="fa fa-chevron-down darrow"></i>
</div>
</article>
</section>
<section class="subpage">
<article class="fs-img bgcoverize">
<div class="imgwrap">
<img src="img/lotsabeer.jpg" alt="Our Brewery">
</div>
<div class="overlay"></div>
<div class="content box">
<h1>Brewery</h1>
<hr>
<p>There are many variations of passages of Lorem Ipsum available, but the majority have</p>
<a href="#" alt="Brewery">
<div class="bttn go">
<i class="fa fa-chevron-right darrow"></i>
</div>
</a>
</div>
</article>
</section>
</div>
<footer></footer>
</body>
Expand Down
42 changes: 28 additions & 14 deletions js/js.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
$(document).ready(function () {
var imgContainer = $('.bgcoverize'),
$bg = $(".bgcoverize > .imgwrap > img"),
yolo = $bg,
aspectRatio = yolo.width() / yolo.height();
var $bg = $(".bgcoverize > .imgwrap > img"),
imgContainer = $('.bgcoverize'),
yolo,
aspectRatio;



function resizeBg() {
$bg.each(function () {
Expand All @@ -22,18 +24,30 @@ $(document).ready(function () {
});

}



resizeBg();
$('.beer .subpage').height($(window).height());



$(window).resize(function () {
resizeBg();
$('.beer .subpage').height($(window).height());
});

$('.menu').click(function (event) {
event.preventDefault();
$('header').toggleClass('open collapsed');
});

$(".current").click(function (event) {
event.preventDefault();
$('header').toggleClass('open collapsed');
});

$('.nextpage').click(function () {
$("html, body").animate({ scrollTop: $(document).height() }, "slow");
});
// function imageFun(wrapper) {
// var img = $("img", wrapper);
// console.log($(wrapper));
// }
// imageFun();
// $(window).resize(function () {
// $('.imgwrap').each(function () {
// imageFun(this);
// });
// });
});
1 change: 1 addition & 0 deletions sass/_color.sass
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ $cream: #F4F2E0
$dimorange: #762F1B
$orangered: #A13F24
$midorange: #A13F24
$navborder: rgba(223, 81, 37, 0.95)

//--- Brand ---//
$brand-primary: $orange
Expand Down
8 changes: 5 additions & 3 deletions sass/_var.sass
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ $phone: "(max-width: 500px)"
$phablet: "(max-width: 767px)"
$tablet: "(min-width: 768px) and (max-width: 1023px)"
$sdesk: "(min-width: 1024px) and (max-width: 1200px)"
$desktop: "(min-width: 1024px)"
$ldesk: "(min-width: 1600px)"
$desktop: "(min-width: 1024px)"
$ldesk: "(min-width: 1600px)"
$sdesk-max: "(max-width: 1200px)"

$sdesk-max: "(max-width: 1200px)"
//--- Timing Functions ---//
$easeInOutQuart: cubic-bezier(0.770, 0.000, 0.175, 1.000)
Loading

0 comments on commit 5598d9d

Please sign in to comment.