Skip to content

Commit

Permalink
add two line title
Browse files Browse the repository at this point in the history
  • Loading branch information
garrytan committed Dec 12, 2014
1 parent 18e7b95 commit 16cff2b
Show file tree
Hide file tree
Showing 5 changed files with 199 additions and 20 deletions.
Binary file added assets/hero-nov-2014.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
90 changes: 72 additions & 18 deletions assets/timber.scss
Expand Up @@ -144,11 +144,11 @@ $baseFontSize: 14px; // Henseforth known as 1em
// Icons
@font-face {
font-family: "icons";
src: url(' //cdn.shopify.com/s/files/1/0605/7361/t/6/assets/icons.eot?4461 ');
src: url(' //cdn.shopify.com/s/files/1/0605/7361/t/6/assets/icons.eot?4461 ?#iefix ') format("embedded-opentype"),
url(' //cdn.shopify.com/s/files/1/0605/7361/t/6/assets/icons.woff?4461 ') format("woff"),
url(' //cdn.shopify.com/s/files/1/0605/7361/t/6/assets/icons.ttf?4461 ') format("truetype"),
url(' //cdn.shopify.com/s/files/1/0605/7361/t/6/assets/icons.svg?4461 #timber-icons ') format("svg");
src: url(' //cdn.shopify.com/s/files/1/0605/7361/t/6/assets/icons.eot?5312 ');
src: url(' //cdn.shopify.com/s/files/1/0605/7361/t/6/assets/icons.eot?5312 ?#iefix ') format("embedded-opentype"),
url(' //cdn.shopify.com/s/files/1/0605/7361/t/6/assets/icons.woff?5312 ') format("woff"),
url(' //cdn.shopify.com/s/files/1/0605/7361/t/6/assets/icons.ttf?5312 ') format("truetype"),
url(' //cdn.shopify.com/s/files/1/0605/7361/t/6/assets/icons.svg?5312 #timber-icons ') format("svg");
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -2128,17 +2128,36 @@ nav.nav-bar .grid .grid-item { vertical-align: top; }
# EARTH AND BEAUTY SPECIFIC
==============================================================================*/

/* coupon */
.top-flydown {
background-color: #444;
font-size: 12px;
padding: 10px 0;
color: #aaa;
h3 { font-size: 12px; color: #ccc; display: inline; }
.flydown-detail { display: inline; }
}
a.flydown-link { text-decoration: none; }
a.flydown-link:hover {
.flydown-detail span { text-decoration: underline; }
}


/* homepage */

ul ul.site-nav--dropdown {
margin: 0 0 !important;
}
.above-fold-hero {
min-height: 800px;
background-color: #222;
background: url('//cdn.shopify.com/s/files/1/0605/7361/t/6/assets/hero-sept2014.jpg?4461') #222 no-repeat top center;
background: url('//cdn.shopify.com/s/files/1/0605/7361/t/6/assets/hero-nov2014.jpg?5312') #222 no-repeat top center;
background-size: cover !important;
position: relative;

.logo {
width: 334px; height: 30px;
background: url('//cdn.shopify.com/s/files/1/0605/7361/t/6/assets/homepage-logo.png?4461') no-repeat;
background: url('//cdn.shopify.com/s/files/1/0605/7361/t/6/assets/homepage-logo.png?5312') no-repeat;
margin-top: 300px;

@include at-query ($max, $small) { margin-top: 165px; margin-left: 10px; }
Expand All @@ -2157,16 +2176,23 @@ nav.nav-bar .grid .grid-item { vertical-align: top; }
}

border-bottom: 8px solid #222;

}
@include at-query ($max, $medium) {
/* adjust homepage position just for nov 2014 cover */
.above-fold-hero {
background-position: 65% 30%;
}
}

nav.nav-bar-index {
padding-top: 10px;
a {
color: #eee;
color: #222;
text-transform: uppercase;
font-size: 13px;
text-shadow: 0px 1px rgba(255, 255, 255, 0.5);
}
a:hover { color: #fff; }
a:hover { color: #888; }
}

nav.nav-bar {
Expand All @@ -2176,12 +2202,6 @@ nav.nav-bar {
.second-header {
margin-top: 30px; margin-bottom: 30px;

.logo-black {
width: 125px; height: 50px;
background-size: 125px 50px;
background-image: url('//cdn.shopify.com/s/files/1/0605/7361/t/6/assets/category-page-logo.png?4461');
}

h1, h2 {
font-weight: 100;
margin: -5px 0 0 0;
Expand Down Expand Up @@ -2216,7 +2236,24 @@ nav.nav-bar {
.grid-item { margin: 10px 0; padding-left: 10px; }
.free-shipping, .free-shipping-wrapper { display: none; }
}

.logo-black {
width: 125px; height: 50px;
background-size: 125px 50px;
background-image: url('//cdn.shopify.com/s/files/1/0605/7361/t/6/assets/category-page-logo.png?5312');
}
}
.lookbook {
.main-content { margin-top: 20px; }

.second-header {
margin-top: 20px; margin-bottom: 20px;
/* .logo-black {
margin-top: 7px;
width: 186px; height: 17px; background-size: 186px 17px;
background-image: url('//cdn.shopify.com/s/files/1/0605/7361/t/6/assets/lookbook-logo.png?5312');
}*/
}

}

.product-image { border: 1px solid #e3e3e3; }
Expand Down Expand Up @@ -2358,6 +2395,22 @@ footer {
/*============================================================================
# EARTH AND BEAUTY LOOKBOOK
==============================================================================*/

h2.two-line-title {
.line1 {
font-size: 20px !important;
font-weight: bold;
line-height: 20px;
color: #888;
margin: 0 0; padding: 0 0;
}
.line2 {
font-size: 30px !important;
line-height: 30px;
margin: 0 0; padding: 0 0;
}
margin: 0 0 !important;
}
#lookbook {
position: relative;

Expand Down Expand Up @@ -2410,4 +2463,5 @@ footer {
.ajaxifyCart--close { z-index: 2000 !important;}
#ajaxifyCart.ajaxifyCart--content { z-index: -1 !important; }
#ajaxifyCart {z-index: 1 !important; }
.h4 small { font-weight: normal; }
.h4 small { font-weight: normal; }

2 changes: 1 addition & 1 deletion assets/timber.scss.liquid
Expand Up @@ -2396,7 +2396,7 @@ footer {
# EARTH AND BEAUTY LOOKBOOK
==============================================================================*/

h2.lookbook-title {
h2.two-line-title {
.line1 {
font-size: 20px !important;
font-weight: bold;
Expand Down
7 changes: 6 additions & 1 deletion templates/collection.liquid
Expand Up @@ -13,7 +13,7 @@
<div class="grid-item {% if collection %}{% unless collection.handle contains 'lookbook'%}large--seven-twelfths{% else %}large--ten-twelfths{% endunless%}{%else%}large--seven-twelfths{% endif %}">
{% if collection and collection.title != 'Products'%}
{% if collection.handle contains 'lookbook' %}
<h2 class="lookbook-title">
<h2 class="two-line-title">
{% if collection.handle == 'winter-2014-lookbook-part-1' %}
<div class="line1">Winter 2014</div>
<div class="line2">Lookbook Part 1</div>
Expand All @@ -24,6 +24,11 @@
{{ collection.title }}
{% endif %}
</h2>
{% elsif collection.handle contains 'blogger-edit' %}
<h2 class="two-line-title">
<div class="line1">Blogger Edit</div>
<div class="line2">{{ collection.title | remove: 'Blogger Edit:'}}</div>
</h2>
{% else %}
<h2>{{ collection.title }}</h2>
{% endif %}
Expand Down
120 changes: 120 additions & 0 deletions templates/gift_card.liquid
@@ -0,0 +1,120 @@
{% layout none %}

{% assign formatted_initial_value = gift_card.initial_value | money_without_trailing_zeros: gift_card.currency %}
{% assign formatted_initial_value_stripped = formatted_initial_value | strip_html %}

<!DOCTYPE html>
<html>

<head>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="format-detection" content="telephone=no">

<title>Here's your {{ formatted_initial_value_stripped }} gift card for {{ shop.name }}!</title>
<meta name="description" content="Here's your gift card!">

{{ 'gift-card.css' | shopify_asset_url | stylesheet_tag }}
{{ 'modernizr.gift-card.js' | shopify_asset_url | script_tag }}
<link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">

<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->

<script type='text/javascript'>
function selectText(element) {
var doc = document;
var text = doc.getElementById(element);
if (doc.body.createTextRange) { // ms
var range = doc.body.createTextRange();
range.moveToElementText(text);
range.select();
} else if (window.getSelection) { // moz, opera, webkit
var selection = window.getSelection();
var range = doc.createRange();
range.selectNodeContents(text);
selection.removeAllRanges();
selection.addRange(range);
}
}
</script>

</head>

<body>

<div class="wrap">

<header role="banner" id="header">
<a href="{{ shop.url }}" class="logo">{{ shop.name }}</a>
<a href="{{ shop.url }}" class="shop-url">{{ shop.url | remove: 'http://' }}</a>
</header>

<main role="main">

<div id="gift-card-outer-container" {% if gift_card.expired or gift_card.enabled != true %}class="disabled"{% endif %}>
<div id="gift-card-inner-container">

<header id="gift-card-header">
<h2>Here's your gift card!</h2>
{% unless gift_card.enabled %}
<span class="tag">Disabled</span>
{% endunless %}
{% if gift_card.expired and gift_card.enabled %}
<span class="tag">Expired on {{ gift_card.expires_on | date: "%d/%m/%y" }}</span>
{% endif %}
{% if gift_card.expired != true and gift_card.expires_on and gift_card.enabled %}
<span class="tag light">Expires on {{ gift_card.expires_on | date: "%d/%m/%y" }}</span>
{% endif %}
</header>

<div id="gift-card-holder">
<div class="corner top-left"></div>
<div class="corner bottom-right"></div>
<div class="corner top-right"></div>
<div class="corner bottom-left"></div>
<div id="gift-card">
<img src="{{ 'gift-card/card.jpg' | shopify_asset_url }}" alt="Gift card illustration">
{% assign initial_value_size = formatted_initial_value | size %}
<div id="gift-card-amount" class="{% if initial_value_size > 6 %}medium{% endif %}">
{% if gift_card.balance != gift_card.initial_value %}
<span class="tooltip-container"><span class="tooltip-label">{{ gift_card.balance | money }} <small>left</small></span><span class="tooltip-triangle"></span></span>
{% endif %}
<strong>{{ formatted_initial_value }}</strong>
</div>
{% assign code_size = gift_card.code | format_code | size %}
<div id="gift-card-code-outer" class="{% if code_size <= 25 %}large{% elsif code_size > 25 and code_size <= 30 %}medium{% else %}small{% endif %}" onclick="selectText('gift-card-code-digits');">
<div id="gift-card-code-inner">
<strong id="gift-card-code-digits">{{ gift_card.code | format_code }}</strong>
</div>
</div>
</div>
</div>

<div id="gift-card-instructions">
<p>Use this code at checkout to redeem your gift card</p>
</div>

<div id="gift-card-actions">
<a href="{{ shop.url }}" class="btn center" target="_blank">Start Shopping</a>
<a href="#" class="action-link left" onclick="window.print();"><i class="ico-16 print"></i>Print</a>
</div>

</div>
</div>
</main> <!-- / Main -->

<footer role="contentinfo">
<img src="{{ 'gift-card/icon-bug.png' | shopify_asset_url }}" class="gift-card-icon">
</footer>

</div>

</body>
</html>

0 comments on commit 16cff2b

Please sign in to comment.