Skip to content

Commit d9e83ef

Browse files
apoelstraapoelstra
committed
Merge #55: replace rigid square font type with carbon
2e9f7e3 replace rigid square font type with carbon (sprihozhiy) Pull request description: Replaced heading font type making it consistent with https://simplicity-lang.org/ ACKs for top commit: apoelstra: ACK 2e9f7e3; successfully ran local tests Tree-SHA512: d3166c240fbf52c9b24423eff1209cb22b27da29e2dbd485250e46eb9fca9d241f3b7f68768f1059e0bdb840c04647119a8ec69e6e9b551f84512a8ce974397a
2 parents 41f193b + 2e9f7e3 commit d9e83ef

File tree

6 files changed

+82
-66
lines changed

6 files changed

+82
-66
lines changed

‎src/assets/style/components/analysis.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
background-color: helpers.$background-dark;
5959

6060
.analysis-item-label {
61-
font-family: 'rigid-square';
61+
font-family: 't26-carbon', 'sans-serif';
6262
color: helpers.$text-white;
6363
font-size: 20px;
6464
font-style: normal;

‎src/assets/style/components/footer.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $font-carbon: 'Arial', sans-serif; // Replace with your Carbon font
3939

4040
&-title {
4141
color: $text-white;
42-
font-family: 'rigid-square';
42+
font-family: 't26-carbon', 'sans-serif';
4343
font-size: 28px;
4444
font-weight: bold;
4545
margin-top: 16px;
@@ -73,7 +73,7 @@ $font-carbon: 'Arial', sans-serif; // Replace with your Carbon font
7373

7474
&-link {
7575
color: $text-white;
76-
font-family: 'rigid-square';
76+
font-family: 't26-carbon', 'sans-serif';
7777
font-size: 16px;
7878
font-weight: bold;
7979
text-decoration: none;
@@ -174,7 +174,7 @@ $font-carbon: 'Arial', sans-serif; // Replace with your Carbon font
174174
border: none;
175175
border-radius: 2px;
176176
background: #FF9517;
177-
font-family: 'rigid-square';
177+
font-family: 't26-carbon', 'sans-serif';
178178
color: #000;
179179
font-size: 22px;
180180
font-style: normal;

‎src/assets/style/components/navigation.scss‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ $white: #ffffff;
2929

3030
&-logo {
3131
width: 270px;
32-
height: 66px;
32+
height: 72px;
3333
}
3434

3535
&-desktop {
@@ -42,7 +42,7 @@ $white: #ffffff;
4242
}
4343

4444
&-link {
45-
font-family: 'rigid-square';
45+
font-family: 't26-carbon', 'sans-serif';
4646
font-weight: 600;
4747
font-size: 22px;
4848
color: $white;
@@ -72,7 +72,7 @@ $white: #ffffff;
7272
}
7373

7474
&-label {
75-
font-family: 'rigid-square';
75+
font-family: 't26-carbon', 'sans-serif';
7676
font-weight: 600;
7777
font-size: 22px;
7878
cursor: pointer;
@@ -95,8 +95,8 @@ $white: #ffffff;
9595
top: 100%;
9696
left: 0;
9797
width: 100%;
98-
min-width: 300px;
99-
padding-top: 38px;
98+
min-width: 350px;
99+
padding-top: 42px;
100100
opacity: 0;
101101
visibility: hidden;
102102
transition: all 0.2s ease;
@@ -112,27 +112,36 @@ $white: #ffffff;
112112
background: transparent;
113113
}
114114

115-
& > div {
116-
background-color: $background3;
117-
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
118-
padding: 1rem;
119-
}
115+
// & > div {
116+
// background-color: $background3;
117+
// box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
118+
// padding: 0.5rem;
119+
// }
120120
}
121121

122122
&-content-community {
123123
min-width: 150px;
124124
}
125125

126+
&-wrapper {
127+
padding: 24px 16px;
128+
background-color: #1d1f23;
129+
}
130+
126131
&-item {
127132
display: block;
128133
color: $white;
129134
text-decoration: none;
130-
padding: 1rem;
135+
// padding: 1rem;
131136
transition: color 0.2s ease;
132137
background-color: #1d1f23;
133138
&:hover {
134139
color: $primary;
135140
}
141+
margin-bottom: 20px;
142+
&:last-child {
143+
margin-bottom: 0;
144+
}
136145
}
137146

138147
&-item-community {
@@ -142,14 +151,16 @@ $white: #ffffff;
142151
}
143152

144153
&-title {
145-
font-family: 'rigid-square';
154+
font-family: 't26-carbon', 'sans-serif';
146155
font-weight: 600;
147156
font-size: 22px;
157+
line-height: 1.5;
148158
}
149159

150160
&-description {
151161
color: $secondary-text;
152162
font-size: 18px;
163+
line-height: 1.5;
153164
}
154165

155166
&-icon {

‎src/assets/style/helpers.scss‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
@font-face {
2-
font-family:"rigid-square";
3-
src:url("https://use.typekit.net/af/6727e5/00000000000000007735c42c/30/l?primer=7fa3915bdafdf03041871920a205bef951d72bf64dd4c4460fb992e3ecc3a862&fvd=n6&v=3") format("woff2"),url("https://use.typekit.net/af/6727e5/00000000000000007735c42c/30/d?primer=7fa3915bdafdf03041871920a205bef951d72bf64dd4c4460fb992e3ecc3a862&fvd=n6&v=3") format("woff"),url("https://use.typekit.net/af/6727e5/00000000000000007735c42c/30/a?primer=7fa3915bdafdf03041871920a205bef951d72bf64dd4c4460fb992e3ecc3a862&fvd=n6&v=3") format("opentype");
4-
font-display:auto;font-style:normal;font-weight:600;font-stretch:normal;
5-
}
1+
@import url("https://use.typekit.net/zsp2dhp.css");
62

73
@import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap');
84
@import url('https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&display=swap');

‎src/assets/style/style.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ body {
2828
}
2929

3030
h1, h2, h3, h4, h5, h6{
31-
font-family: 'rigid-square';
31+
font-family: 't26-carbon', 'sans-serif';
3232
}
3333

3434
a {

‎src/components/navigation.rs‎

Lines changed: 53 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -54,68 +54,77 @@ pub fn Navigation() -> impl IntoView {
5454
<div class="navigation-dropdown">
5555
<span class="navigation-dropdown-label">"Docs"</span>
5656
<div class="navigation-dropdown-content">
57-
<a href="https://blockstream.com/simplicity.pdf" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item">
58-
<div class="navigation-dropdown-title">"Whitepaper"</div>
59-
<div class="navigation-dropdown-description">"The original Simplicity whitepaper, detailing the language."</div>
60-
</a>
61-
<a href="https://docs.rs/simplicityhl-as-rust" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item">
62-
<div class="navigation-dropdown-title">"Jets Documentation"</div>
63-
<div class="navigation-dropdown-description">"Technical reference detailing each jet's functionality and use."</div>
64-
</a>
65-
<a href="https://docs.simplicity-lang.org/" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item">
66-
<div class="navigation-dropdown-title">"SimplicityHL"</div>
67-
<div class="navigation-dropdown-description">"A high-level, developer-friendly language that compiles down to Simplicity."</div>
68-
</a>
69-
<a href="https://github.com/BlockstreamResearch/SimplicityHL/tree/master/examples" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item">
70-
<div class="navigation-dropdown-title">"Contract Examples"</div>
71-
<div class="navigation-dropdown-description">"A curated set of smart contract templates and patterns."</div>
72-
</a>
57+
<div class="navigation-dropdown-wrapper">
58+
<a href="https://blockstream.com/simplicity.pdf" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item">
59+
<div class="navigation-dropdown-title">"Whitepaper"</div>
60+
<div class="navigation-dropdown-description">"The original Simplicity whitepaper, detailing the language."</div>
61+
</a>
62+
<a href="https://docs.rs/simplicityhl-as-rust" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item">
63+
<div class="navigation-dropdown-title">"Jets Documentation"</div>
64+
<div class="navigation-dropdown-description">"Technical reference detailing each jet's functionality and use."</div>
65+
</a>
66+
<a href="https://docs.simplicity-lang.org/" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item">
67+
<div class="navigation-dropdown-title">"SimplicityHL"</div>
68+
<div class="navigation-dropdown-description">"A high-level, developer-friendly language that compiles down to Simplicity."</div>
69+
</a>
70+
<a href="https://github.com/BlockstreamResearch/SimplicityHL/tree/master/examples" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item">
71+
<div class="navigation-dropdown-title">"Contract Examples"</div>
72+
<div class="navigation-dropdown-description">"A curated set of smart contract templates and patterns."</div>
73+
</a>
74+
</div>
75+
7376
</div>
7477
</div>
7578

7679
<div class="navigation-dropdown">
7780
<span class="navigation-dropdown-label">"Packages"</span>
7881
<div class="navigation-dropdown-content">
79-
<a href="https://github.com/BlockstreamResearch/simplicity" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item">
80-
<div class="navigation-dropdown-title">"Simplicity"</div>
81-
<div class="navigation-dropdown-description">"The low-level, formally-verifiable smart contract language."</div>
82-
</a>
83-
<a href="https://github.com/BlockstreamResearch/SimplicityHL" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item">
84-
<div class="navigation-dropdown-title">"SimplicityHL Compiler"</div>
85-
<div class="navigation-dropdown-description">"The toolchain that translates SimplicityHL code into raw Simplicity."</div>
86-
</a>
87-
<a href="https://ide.simplicity-lang.org/" class="navigation-dropdown-item">
88-
<div class="navigation-dropdown-title">"SimplicityHL IDE"</div>
89-
<div class="navigation-dropdown-description">"A browser-based playground for writing and testing contracts."</div>
90-
</a>
82+
<div class="navigation-dropdown-wrapper">
83+
<a href="https://github.com/BlockstreamResearch/simplicity" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item">
84+
<div class="navigation-dropdown-title">"Simplicity"</div>
85+
<div class="navigation-dropdown-description">"The low-level, formally-verifiable smart contract language."</div>
86+
</a>
87+
<a href="https://github.com/BlockstreamResearch/SimplicityHL" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item">
88+
<div class="navigation-dropdown-title">"SimplicityHL Compiler"</div>
89+
<div class="navigation-dropdown-description">"The toolchain that translates SimplicityHL code into raw Simplicity."</div>
90+
</a>
91+
<a href="https://ide.simplicity-lang.org/" class="navigation-dropdown-item">
92+
<div class="navigation-dropdown-title">"SimplicityHL IDE"</div>
93+
<div class="navigation-dropdown-description">"A browser-based playground for writing and testing contracts."</div>
94+
</a>
95+
</div>
9196
</div>
9297
</div>
9398

9499
<div class="navigation-dropdown">
95100
<span class="navigation-dropdown-label">"Learn"</span>
96101
<div class="navigation-dropdown-content">
97-
<a href="https://simplicity-lang.org/articles" class="navigation-dropdown-item">
98-
<div class="navigation-dropdown-title">"Articles"</div>
99-
// <div class="navigation-dropdown-description">"Read in-depth articles about Simplicity and smart contracts."</div>
100-
</a>
101-
<a href="https://simplicity-lang.org/videos" class="navigation-dropdown-item">
102-
<div class="navigation-dropdown-title">"Videos"</div>
103-
// <div class="navigation-dropdown-description">"Watch tutorials and presentations about Simplicity."</div>
104-
</a>
102+
<div class="navigation-dropdown-wrapper">
103+
<a href="https://simplicity-lang.org/articles" class="navigation-dropdown-item">
104+
<div class="navigation-dropdown-title">"Articles"</div>
105+
// <div class="navigation-dropdown-description">"Read in-depth articles about Simplicity and smart contracts."</div>
106+
</a>
107+
<a href="https://simplicity-lang.org/videos" class="navigation-dropdown-item">
108+
<div class="navigation-dropdown-title">"Videos"</div>
109+
// <div class="navigation-dropdown-description">"Watch tutorials and presentations about Simplicity."</div>
110+
</a>
111+
</div>
105112
</div>
106113
</div>
107114

108115
<div class="navigation-dropdown navigation-dropdown-community">
109116
<span class="navigation-dropdown-label">"Community"</span>
110117
<div class="navigation-dropdown-content navigation-dropdown-content-community">
111-
<a href="https://x.com/blksresearch" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item navigation-dropdown-item-community">
112-
<img src="images/x.svg" alt="Twitter" class="navigation-dropdown-icon" />
113-
<span class="navigation-dropdown-title">"Twitter"</span>
114-
</a>
115-
<a href="https://t.me/simplicity_community" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item navigation-dropdown-item-community">
116-
<img src="images/telegram.svg" alt="Telegram" class="navigation-dropdown-icon" />
117-
<span class="navigation-dropdown-title">"Telegram"</span>
118-
</a>
118+
<div class="navigation-dropdown-wrapper">
119+
<a href="https://x.com/blksresearch" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item navigation-dropdown-item-community">
120+
<img src="images/x.svg" alt="Twitter" class="navigation-dropdown-icon" />
121+
<span class="navigation-dropdown-title">"Twitter"</span>
122+
</a>
123+
<a href="https://t.me/simplicity_community" target="_blank" rel="noopener noreferrer" class="navigation-dropdown-item navigation-dropdown-item-community">
124+
<img src="images/telegram.svg" alt="Telegram" class="navigation-dropdown-icon" />
125+
<span class="navigation-dropdown-title">"Telegram"</span>
126+
</a>
127+
</div>
119128
</div>
120129
</div>
121130
</div>

0 commit comments

Comments
 (0)