Skip to content
This repository has been archived by the owner on Aug 30, 2018. It is now read-only.

Commit

Permalink
Merge pull request #102 from Shopify/unnused-styles
Browse files Browse the repository at this point in the history 
Unused styles
  • Loading branch information
@cshold
cshold committed Jun 12, 2014
2 parents bffc6ae + 7d2a814 commit d1bad77
Show file tree
Hide file tree
Showing 17 changed files with 96 additions and 152 deletions.
6 changes: 2 additions & 4 deletions assets/ajaxify.scss.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -625,8 +625,7 @@ form[action^="/cart/add"] {
#ajaxifyModal {
.cart-row:hover input[type="text"],
.ajaxifyCart--product:hover input[type="text"],
.supports-touch input[type="text"],
.page-header {
.supports-touch input[type="text"] {
border-color: $modalBorderColor;
}

Expand Down Expand Up @@ -709,8 +708,7 @@ form[action^="/cart/add"] {
#ajaxifyDrawer {
.cart-row:hover input[type="text"],
.ajaxifyCart--product:hover input[type="text"],
.supports-touch input[type="text"],
.page-header {
.supports-touch input[type="text"] {
border-color: $drawerBorderColor;
}

Expand Down
18 changes: 2 additions & 16 deletions assets/timber.scss.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -792,10 +792,7 @@ hr {
}
}

.page-header {
@extend .clearfix;
}

/*================ Section Headers ================*/
.section-header {
margin-bottom: $gutter/2;
}
Expand Down Expand Up @@ -1818,16 +1815,6 @@ label.error {
/*============================================================================
#Blogs and Comments
==============================================================================*/
.template-article {
.article-header {
margin-bottom: 0;

& + .text-light {
display: block;
margin-bottom: $gutter;
}
}
}

/*================ Comments ================*/
.comment-content {
Expand Down Expand Up @@ -1903,8 +1890,7 @@ label.error {
border-top-color: #444;
}

&:first-child,
.page-header + & {
&:first-child {
margin-top: 0;
}

Expand Down
18 changes: 9 additions & 9 deletions templates/article.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@

<div class="grid-item large--three-quarters">

<header class="page-header">
<h1 class="article-header">{{ article.title }}</h1>
<em class="text-light">
Posted by <strong>{{ article.author }}</strong> on
<strong>
<time pubdate datetime="{{ article.published_at | date: '%Y-%m-%d' }}">
<header class="section-header">
<div class="section-header--left">
<h1>{{ article.title }}</h1>
<p class="text-light">
Posted by <strong>{{ article.author }}</strong> at
<strong><time pubdate datetime="{{ article.published_at | date: '%Y-%m-%d' }}">
{{ article.published_at | date: '%b %d, %Y' }}
</time>
</strong>
</em>
</time></strong>
</p>
</div>
</header>

<div class="rte">
Expand Down
23 changes: 11 additions & 12 deletions templates/blog.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,12 @@
<div class="grid">

<div class="grid-item large--three-quarters">
<header class="page-header">

{% if current_tags %}
<h2>{{ blog.title | link_to: blog.url }} &mdash; {{ current_tags.first }}</h2>
{% else %}
<h2>{{ blog.title }}</h2>
{% endif %}

</header>
{% if current_tags %}
<h2>{{ blog.title | link_to: blog.url }} &mdash; {{ current_tags.first }}</h2>
{% else %}
<h2>{{ blog.title }}</h2>
{% endif %}

{% comment %}
Loop through each article in your blog. This is limited to what you set for pagination above.
Expand All @@ -37,10 +34,12 @@
{% for article in blog.articles %}

<h3><a href="{{ article.url }}">{{ article.title }}</a></h3>
<span class="blog_author">Posted by {{ article.author }} at
<time pubdate datetime="{{ article.published_at | date: '%Y-%m-%d' }}">
<p class="text-light">
Posted by <strong>{{ article.author }}</strong> at
<strong><time pubdate datetime="{{ article.published_at | date: '%Y-%m-%d' }}">
{{ article.published_at | date: '%b %d, %Y' }}
</time></span>
</time></strong>
</p>

{% comment %}
Add a surrounding div with class 'rte' to anything that will come from the rich text editor.
Expand Down Expand Up @@ -74,7 +73,7 @@

</ul>

<p><a class="blog-read-more" href="{{ article.url }}">Read more →</a></p>
<p><a href="{{ article.url }}">Read more →</a></p>

<hr>

Expand Down
4 changes: 1 addition & 3 deletions templates/cart.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
{% if cart.item_count > 0 %}
<form action="/cart" method="post" novalidate>

<header class="page-header">
<h1>Shopping Cart</h1>
</header>
<h1>Shopping Cart</h1>

{% comment %}
Loop through products in the cart
Expand Down
14 changes: 5 additions & 9 deletions templates/customers/account.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@

{% layout settings.customer_layout %}

<header class="page-header">
<h1>My Account</h1>
</header>
<h1>My Account</h1>

<hr class="hr-small">

<div class="grid">

<div class="grid-item two-thirds medium-down--one-whole">
<header class="page-header">
<h4>Order History</h4>
</header>
<h4>Order History</h4>

{% comment %}
If we have past orders, loop through each one
Expand Down Expand Up @@ -65,9 +63,7 @@
</div>

<div class="grid-item one-third medium-down--one-whole">
<header class="page-header">
<h4>Account Details</h4>
</header>
<h4>Account Details</h4>

<h5>{{ customer.name }}</h5>

Expand Down
40 changes: 19 additions & 21 deletions templates/customers/activate_account.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,29 @@
<div class="grid">
<div class="grid-item large--one-third push--large--one-third">

<header class="page-header">
<h1>Activate Account</h1>
</header>
<p>Create your password to activate your account.</p>
<h1>Activate Account</h1>
<p>Create your password to activate your account.</p>

{% comment %}
This form must use 'activate_customer_password'
{% endcomment %}
{% form 'activate_customer_password' %}
{% comment %}
This form must use 'activate_customer_password'
{% endcomment %}
{% form 'activate_customer_password' %}

{% include 'form-errors-custom' %}
{% include 'form-errors-custom' %}

<label for="customer_password">Password</label>
<input type="password" value="" name="customer[password]" id="customer_password">
<label for="customer_password">Password</label>
<input type="password" value="" name="customer[password]" id="customer_password">

<label for="customer_password_confirmation">Password Confirmation</label>
<input type="password" value="" name="customer[password_confirmation]" id="customer_password_confirmation">
<label for="customer_password_confirmation">Password Confirmation</label>
<input type="password" value="" name="customer[password_confirmation]" id="customer_password_confirmation">

<div class="text-center">
<p>
<input type="submit" class="btn" value="Activate Account">
</p>
or <input type="submit" class="text-link" name="decline" id="customer_decline" value="Decline Invitation">
</div>
{% endform %}
<div class="text-center">
<p>
<input type="submit" class="btn" value="Activate Account">
</p>
or <input type="submit" class="text-link" name="decline" id="customer_decline" value="Decline Invitation">
</div>
{% endform %}

</div>
</div>
</div>
42 changes: 19 additions & 23 deletions templates/customers/addresses.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,29 @@

{% layout settings.customer_layout %}

<div class="grid">
<div class="grid-item large--two-thirds push--large--one-sixth">
<header class="section-header">
<h1 class="section-header--left">My Account</h1>
<div class="section-header--right">
<a href="#" class="btn" onclick="Shopify.CustomerAddress.toggleNewForm(); return false;">Add New Address</a>
</div>
</header>

<hr class="hr-small">

<header class="page-header">
<h1 class="large--left">My Account</h1>
<p class="large--right">
<a href="#" class="btn" onclick="Shopify.CustomerAddress.toggleNewForm(); return false;">Add New Address</a>
</p>
</header>
<div class="grid">

<p class="large--text-right"><a href="/account">Return to Account Details</a></p>
<div class="grid-item one-third medium-down--one-whole">
<p><a href="/account">Return to Account Details</a></p>
</div>
<div class="grid-item two-thirds medium-down--one-whole">

{% comment %}
Add address form, hidden by default
{% endcomment %}
<div id="add_address" style="display: none;">
{% form 'customer_address', customer.new_address %}

<header class="page-header">
<h2>Add a new address</h2>
</header>
<h2>Add a new address</h2>

<div class="grid">

Expand Down Expand Up @@ -99,13 +101,11 @@
<span class="form-spacer">or</span>
<a href="#" onclick="Shopify.CustomerAddress.toggleNewForm(); return false;">Cancel</a>

<hr>
{% endform %}
<hr>
</div>

<header class="page-header">
<h2>Customer Address Book</h2>
</header>
<h2>Customer Address Book</h2>

{% comment %}
List all customer addresses with a unique edit form.
Expand Down Expand Up @@ -138,9 +138,7 @@
<div id="edit_address_{{address.id}}" style="display:none;">
{% form 'customer_address', address %}

<header class="page-header">
<h4>Edit address</h4>
</header>
<h4>Edit address</h4>

<div class="grid">

Expand Down Expand Up @@ -196,11 +194,10 @@
<input type="submit" class="btn" value="Update Address">
or <a href="#" onclick="Shopify.CustomerAddress.toggleForm({{form.id}}); return false;">Cancel</a>

<hr>
{% endform %}
</div>

<hr>

{% endfor %}

{% if paginate.pages > 1 %}
Expand All @@ -210,9 +207,8 @@
{% endif %}

{% endpaginate %}


</div>

</div>


Expand Down
4 changes: 1 addition & 3 deletions templates/customers/login.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@
{% endcomment %}
{% form 'customer_login' %}

<header class="page-header">
<h1>Login</h1>
</header>
<h1>Login</h1>

{% include 'form-errors-custom' %}

Expand Down
16 changes: 4 additions & 12 deletions templates/customers/order.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,14 @@

{% layout settings.customer_layout %}

<header class="page-header">
<h1>My Account</h1>
</header>
<h1>My Account</h1>

<p><a href="/account">Return to Account Details</a></p>

<div class="grid">

<div class="grid-item two-thirds medium-down--one-whole">
<header class="page-header">
<h4>Order {{ order.name }}</h4>
</header>
<h4>Order {{ order.name }}</h4>

<p>Placed on <strong>{{ order.created_at | date: "%B %d, %Y %I:%M%p" }}</strong></p>

Expand Down Expand Up @@ -108,9 +104,7 @@

<div class="grid-item one-third medium-down--one-whole">

<div class="page-header">
<h4>Billing Information</h4>
</div>
<h4>Billing Information</h4>

<p><strong>Payment Status:</strong> {{ order.financial_status }}</p>

Expand All @@ -129,9 +123,7 @@
{{ order.billing_address.phone }}
</p>

<div class="page-header">
<h4>Shipping Information</h4>
</div>
<h4>Shipping Information</h4>

<p><strong>Fulfillment Status:</strong> {{ order.fulfillment_status }}</p>

Expand Down
4 changes: 1 addition & 3 deletions templates/customers/register.liquid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

<div class="grid-item large--one-third push--large--one-third">

<header class="page-header">
<h1>Create Account</h1>
</header>
<h1>Create Account</h1>

{% comment %}
This form must use 'create_customer'
Expand Down

0 comments on commit d1bad77

Please sign in to comment.