Skip to content

Commit 4b2c9eb

Browse files
tieneupintieneupin
committed
Provide different font options for code
1 parent 344aa92 commit 4b2c9eb

File tree

1 file changed

+90
-35
lines changed

1 file changed

+90
-35
lines changed

‎src/murfey/templates/bootstrap.html‎

Lines changed: 90 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ <h3>Option 1: Installing Cygwin</h3>
1717
the following from a terminal (both Command Prompt and Windows Powershell
1818
work):
1919
</p>
20-
<pre style="font-family: monospace">
20+
<pre
21+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
22+
>
2123
$ setup-x86_64.exe -O -R C:\cygwin64 -s {{ request.url.scheme }}://{{ netloc }}{{ proxy_path }}/cygwin -P curl,python3,rsync -q
2224
</pre>
2325
<p>
@@ -55,10 +57,14 @@ <h4>A. Setting Up the Package Manager (If Network-Restricted)</h4>
5557
</p>
5658
<p>
5759
Once downloaded, extract the files to
58-
<span style="font-family: monospace">%MSYS64%\etc\pacman.d</span>. If MSYS2
59-
was installed at the default location, this will be:
60-
</p>
61-
<pre style="font-family: monospace">
60+
<span
61+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
62+
>%MSYS64%\etc\pacman.d</span
63+
>. If MSYS2 was installed at the default location, this will be:
64+
</p>
65+
<pre
66+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
67+
>
6268
C:\msys64\etc\pacman.d
6369
</pre>
6470
<h4>B. Installing Dependencies</h4>
@@ -68,7 +74,9 @@ <h4>B. Installing Dependencies</h4>
6874
properly, the following packages will need to be installed in the UCRT64
6975
environment. This can be achieved using the following commands:
7076
</p>
71-
<pre style="font-family: monospace">
77+
<pre
78+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
79+
>
7280
$ pacman -Syu
7381
$ pacman -S msys2-runtime-3.6
7482
$ pacman -S rsync
@@ -77,12 +85,20 @@ <h4>B. Installing Dependencies</h4>
7785
</pre>
7886
<p>
7987
Other utility packages such as
80-
<span style="font-family: monospace">vim</span> can also be installed by
81-
running
82-
<span style="font-family: monospace">pacman -S &lt;package-name&gt;</span>.
83-
You can browse the other packages available on MSYS2 by searching the repo
88+
<span
89+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
90+
>vim</span
91+
>
92+
can also be installed by running
93+
<span
94+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
95+
>pacman -S &lt;package-name&gt;</span
96+
>. You can browse the other packages available on MSYS2 by searching the repo
8497
using
85-
<span style="font-family: monospace">pacman -Ss &lt;package-name&gt;</span>
98+
<span
99+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
100+
>pacman -Ss &lt;package-name&gt;</span
101+
>
86102
</p>
87103
<h4>C. Configuring the Rust Package Manager (If Network-Restricted)</h4>
88104
<p>
@@ -93,32 +109,58 @@ <h4>C. Configuring the Rust Package Manager (If Network-Restricted)</h4>
93109
</p>
94110
<p>
95111
Rust packages and their associated metadata are, by default, stored in
96-
<span style="font-family: monospace">https://crates.io</span>. Package
97-
download and installation is in turn conducted by the package manager
98-
<span style="font-family: monospace">cargo</span>. For network-restricted
99-
client PCs, Murfey also supports mirroring
100-
<span style="font-family: monospace">https://crates.io</span> to facilitate
101-
the installation of Rust packages.
102-
</p>
103-
<p>
104-
To configure <span style="font-family: monospace">cargo</span>, simply
105-
download the pre-configured
106-
<span style="font-family: monospace">config.toml</span> file via this
107-
<a href="{{ proxy_path }}/rust/cargo/config.toml">link</a>. This file should
108-
then be pasted in a <span style="font-family: monospace">.cargo</span> folder,
109-
which, by default, shold be located in your User Profile homespace:
110-
</p>
111-
<pre style="font-family: monospace">
112+
<span
113+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
114+
>https://crates.io</span
115+
>. Package download and installation is in turn conducted by the package
116+
manager
117+
<span
118+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
119+
>cargo</span
120+
>. For network-restricted client PCs, Murfey also supports mirroring
121+
<span
122+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
123+
>https://crates.io</span
124+
>
125+
to facilitate the installation of Rust packages.
126+
</p>
127+
<p>
128+
To configure
129+
<span
130+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
131+
>cargo</span
132+
>, simply download the pre-configured
133+
<span
134+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
135+
>config.toml</span
136+
>
137+
file via this <a href="{{ proxy_path }}/rust/cargo/config.toml">link</a>. This
138+
file should then be pasted in a
139+
<span
140+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
141+
>.cargo</span
142+
>
143+
folder, which, by default, shold be located in your User Profile homespace:
144+
</p>
145+
<pre
146+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
147+
>
112148
%USERPROFILE%\.cargo
113149
</pre>
114150
<p>For a user named Murfey, for example, this would take the form:</p>
115-
<pre style="font-family: monospace">
151+
<pre
152+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
153+
>
116154
C:\Users\Murfey\.cargo
117155
</pre>
118156
<p>
119157
With this file configured,
120-
<span style="font-family: monospace">cargo</span> will know to look for
121-
package metadata and files via the Murfey mirror instead.
158+
<span
159+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
160+
>cargo</span
161+
>
162+
will know to look for package metadata and files via the Murfey mirror
163+
instead.
122164
</p>
123165

124166
<h4>D. Running MSYS2 Through Command Prompt</h4>
@@ -133,7 +175,9 @@ <h4>D. Running MSYS2 Through Command Prompt</h4>
133175
<span>New > Shortcut</span>. When prompted for the location of the item, enter
134176
the following into the text box:
135177
</p>
136-
<pre style="font-family: monospace">
178+
<pre
179+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
180+
>
137181
cmd.exe /k "C:\msys64\msys2_shell.cmd -defterm -no-start -ucrt64 -shell bash"
138182
</pre>
139183
<p>
@@ -152,7 +196,9 @@ <h2>2. Setting Up Python</h2>
152196
</p>
153197
<h3>A. (Optional) Setting Up a Virtual Environment</h3>
154198
<p>To set up a virtual environment, run the following commands:</p>
155-
<pre style="font-family: monospace">
199+
<pre
200+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
201+
>
156202
$ pip install virtualenv --index-url {{ request.url.scheme }}://{{ netloc }}{{ proxy_path }}/pypi --trusted-host {{ netloc }}
157203
$ virtualenv your-env-name # Create the virtual environment
158204
$ source your-env-name/bin/activate # Activate the virtual environment
@@ -163,13 +209,22 @@ <h3>B. Installing Murfey</h3>
163209
environment) in either the Cygwin or UCRT64 terminal using the following
164210
commands:
165211
</p>
166-
<pre style="font-family: monospace">
212+
<pre
213+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
214+
>
167215
$ pip install murfey[client] --index-url {{ request.url.scheme }}://{{ netloc }}{{ proxy_path }}/pypi --trusted-host {{ netloc }}
168216
</pre>
169217
<p>
170218
If you wish to install the client-side dependencies needed to run Murfey via
171219
the web UI, replace
172-
<span style="font-family: monospace">murfey[client]</span> with
173-
<span style="font-family: monospace">murfey[client,instrument-server]</span>.
220+
<span
221+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
222+
>murfey[client]</span
223+
>
224+
with
225+
<span
226+
style="font-family: Consolas, Monaco, &quot;Lucida Console&quot;, monospace"
227+
>murfey[client,instrument-server]</span
228+
>.
174229
</p>
175230
{% endblock %}

0 commit comments

Comments
 (0)