Walks through each page

Torey Heinz committed Jul 03, 2018
commit 4b7b3fbfe2e2d77d1fe6cd763ecbf5c2239b0bfd
Showing 30 changed files with 110 additions and 130 deletions
app/views/pages/about.liquid +1 -1
@@ @@ -14,4 +14,4 @@ editable_elements:
Expediting to assure your demands are met.</div>"
main/heading: Choice Castings
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/confirmations/contact.liquid +35 -0
@@ @@ -0,0 +1,35 @@
+ ---
+ title: Contact Thank You
+ slug: contact
+ position: 99
+ listed: false
+ published: true
+ is_layout: false
+ seo_title: Contact Thank You
+ editable_elements:
+ main/content: '<strong>Contact Info:</strong><br>Phone: <a href="tel:16169566800">(616)
+ 956-6800</a><br>Fax: (616) 956-6899<br>Email: <a target="_blank" href="mailto:info@choicecastings.com">info@choicecastings.com</a><div><br></div><div><b>Mailing
+ Address:</b><br>1550 E. Beltline Ave. SE, Suite 360<br>Grand Rapids, MI 49506<br><br><br></div>'
+ main/heading: You've Made the Right Choice!
+ ---
+ {% extends "layouts/application" %}
+ {% block main %}
+ <div class="row">
+ <div class="column content page">
+ {{ site.name }}
+ {{ site.email }}
+ {{ site.metafields }}
+ <ul>
+ {% for metafield in site.metafields.global %}
+ <li>
+ {{ metafield.label }}
+ <small>({{ metafield.name }})</small>
+ = {{ metafield.value }}
+ </li>
+ {% endfor %}
+ </ul>
+ <h1>{% editable_text "heading", line_break: false, format: 'raw', rows: 1 %}{% endeditable_text %}</h1>
+ {% editable_text content %}Lorem ipsum{% endeditable_text %}
+ </div>
+ </div>
+ {% endblock %}
app/views/pages/contact-thank-you.liquid +0 -35
@@ @@ -1,35 +0,0 @@
- ---
- title: Contact Thank You
- slug: contact-thank-you
- position: 99
- listed: false
- published: true
- is_layout: false
- seo_title: Contact Thank You
- editable_elements:
- main/content: '<strong>Contact Info:</strong><br>Phone: <a href="tel:16169566800">(616)
- 956-6800</a><br>Fax: (616) 956-6899<br>Email: <a target="_blank" href="mailto:info@choicecastings.com">info@choicecastings.com</a><div><br></div><div><b>Mailing
- Address:</b><br>1550 E. Beltline Ave. SE, Suite 360<br>Grand Rapids, MI 49506<br><br><br></div>'
- main/heading: You've Made the Right Choice!
- ---
- {% extends "layouts/application" %}
- {% block main %}
- <div class="row">
- <div class="column content page">
- {{ site.name }}
- {{ site.email }}
- {{ site.metafields }}
- <ul>
- {% for metafield in site.metafields.global %}
- <li>
- {{ metafield.label }}
- <small>({{ metafield.name }})</small>
- = {{ metafield.value }}
- </li>
- {% endfor %}
- </ul>
- <h1>{% editable_text "heading", line_break: false, format: 'raw', rows: 1 %}{% endeditable_text %}</h1>
- {% editable_text content %}Lorem ipsum{% endeditable_text %}
- </div>
- </div>
- {% endblock %}
app/views/pages/contact.liquid +1 -1
@@ @@ -20,7 +20,7 @@ editable_elements:
{% editable_text content %}Lorem ipsum{% endeditable_text %}
<hr>
<h2>Send us a Message</h2>
- {% model_form 'customer_messages', success: '/contact-thank-you', error: '/contact' %}
+ {% model_form 'customer_messages', success: '/confirmations/contact', error: '/contact' %}
{% if customer_message.errors %}
<p>The following errors occured:</p>
app/views/pages/layouts.liquid +0 -9
@@ @@ -1,9 +0,0 @@
- ---
- title: Layouts
- slug: layouts
- position: 99
- listed: false
- published: false
- is_layout: false
- ---
- {% extends parent %}
\ No newline at end of file
app/views/pages/layouts/application.liquid +1 -1
@@ @@ -67,7 +67,7 @@ is_layout: true
{% block main %}
<div class="row">
<div class="column content page">
- <h1 class="text-center">{% editable_text "heading", line_break: false, format: 'raw', rows: 1 %}{% endeditable_text %}</h1>
+ <h1>{% editable_text "heading", line_break: false, format: 'raw', rows: 1 %}{% endeditable_text %}</h1>
{% editable_text content %}Lorem ipsum{% endeditable_text %}
</div>
</div>
app/views/pages/layouts/page-with-children.liquid +1 -1
@@ @@ -11,7 +11,7 @@ is_layout: true
{% block main %}
<div class="row">
<div class="column content page">
- <h1 class="text-center">{% editable_text "heading", line_break: false, format: 'raw', rows: 1 %}{% endeditable_text %}</h1>
+ <h1>{% editable_text "heading", line_break: false, format: 'raw', rows: 1 %}{% endeditable_text %}</h1>
{% if featured_image != blank %}
<div class="featured_image">
<img class="thumbnail" title="{{ page.title }}" alt="{{ page.title }}" src="{{ featured_image | resize: '400x>', optimize: 80 }}">
app/views/pages/layouts/page.liquid +1 -1
@@ @@ -11,7 +11,7 @@ is_layout: true
{% block main %}
<div class="row">
<div class="column content page">
- <h1 class="text-center">{% editable_text "heading", line_break: false, format: 'raw', rows: 1 %}{% endeditable_text %}</h1>
+ <h1>{% editable_text "heading", line_break: false, format: 'raw', rows: 1 %}{% endeditable_text %}</h1>
{% if featured_image != blank %}
<div class="featured_image">
<img class="thumbnail" title="{{ page.title }}" alt="{{ page.title }}" src="{{ featured_image | resize: '400x>', optimize: 80 }}">
app/views/pages/layouts/simple.liquid +0 -8
@@ @@ -1,8 +0,0 @@
- ---
- title: Simple
- slug: simple
- position: 99
- listed: false
- published: true
- is_layout: true
- ---
\ No newline at end of file
app/views/pages/materials/aluminum.liquid +6 -7
@@ @@ -7,14 +7,13 @@ published: true
is_layout: false
seo_title: Aluminum
editable_elements:
- main/content: <div><img class="wysiwyg-float-left" title="AL_Casting.jpg" alt="undefined"
- src="/samples/assets/AL_Casting.jpg">We select casting suppliers based on part
- size, production volume, and technical requirements, making sure that foundries
- produce according to their capabilities and strengths.</div><div><br></div><div>Tooling
- is frequently shared with foundries producing parts in differerent metals - efficient
- and seamlessly.<br></div><br>Our vendor base produces:<br><ul><li>Sand castings
+ main/content: <p>We select casting suppliers based on part size, production volume, and technical requirements, making sure that foundries
+ produce according to their capabilities and strengths.</p>
+ <p>Tooling is frequently shared with foundries producing parts in differerent metals - efficient
+ and seamlessly.</p><p>Our vendor base produces:</p><ul><li>Sand castings
on manual and automatic horizontal molding lines.<br></li><li>Permanent mold castings
up to 100 pounds.<br></li><li>Die castings.<br></li></ul>
main/heading: Aluminum
+ main/featured_image: /samples/assets/AL_Casting.jpg
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/materials/copper.liquid +3 -4
@@ @@ -7,11 +7,10 @@ published: true
is_layout: false
seo_title: Copper
editable_elements:
- main/content: <div><img class="wysiwyg-float-left" title="Brass_casting.JPG" alt="undefined"
- src="/samples/assets/Brass_casting.JPG">We supply copper alloys produced in sand
- and permanent mold, including:</div><ul><li>Brass</li><li>Aluminum and silicon
+ main/content: <p>We supply copper alloys produced in sand and permanent mold, including:</p><ul><li>Brass</li><li>Aluminum and silicon
bronze</li><li>High conductivity copper</li></ul><p></p><p></p><p></p><p></p>Sand
castings are produced on squeezer and automatic lines, machining optional.<br>
main/heading: Copper Alloys
+ main/featured_image: /samples/assets/Brass_casting.JPG
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/materials/ductile-iron.liquid +3 -4
@@ @@ -7,12 +7,11 @@ published: true
is_layout: false
seo_title: Ductile Iron
editable_elements:
- main/content: <img class="wysiwyg-float-right" title="gearbox.jpg" alt="undefined"
- src="/samples/assets/gearbox-1.jpg">Large, challenging parts with complex cores
- and wall sections of ¼ inch and up.<br><br>We can help you with ductile iron parts
+ main/content: Large, challenging parts with complex cores and wall sections of ¼ inch and up.<br><br>We can help you with ductile iron parts
weighing 10 to 1,000 pounds with annual demand up to 25,000 pieces.<br><br>Our
foundries are modern that reinvest and provide sophisticated services from design
and molding simulation to water-base priming and robotic fettling.
main/heading: Ductile Iron
+ main/featured_image: /samples/assets/gearbox.jpg
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/materials/gray-iron.liquid +3 -3
@@ @@ -7,11 +7,11 @@ published: true
is_layout: false
seo_title: Gray Iron
editable_elements:
- main/content: <p class="wysiwyg-text-align-justify"><img class="wysiwyg-float-right"
- title="home-images-1.jpg" alt="undefined" src="/samples/assets/home-images-1.jpg">We
+ main/content: <p>We
excel in challenging parts. Small castings with extremely tight tolerances and
wall thicknesses below 3mm produced on the fastest molding equipment available.</p><p>Current
customers manufacture pumps, electrical fittings, hand tools and compressors.</p>
main/heading: Gray Iron
+ main/featured_image: /samples/assets/home-images-1.jpg
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/materials/malleable-iron.liquid +3 -4
@@ @@ -7,14 +7,13 @@ published: true
is_layout: false
seo_title: Malleable Iron
editable_elements:
- main/content: <div><img class="wysiwyg-float-left" title="11-70-adjustable.jpg"
- alt="undefined" src="/samples/assets/11-70-adjustable.jpg">The ductile iron with
- best machining performance is malleable iron.&nbsp; We work with the best malleable
+ main/content: <div>The ductile iron with the best machining performance is malleable iron.&nbsp; We work with the best malleable
iron foundries in the world, producing exceptional fully functional and machinable
thin-walled sections are required. Applications also include larger products of
older design.<br></div><br>Whether domestic supply or imports - our partners assure
fast delivery of certified product. Our spectrum ranges from industrial to military
application - ferritic or pearlitic malleable iron.<br>
main/heading: Malleable Iron
+ main/featured_image: /samples/assets/11-70-adjustable.jpg
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/materials/steel-large-complex.liquid +5 -6
@@ @@ -7,14 +7,13 @@ published: true
is_layout: false
seo_title: Steel (large Complex)
editable_elements:
- main/content: "<img class=\"wysiwyg-float-right\" title=\"Selector_Housing.png\"
- alt=\"undefined\" src=\"/samples/assets/Selector_Housing.png\">\r\nLarge complex
- castings with numerous cores are designed simultaneously - taking advantages of
+ main/content: <p>Large complex castings with numerous cores are designed simultaneously - taking advantages of
technical know-how, that allows integration of numerous sections by designing
- cores within cores within cores...<br>\r\n<br>Unique designs for the energy sector
+ cores within cores within cores...</p><p>Unique designs for the energy sector
(oil and gas valves, turbine casings, nozzle chambers and kaplan blades) combined
with extensive pre-production simulation as well as non-destructive testing ensure
- our customers from gaining a competitive edge."
+ our customers from gaining a competitive edge.</p>
main/heading: Steel (Large Sand Castings)
+ main/featured_image: /samples/assets/Selector_Housing.png
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/materials/steel.liquid +4 -5
@@ @@ -7,12 +7,11 @@ published: true
is_layout: false
seo_title: 'Steel '
editable_elements:
- main/content: <p><img class="wysiwyg-float-left" title="Investment_Casting.jpg"
- alt="undefined" src="/samples/assets/Investment_Casting.jpg">We currently provide
- steel castings made through the lost wax process, also known as investment castings.
+ main/content: <p>We currently provide steel castings made through the lost wax process, also known as investment castings.
This process is capable of producing the tightest tolerances and most exceptional
surface quality. Alloys include carbon steels, stainless steels and many other
- ferrous grades.</p><h4><br></h4>
+ ferrous grades.</p>
main/heading: Steel (Investment Cast)
+ main/featured_image: /samples/assets/Investment_Casting.jpg
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/materials/zinc.liquid +4 -5
@@ @@ -7,10 +7,9 @@ published: true
is_layout: false
seo_title: Zinc
editable_elements:
- main/content: <p><img class="wysiwyg-float-left" title="Die_casting.jpg" alt="undefined"
- src="/samples/assets/Die_casting.jpg">Mid to High volume applications providing
- exceptional surface quality and precise tolerances.&nbsp; We specialize in program
- management of tooling transfer to our foundries.<br></p>
+ main/content: <p>Mid to High volume applications providing exceptional surface quality and precise tolerances.&nbsp; We specialize in program
+ management of tooling transfer to our foundries.</p>
main/heading: Al / Zn (Die castings)
+ main/featured_image: /samples/assets/Die_casting.jpg
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/need-expedited-service.liquid +2 -5
@@ @@ -4,10 +4,7 @@ slug: need-expedited-service
position: 3
listed: false
published: true
+ redirect_url: "/solutions/expedited-services"
is_layout: false
- editable_elements:
- main/content: Most of the time you want to avoid expediting&nbsp;orders, and we
- can help with that too, but when you need fast we can make it happen!
- main/heading: Need Expedited Service?
---
- {% extends "layouts/application" %}
+ {% extends parent %}
app/views/pages/products.liquid +1 -1
@@ @@ -15,7 +15,7 @@ editable_elements:
{% block main %}
<div class="row">
<div class="column content page">
- <h1 class="text-center">{% editable_text "heading", line_break: false, format: 'raw', rows: 1 %}{% endeditable_text %}</h1>
+ <h1>{% editable_text "heading", line_break: false, format: 'raw', rows: 1 %}{% endeditable_text %}</h1>
{% editable_text content %}Lorem ipsum{% endeditable_text %}
<div class="rowexpanded">
<div class="row wide small-up-2 large-up-4 text-center gutter-small" data-equalizer>
app/views/pages/products/content_type_template.liquid +3 -1
@@ @@ -7,7 +7,9 @@ content_type: products
<div class="row">
<div class="column content page">
<h1>{{ product.title }}</h1>
- <img src="{{ product.image.url | resize: '200x200#' }}" alt="{{ product.title }}" class="shadow float-left">
+ <div class="featured_image">
+ <img src="{{ product.image.url | resize: '200x200#' }}" alt="{{ product.title }}" class="thumbnail">
+ </div>
{{ product.description }}
</div>
</div>
app/views/pages/quality-concerns.liquid +1 -4
@@ @@ -6,8 +6,5 @@ listed: false
published: true
redirect_url: "/solutions/quality-assurance"
is_layout: false
- editable_elements:
- main/heading: ''
- main/content: Lorem ipsum
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends parent %}
app/views/pages/solutions/expedited-services.liquid +1 -1
@@ @@ -13,4 +13,4 @@ editable_elements:
a stocking program to assist your supply.<br></p><p><br></p>"
main/heading: Expedited Services
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/solutions/inventory-management.liquid +1 -1
@@ @@ -13,4 +13,4 @@ editable_elements:
solutions to avoid you being out of stock!<br></div>"
main/heading: Inventory Management
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/solutions/offshore-management.liquid +1 -1
@@ @@ -13,4 +13,4 @@ editable_elements:
options at your preferred locations.<br></p>"
main/heading: Offshore Management
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/solutions/processing-and-performance-simulations.liquid +4 -12
@@ @@ -7,16 +7,8 @@ published: true
is_layout: false
seo_title: Processing & Performance Simulations
editable_elements:
- main/content: "<h4>Processing &amp; Performance Simulations</h4>\r\n<p class=\"wysiwyg-text-align-center\"><img
- class=\"wysiwyg-float-right\" title=\"services-simulation2.jpg\" alt=\"undefined\"
- src=\"/samples/assets/services-simulation2.jpg\"></p><p>Choice Castings has capability
- to provide design and development support, which includes complete simulation
- services.<br><br>Our engineers are experienced casting designers and can, upon
- request, provide manufacturing drawings.<br><br>Finally, we can simulate the physical
- performance of the castings, allowing redesigns and improvements prior to building
- tooling, which tends to be far more costly and time consuming.<br><br>Provide
- us with samples, drawings or digital files - and we can help you design a sound
- casting and engineered component.<br></p>"
- main/heading: 'Processing & Performance Simulations'
+ main/content: <p>Choice Castings has capability to provide design and development support, which includes complete simulation services.</p><p>Our engineers are experienced casting designers and can, upon request, provide manufacturing drawings.</p><p>Finally, we can simulate the physical performance of the castings, allowing redesigns and improvements prior to building tooling, which tends to be far more costly and time consuming.</p><p>Provide us with samples, drawings or digital files - and we can help you design a sound casting and engineered component.</p>
+ main/heading: Processing & Performance Simulations
+ main/featured_image: /samples/assets/services-simulation2.jpg
---
- {% extends "layouts/application" %}
+ {% extends "layouts/page" %}
app/views/pages/solutions/quality-assurance.liquid +1 -1
@@ @@ -13,4 +13,4 @@ editable_elements:
unnecessary costs.<br></p>"
main/heading: Quality Assurance
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/solutions/rapid-prototyping.liquid +3 -4
@@ @@ -7,13 +7,12 @@ published: true
is_layout: false
seo_title: Rapid Prototyping
editable_elements:
- main/content: <p class="wysiwyg-text-align-center"><img class="wysiwyg-float-right"
- title="Rapid.jpg" alt="undefined" src="/samples/assets/Rapid.jpg"></p><p>Do you
- need a 3 dimensional part as a visual aid with exact dimensions of your part?
+ main/content: <p>Do you need a 3 dimensional part as a visual aid with exact dimensions of your part?
No tooling required, we can provide you with a plastic prototype within days.<br><br>We
offer the service of rapid prototyping, which provides you with a plastic replica
with exact dimensions of your component. You provide the digital file or we can
produce it from your drawing or sketch - with a maximum size of 8" x 8" x 11".<br><br></p>
main/heading: Rapid Prototyping
+ main/featured_image: /samples/assets/Rapid.jpg
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
app/views/pages/solutions/supply-planning.liquid +1 -1
@@ @@ -18,4 +18,4 @@ editable_elements:
10 to 1,000 pounds.<br></p>
main/heading: Replacement parts without Tooling
---
- {% extends "layouts/application" %}
\ No newline at end of file
+ {% extends "layouts/page" %}
public/stylesheets/_settings.scss +1 -1
@@ @@ -149,7 +149,7 @@ $header-styles: (
'h6': ('font-size': 26),
),
medium: (
- 'h1': ('font-size': 48),
+ 'h1': ('font-size': 42),
'h2': ('font-size': 40),
'h3': ('font-size': 31),
'h4': ('font-size': 25),
public/stylesheets/app.scss +19 -2
@@ @@ -67,13 +67,30 @@ html {
// font-size: 1.2rem;
}
+ h1 {
+ color: $white;
+ background: #4D5D66;
+ text-transform: uppercase;
+ text-align: center;
+ }
+
+ ul, ol {
+ overflow: hidden;
+ padding-left: rem-calc(25);
+
+ li {
+ list-style-position: outside;
+ }
+ }
+
.featured_image {
float: left;
- margin: 0 rem-calc(8) rem-calc(8) 0;
+ margin: 0 rem-calc(10) rem-calc(10) rem-calc(5);
img {
border: solid 4px #fefefe;
- box-shadow: 0 0 0 1px rgba(10, 10, 10, 0.2);
+ // box-shadow: 0 0 0 1px rgba(10, 10, 10, 0.2);
+ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
}
}