Skip to content

Commit da05d05

Browse files
authored
Merge pull request #11 from OSURoboticsClub/combat_rules
combat robotics sparc rules page
2 parents e64d875 + 83d19b2 commit da05d05

File tree

7 files changed

+721
-13
lines changed

7 files changed

+721
-13
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,6 @@ out
131131
.hugo_build.lock
132132
static/css/styles.css
133133
static/js/app.js
134+
135+
# Hugo build output
136+
public

assets/css/components/prose.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.prose {
2-
@apply prose-headings:text-white prose-headings:font-semibold prose-headings:font-display prose-headings:mb-0 first:prose-headings:mt-0 prose-headings:mt-8 text-white/80;
2+
@apply prose-headings:text-white prose-headings:font-semibold prose-headings:font-display prose-headings:leading-snug first:prose-headings:mt-0 prose-headings:mt-8 prose-invert text-white/80 prose-th:text-[18px];
33
}

content/teams/Combat/index.md renamed to content/teams/Combat/_index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ gallery:
1414
- Copy of CR_Post_1_Photo_4.jpg
1515
meeting: Fri 1-5 PM @ Merryfield 110
1616
tagline: DAM Robotics' Combat Robotics team centers on building and competing with lightweight robots.
17+
layout: single
1718
---
1819

1920
# About the Team
@@ -22,6 +23,9 @@ In Combat Robotics, members design, build, and test robots to fight each other i
2223

2324
This year, we will be competing with our 12Lb robot at the Western Allied Robotics Hobby Expo in Seattle On April 14th.
2425

26+
OSU Combat Robotics club is SPARC-Compliant. See the complete specifications and rules [here](./sparc).
27+
28+
2529
<!-- # Getting Involved
2630
2731
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

content/teams/Combat/sparc/index.md

Lines changed: 664 additions & 0 deletions
Large diffs are not rendered by default.

layouts/teams/article.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{{ define "main" }}
2+
3+
<article class="pb-24 relative max-w-3xl mx-auto px-3 sm:px-9 pt-32">
4+
5+
<h1 class="block text-h2 font-bold font-display leading-none">{{ .Title }}</h1>
6+
<div class="mt-5 text-lg prose">
7+
{{ .Content }}
8+
</div>
9+
10+
</article>
11+
12+
13+
{{ end}}

static/css/styles.css

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,6 +1151,9 @@ video {
11511151
.min-w-0 {
11521152
min-width: 0px;
11531153
}
1154+
.max-w-3xl {
1155+
max-width: 48rem;
1156+
}
11541157
.max-w-4xl {
11551158
max-width: 56rem;
11561159
}
@@ -1312,6 +1315,10 @@ video {
13121315
.bg-black\/80 {
13131316
background-color: rgb(0 0 0 / 0.8);
13141317
}
1318+
.bg-gray-800 {
1319+
--tw-bg-opacity: 1;
1320+
background-color: rgb(31 41 55 / var(--tw-bg-opacity));
1321+
}
13151322
.bg-neutral-600 {
13161323
--tw-bg-opacity: 1;
13171324
background-color: rgb(82 82 82 / var(--tw-bg-opacity));
@@ -1359,10 +1366,6 @@ video {
13591366
.bg-white\/10 {
13601367
background-color: rgb(255 255 255 / 0.1);
13611368
}
1362-
.bg-gray-800 {
1363-
--tw-bg-opacity: 1;
1364-
background-color: rgb(31 41 55 / var(--tw-bg-opacity));
1365-
}
13661369
.bg-opacity-40 {
13671370
--tw-bg-opacity: 0.4;
13681371
}
@@ -1503,6 +1506,9 @@ video {
15031506
.pt-3 {
15041507
padding-top: 0.75rem;
15051508
}
1509+
.pt-32 {
1510+
padding-top: 8rem;
1511+
}
15061512
.pt-4 {
15071513
padding-top: 1rem;
15081514
}
@@ -1728,14 +1734,30 @@ video {
17281734
}
17291735

17301736
.prose {
1737+
--tw-prose-body: var(--tw-prose-invert-body);
1738+
--tw-prose-headings: var(--tw-prose-invert-headings);
1739+
--tw-prose-lead: var(--tw-prose-invert-lead);
1740+
--tw-prose-links: var(--tw-prose-invert-links);
1741+
--tw-prose-bold: var(--tw-prose-invert-bold);
1742+
--tw-prose-counters: var(--tw-prose-invert-counters);
1743+
--tw-prose-bullets: var(--tw-prose-invert-bullets);
1744+
--tw-prose-hr: var(--tw-prose-invert-hr);
1745+
--tw-prose-quotes: var(--tw-prose-invert-quotes);
1746+
--tw-prose-quote-borders: var(--tw-prose-invert-quote-borders);
1747+
--tw-prose-captions: var(--tw-prose-invert-captions);
1748+
--tw-prose-code: var(--tw-prose-invert-code);
1749+
--tw-prose-pre-code: var(--tw-prose-invert-pre-code);
1750+
--tw-prose-pre-bg: var(--tw-prose-invert-pre-bg);
1751+
--tw-prose-th-borders: var(--tw-prose-invert-th-borders);
1752+
--tw-prose-td-borders: var(--tw-prose-invert-td-borders);
17311753
color: rgb(255 255 255 / 0.8);
17321754
}
17331755

17341756
.prose :is(:where(h1, h2, h3, h4, h5, h6, th):not(:where([class~="not-prose"] *))) {
1735-
margin-bottom: 0px;
17361757
margin-top: 2rem;
17371758
font-family: Barlow Condensed, Inter, sans-serif;
17381759
font-weight: 600;
1760+
line-height: 1.375;
17391761
--tw-text-opacity: 1;
17401762
color: rgb(255 255 255 / var(--tw-text-opacity));
17411763
}
@@ -1744,6 +1766,10 @@ video {
17441766
margin-top: 0px;
17451767
}
17461768

1769+
.prose :is(:where(th):not(:where([class~="not-prose"] *))) {
1770+
font-size: 18px;
1771+
}
1772+
17471773
.bruh-card-bg {
17481774
transition-property: all;
17491775
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
@@ -1769,34 +1795,33 @@ video {
17691795
.bruh-card:hover .bruh-card-text {
17701796
background-color: rgb(0 0 0 / 0.5);
17711797
}
1772-
17731798
.hover\:scale-105:hover {
17741799
--tw-scale-x: 1.05;
17751800
--tw-scale-y: 1.05;
17761801
transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
17771802
}
1778-
17791803
.hover\:scale-110:hover {
17801804
--tw-scale-x: 1.1;
17811805
--tw-scale-y: 1.1;
17821806
transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
17831807
}
1784-
17851808
.hover\:opacity-70:hover {
17861809
opacity: 0.7;
17871810
}
1788-
17891811
.hover\:opacity-90:hover {
17901812
opacity: 0.9;
17911813
}
1792-
17931814
@media (min-width: 640px) {
17941815

17951816
.sm\:w-96 {
17961817
width: 24rem;
17971818
}
1798-
}
17991819

1820+
.sm\:px-9 {
1821+
padding-left: 2.25rem;
1822+
padding-right: 2.25rem;
1823+
}
1824+
}
18001825
@media (min-width: 768px) {
18011826

18021827
.md\:-right-1 {
@@ -1898,7 +1923,6 @@ video {
18981923
font-size: 72px;
18991924
}
19001925
}
1901-
19021926
@media (min-width: 1024px) {
19031927

19041928
.lg\:grid-cols-3 {
622 KB
Loading

0 commit comments

Comments
 (0)