Skip to content
This repository has been archived by the owner on Oct 20, 2020. It is now read-only.

Commit

Permalink
Fixed b/w menu bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathewsuen
mathewsuen committed Jun 27, 2013
1 parent 36d22b9 commit 4e77bd2
Show file tree
Hide file tree
Showing 8 changed files with 5,334 additions and 5,261 deletions.
1,837 changes: 910 additions & 927 deletions sites/all/themes/accurate/images/graphics.ai
View file

Large diffs are not rendered by default.

8,547 changes: 4,325 additions & 4,222 deletions sites/all/themes/alh/css/assets/mock.ai
View file

Large diffs are not rendered by default.

141 changes: 63 additions & 78 deletions sites/all/themes/alhx/css/pages.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ body {
width: 100%;
}

a:link, a:visited {
color: #2c6bc6;
}

a:hover, a:active {
text-decoration: none;
}

#page {
overflow: auto;
border-top: 10px solid #bc3f3f;
Expand Down Expand Up @@ -78,27 +86,27 @@ header, .mainNav {
}

header > div {
padding: 2em;
padding-top: 2em;
width: 10em;
}

/* @group Social Media / Contact Icons */

.contactIcons {
margin-top: 1em;
display: block;
margin: 1em auto;
position: fixed;
bottom: 0em;
width: 200px;
width: 10em;
}

.contactIcons ul {
text-align: center;
padding: 0;
}

.contactIcons ul li {
font-size: 1.2em;
display: inline-block;
text-align: center;
display: inline;
}

.contactIcons a:link, .contactIcons a:visited {
Expand Down Expand Up @@ -206,13 +214,15 @@ ul.socialIcons li a {

/* @end */

/* @group Header */

.header h1, .header h2 {
margin: 0;
padding: 0;
}

.header .logoCol {
padding-right: 2em;

}

.header {
Expand Down Expand Up @@ -273,16 +283,9 @@ h1.logo a:hover span, h1.logo a:active span {
margin: 1em auto 0 auto;
}

#madeinBadge h1 {
/* margin-top: -1.8em;*/
background: url(assets/madeinStamford.png) no-repeat;
width: 180px;
height: 180px;
display: none;
text-indent: -999em;
position: absolute;
right: 180px;
}
/* @end */

/* @group Main Navigation */

.mainNav > div {
padding: 2em 2em 2em 4em;
Expand Down Expand Up @@ -324,15 +327,7 @@ h1.logo a:hover span, h1.logo a:active span {
text-decoration: underline;
}

#logo { /* Wrapping link for logo */
float: left; /* LTR */
margin: 0;
padding: 0;
}

#logo img {
vertical-align: bottom;
}
/* @end */

/* @group Product Filters */

Expand Down Expand Up @@ -386,6 +381,47 @@ h1.logo a:hover span, h1.logo a:active span {
}

/* @end */
/* @group Content Column */

#content {
padding-top: 2em;
}

#content > div {
padding: 0 2em;
}

#content h2 {
font: bold 1.6em/1.5em "futura-pt", "century gothic", "helvetica", "arial", "sans-serif";
}

#content ul {
padding: 0;
}

#content article {
line-height: 1.8em;
padding: 0;
}

.region-highlighted {
}

.breadcrumb { /* The path to the current page in the form of a list of links */
}
.breadcrumb ol {
margin: 0;
padding: 0;
}
.breadcrumb li {
display: inline;
list-style-type: none;
margin: 0;
padding: 0;
}

/* @end */

#name-and-slogan { /* Wrapper for website name and slogan */
float: left;
}
Expand Down Expand Up @@ -425,57 +461,6 @@ h1.logo a:hover span, h1.logo a:active span {
* Content
*/

/* @group Content Column */

#content {

}

#content h2 {
font: bold 1.6em/1.5em "futura-pt", "century gothic", "helvetica", "arial", "sans-serif";
}

#content article {
line-height: 1.8em;
padding: 0;
}

article > div > div > div > div {
width: 59.8%;
display: block;
float: left;
padding-right: 1em;
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-moz-box-sizing: border-box; /* Firefox, other Gecko */
box-sizing: border-box
}

article .rightCol {
padding-right: 0;
padding-left: 1em;
display: block;
float: right !important;
width: 40.2%;
}

.region-highlighted {
}

.breadcrumb { /* The path to the current page in the form of a list of links */
}
.breadcrumb ol {
margin: 0;
padding: 0;
}
.breadcrumb li {
display: inline;
list-style-type: none;
margin: 0;
padding: 0;
}

/* @end */

h1.title, /* The title of the page */
h2.node-title, /* Title of a piece of content when it is given in a list of content */
h2.block-title, /* Block title */
Expand Down Expand Up @@ -596,7 +581,7 @@ footer {

footer > div {
border-top: 1px solid #bc3f3f;
margin-bottom: 4em;
margin-bottom: 3em;
}

/* @end */
Expand Down
6 changes: 5 additions & 1 deletion sites/all/themes/alhx/js/application.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $(document).ready(function() {
});

function cropScroll() {
var currPosition = $(window).scrollTop();
var currPosition = Math.abs($(window).scrollTop());

var overClipTop = 0 - currPosition;
var overClipBottom = overClipTop + $('.splash').height() - 4;
Expand All @@ -25,6 +25,10 @@ $(document).ready(function() {
$('.underlay').css({clip : underRect});
};

$(window).load(function () {
cropScroll();
});

$(window).scroll(function () {
cropScroll();
});
Expand Down
43 changes: 21 additions & 22 deletions sites/all/themes/alhx/templates/page--front.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,30 +72,29 @@

<div id="page">

<header class="header fixed" role="banner">
<div class="dup">
<div class="headerBar">
<div class="logotype logoCol">
<h1 class="logo">
<a href="/" >
<span>The<br />Accurate<br />Lock &amp; Hardware<br />Company</span>
<span class="subTitle">Designed &amp;<br />manufactured in<br />Stamford, Conn.<br />U.S.A.</span>
</a>
</h1>
</div>
<header class="header fixed" role="banner">
<div class="dup">
<div class="headerBar">
<div class="logotype logoCol">
<h1 class="logo">
<a href="<?php print url('<front>', array('absolute' => TRUE)); ?>" >
<span>The<br />Accurate<br />Lock &amp; Hardware<br />Company</span>
<span class="subTitle">Designed &amp;<br />manufactured in<br />Stamford, Conn.<br />U.S.A.</span>
</a>
</h1>
<div class="contactIcons">
<ul>
<li><a href="#" class="icon-envelop"></a></li>
<li><a href="#" class="icon-location"></a></li>
<!-- <li><a href="#" class="icon-phone"></a></li>-->
<li><a href="#" class="icon-twitter"></a></li>
<li><a href="#" class="icon-facebook"></a></li>
</ul>
</div>
</div>

<div class="contactIcons">
<ul>
<li><a href="#" class="icon-envelop"></a></li>
<li><a href="#" class="icon-location"></a></li>
<!-- <li><a href="#" class="icon-phone"></a></li>-->
<li><a href="#" class="icon-twitter"></a></li>
<li><a href="#" class="icon-facebook"></a></li>
</ul>
</div>
</div>
</header>
</div>
</header>

<div class="mainNav fixed">
<div class="dup">
Expand Down
21 changes: 10 additions & 11 deletions sites/all/themes/alhx/templates/page.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,22 @@
<div class="headerBar">
<div class="logotype logoCol">
<h1 class="logo">
<a href="/" >
<a href="<?php print url('<front>', array('absolute' => TRUE)); ?>" >
<span>The<br />Accurate<br />Lock &amp; Hardware<br />Company</span>
<span class="subTitle">Designed &amp;<br />manufactured in<br />Stamford, Conn.<br />U.S.A.</span>
</a>
</h1>
<div class="contactIcons">
<ul>
<li><a href="#" class="icon-envelop"></a></li>
<li><a href="#" class="icon-location"></a></li>
<!-- <li><a href="#" class="icon-phone"></a></li>-->
<li><a href="#" class="icon-twitter"></a></li>
<li><a href="#" class="icon-facebook"></a></li>
</ul>
</div>
</div>
</div>

<div class="contactIcons">
<ul>
<li><a href="#" class="icon-envelop"></a></li>
<li><a href="#" class="icon-location"></a></li>
<!-- <li><a href="#" class="icon-phone"></a></li>-->
<li><a href="#" class="icon-twitter"></a></li>
<li><a href="#" class="icon-facebook"></a></li>
</ul>
</div>
</div>
</header>

Expand Down
Binary file added sites/default/files/page-images/alhfloor.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sites/default/files/styles/thumbnail/public/page-images/alhfloor.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 4e77bd2

Please sign in to comment.