Skip to content

Commit 2da3c03

Browse files
ngpaladingpaladi
authored
Merge pull request #4 from UncommonModels/dev
Cleaned up Homepage and Added Free-Trak
2 parents 6988863 + 27bcadc commit 2da3c03

8 files changed

Lines changed: 214 additions & 28 deletions

File tree

‎Free-Trak.md‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
---
2+
title: "Free-Trak Standards"
3+
subtitle: "**Version:** 0.1.0"
4+
layout: default
5+
6+
---
7+
8+
Free-Trak is a proposed N scale module standard that combines the ease of use and "bulletproof" connections of T-Trak with the module sizing flexibility of Free-MoN. This increased flexibility aims to make modules easier to integrate into home layouts and lead to more operational interest for clubs.
9+
10+
**Preliminary Version Disclaimer:** Please note that these standards are not finalized and numbering/content is subject to change. Diagrams will be added soon.
11+
12+
<!-- ## Contents
13+
14+
1. Module Dimensions
15+
2. Track Configuration
16+
3. Wiring Configuration -->
17+
18+
## Module Dimensions
19+
1. All modules, with the exception of end modules (either baloon loop or stub-end), must have at least two endplates
20+
1. Endplate width must be between 12" and 24"
21+
2. Endplates must be constructed of a non-warping material (3/4" birch plywood is recommended, see Free-Mo reccomended practices)
22+
3. Endplates must be labeled with a "front" corresponding to the rail attached to a blue feeder cable (see 3.1, note that this does not neccessarily need to be the intended viewing location of the module)
23+
2. Modules may take any length and shape between endplates
24+
3. Modules must be 2 3/4" tall with adjustable feet (to maintain T-Trak compatibility)
25+
26+
27+
## Track Configuration
28+
1. Track at each end plate should be either single or double track with Kato Unitrack connectors and centered within the end plate
29+
2. Double track modules should use standard 33mm Kato track spacing
30+
3. The minimum turnout shall be #6 for the mainline
31+
4. The minimum curve radius shall be 11.25" (as in T-Trak)
32+
5. Tracks must overhang the endplate by no more than 1mm at the joints
33+
34+
35+
## Wiring
36+
1. Each double track module must be wired blue-white, blue-white, with a front side of the module labeled corresponding to the blue rail. Note that this is different than the T-Trak standard, to allow for the use of crossovers without flipping one set of rails and causing confusion.
37+
1. Single track branch line endplates shall be labeled according to either the corresponding wiring for how it branches off a main line or such that the "front" of a module corresponds to the blue rail on a module with only single track endpoints
38+
2. Andersen connectors shall be provided on each endplate, with one pair of blue and white connectors per track bus on the endplate
39+
3. All main lines on the module must have at least one feeder connection to the track bus
40+
4. Any balloon loops must be isolated from the main track and include an auto reversing circuit (to allow for use of crossovers on a double track main line)
41+
5. Use of a DCC system is required
42+
1. Use of wireless throttles is strongly recommended
43+
2. Use of a DCC-EX based DCC system is recommended
44+
45+

‎_includes/footer.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<footer class="container-fluid bg-dark text-light text-center py-5 footer">
22
<div class="container bg-dark justify-content-center text-center">
33
<div class="row justify-content-center py-1">
4-
<div class="col-sm-4">
4+
<div class="col-sm-4 my-auto">
55
<p class="align-center"><a class="" href="{{site.baseurl}}/">Homepage</a></p>
6+
<p class="align-center"><a class="" href="{{site.baseurl}}/Free-Trak.html">Free-Trak</a></p>
67
</div>
7-
<div class="col-sm-4">
8+
<div class="col-sm-4 my-auto">
89
<p class="align-center"><b>Contact:</b> <a class="email" href="mailto:info@uncommonmodels.com">info@uncommonmodels.com</a></p>
910
</div>
1011

‎_includes/head.html‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,14 @@
2929
}
3030
}
3131
</script>
32-
</head>
32+
</head>
33+
34+
<!-- Google tag (gtag.js) -->
35+
<script async src="https://www.googletagmanager.com/gtag/js?id=G-690LQFFPDD"></script>
36+
<script>
37+
window.dataLayer = window.dataLayer || [];
38+
function gtag(){dataLayer.push(arguments);}
39+
gtag('js', new Date());
40+
41+
gtag('config', 'G-690LQFFPDD');
42+
</script>

‎_layouts/default.html‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{% include head.html %}
2+
3+
4+
<body>
5+
<div class="container-fluid post-envelope">
6+
<div class="bg-light container post-body">
7+
<div class="px-2 py-5 my-5 justify-content-center" >
8+
<h1 class="text-center p-0">{{page.title}}</h1>
9+
{% if page.subtitle != "" and page.subtitle != null %}
10+
<div class="text-center"><p> {{page.subtitle | markdownify}} </p></div>
11+
{% else %}
12+
<br>
13+
{% endif %}
14+
<hr>
15+
<br/>
16+
{% if page.image != "" and page.image != null %}
17+
<div class="row justify-content-center">
18+
<img src="{{ site.baseurl }}{{ page.image }}" class=" col-sm-10 col-md-8 col-lg-6 col-xl-4 align-center" alt="{{page.title}}">
19+
</div>
20+
<br>
21+
{% endif %}
22+
23+
<div class="container px-5 section-listing">
24+
{{page.content | markdownify}}
25+
</div>
26+
</div>
27+
</div>
28+
</div>
29+
</body>
30+
{% include footer.html %}

‎_layouts/post.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ <h1 class="display-5 fw-bold text-center">{{page.title}}</h1>
1414
<br>
1515
<div class="col-lg-6 mx-auto">
1616
{{page.content | markdownify}}
17-
{% if page.purchase_link != "" and page.purchase_link != null %}
17+
{% if page.purchase_link_shapeways != "" and page.purchase_link_shapeways != null %}
1818
<div class="d-grid gap-2 d-sm-flex justify-content-sm-center">
19-
<a href="{{page.purchase_link}}" class="btn btn-primary">Purchase</a>
19+
<a href="{{page.purchase_link_shapeways}}" class="btn btn-primary">Purchase on Shapeways</a>
2020
</div>
2121
{%endif%}
2222
</div>

‎_posts/2023-08-01-lighthouse.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ title: "Wings Neck Lighthouse"
33
layout: post
44
description: ''
55
image: /assets/img/lighthouse.jpg
6-
purchase_link: https://www.shapeways.com/product/QPKRKSJ3H/wings-neck-lighthouse?optionId=335079857&li=shops
6+
purchase_link_shapeways: https://www.shapeways.com/product/QPKRKSJ3H/wings-neck-lighthouse?optionId=335079857&li=shops
77
---
88
The Wings Neck lighthouse is located on Cape Cod in Massachusetts and stands near the southernmost entrance of the Cape Cod Canal. This model was recreated in N scale using photographs and US Coast Guard blueprints in the public domain. The model includes space for lighting the tower with a 1/4" LED.

‎css/style.css‎

Lines changed: 115 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,44 @@ body {
33
margin: 0;
44

55
}
6+
67
h1 {
78
font-family: 'League Spartan', sans-serif;
89
font-weight: 800;
9-
text-transform: uppercase;
1010
font-size: calc(12px + 4vmin);
1111
padding-bottom: 1vh;
1212
}
13-
.text-light h1{
13+
14+
.text-light h1 {
1415
color: #ffffff;
1516
}
16-
.text-dark h2{
17+
18+
.text-dark h2 {
1719
color: #1f1f1f;
1820
}
1921

2022
.post-envelope {
2123
min-height: 85vh;
2224
}
25+
2326
.footer {
2427
min-height: 15vh;
2528
}
2629

2730
h2 {
2831
font-family: 'League Spartan', sans-serif;
2932
font-weight: 300;
30-
color: #d9d9d9;
3133
font-size: calc(10px + 3vmin);
3234
width: 100%;
33-
text-transform: uppercase;
3435
}
36+
3537
.splash a {
3638
color: #a6a6a6;
3739
text-decoration: none;
3840

39-
}
40-
.splash a:hover{
41+
}
42+
43+
.splash a:hover {
4144
color: #d9d9d9;
4245
text-decoration: underline;
4346
}
@@ -50,8 +53,9 @@ h2 {
5053
color: #a6a6a6;
5154
text-decoration: none;
5255

53-
}
54-
.bg-dark a:hover{
56+
}
57+
58+
.bg-dark a:hover {
5559
color: #d9d9d9;
5660
text-decoration: underline;
5761
}
@@ -63,12 +67,15 @@ h3 {
6367
width: 100%;
6468
opacity: 1;
6569
}
66-
.text-light h3{
70+
71+
.text-light h3 {
6772
color: #a6a6a6;
6873
}
69-
.text-dark h3{
74+
75+
.text-dark h3 {
7076
color: #363636;
7177
}
78+
7279
.splash {
7380
background-attachment: local;
7481
background-size: cover;
@@ -78,10 +85,105 @@ h3 {
7885
text-align: center;
7986
padding-bottom: 10vh;
8087
}
81-
#splash-content{
88+
89+
#splash-content {
8290
padding-top: 20vh;
8391
}
92+
8493
#splash-logo {
8594
max-width: 60%;
8695
vertical-align: middle;
87-
}
96+
}
97+
98+
.section-listing {
99+
counter-reset: list;
100+
}
101+
102+
.section-listing ol {
103+
list-style-type: none;
104+
counter-reset: item;
105+
margin: 0;
106+
padding: 0;
107+
}
108+
109+
.section-listing>ol {
110+
counter-increment: list;
111+
padding-left: 2.8em;
112+
}
113+
114+
.section-listing ol>li {
115+
display: table;
116+
counter-increment: item;
117+
margin-bottom: 0.6em;
118+
}
119+
120+
.section-listing ol>li:before {
121+
content: counter(h2) "." counters(item, ".");
122+
display: table-cell;
123+
padding-right: 0.6em;
124+
}
125+
126+
.section-listing li ol>li {
127+
margin: 0;
128+
}
129+
130+
.section-listing li ol>li:before {
131+
content: counter(h2) "." counters(item, ".") " ";
132+
}
133+
134+
.section-listing {
135+
counter-reset: h2
136+
}
137+
138+
.section-listing h2 {
139+
counter-reset: h3
140+
padding-top: 1em;
141+
142+
}
143+
144+
.section-listing h3 {
145+
counter-reset: h4
146+
}
147+
148+
.section-listing h4 {
149+
counter-reset: h5
150+
}
151+
152+
.section-listing h5 {
153+
counter-reset: h6
154+
}
155+
156+
.section-listing h2:before {
157+
counter-increment: h2;
158+
content: counter(h2) ". "
159+
}
160+
161+
.section-listing h3:before {
162+
counter-increment: h3;
163+
content: counter(h2) "." counter(h3) ". "
164+
}
165+
166+
.section-listing h4:before {
167+
counter-increment: h4;
168+
content: counter(h2) "." counter(h3) "." counter(h4) ". "
169+
}
170+
171+
.section-listing h5:before {
172+
counter-increment: h5;
173+
content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) ". "
174+
}
175+
176+
.section-listing h6:before {
177+
counter-increment: h6;
178+
content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) "." counter(h6) ". "
179+
}
180+
181+
.section-listing h2.nocount:before,
182+
.section-listing h3.nocount:before,
183+
.section-listing h4.nocount:before,
184+
.section-listing h5.nocount:before,
185+
.section-listing h6.nocount:before {
186+
content: "";
187+
counter-increment: none
188+
}
189+

‎index.html‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,26 @@
44

55
{% include head.html %}
66

7+
78
<body>
8-
<div class="bg-dark text-light container-fluid splash">
9+
<div class="bg-dark text-light text-uppercase container-fluid splash">
910
<div class="container" id="splash-content">
1011
<img id="splash-logo" src="assets/img/UncommonModels.svg" />
1112
<h1 class="py-4">Uncommon Models</h1>
1213
<h2>Production-Oriented <br />Model Railroad <br /> Product Design</h2>
13-
<h3 class="py-4"><a class="email" href="mailto:sales@uncommonmodels.com">sales@uncommonmodels.com</a></h3>
14+
<h3 class="py-4 text-lowercase"><a class="email" href="mailto:sales@uncommonmodels.com">sales@uncommonmodels.com</a></h3>
1415
</div>
1516
</div>
1617
<div class="container justify-content-center text-center pb-5">
1718
<div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-lg-4 pb-5 justify-content-center">
1819
{% for post in site.posts %}
1920
<div class="col">
20-
<div class="card m-3 post-preview">
21+
<div class="card h-100 m-3 post-preview">
2122
<img src="{{ site.baseurl }}{{ post.image }}" class="card-img-top" alt="{{post.title}}">
22-
<div class="card-body">
23-
<h5 class="card-title pb-3" style="min-height: 5vh;">{{post.title}}</h5>
23+
<div class="card-body d-flex flex-column">
24+
<h5 class="card-title" style="">{{post.title}}</h5>
2425
<!-- <p class="card-text">{{post.description}}</p> -->
25-
<div class="d-flex justify-content-center"><a href="{{post.url}}"
26-
class="btn btn-primary mx-2">Learn More</a>{% if post.purchase_link != "" and post.purchase_link != null %}
27-
<a href="{{post.purchase_link}}" class="btn btn-primary mx-2">Purchase</a>
28-
{%endif%}</div>
26+
<a href="{{post.url}}" class="btn btn-primary mt-auto" style="">Learn More</a>
2927
</div>
3028
</div>
3129
</div>

0 commit comments

Comments
 (0)