Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99cc35bb authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev

parents 2c461def 4f9140b5
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -70,10 +70,15 @@
    <family name="monospace">
        <font weight="400" style="normal">DroidSansMono.ttf</font>
    </family>
    <alias name="courier" to="monospace" />
    <alias name="courier new" to="monospace" />
    <alias name="sans-serif-monospace" to="monospace" />
    <alias name="monaco" to="monospace" />

    <family name="serif-monospace">
        <font weight="400" style="normal">CutiveMono.ttf</font>
    </family>
    <alias name="courier" to="serif-monospace" />
    <alias name="courier new" to="serif-monospace" />

    <family name="casual">
        <font weight="400" style="normal">ComingSoon.ttf</font>
    </family>
+12 −2
Original line number Diff line number Diff line
@@ -129,8 +129,7 @@
    <family>
        <nameset>
            <name>monospace</name>
            <name>courier</name>
            <name>courier new</name>
            <name>sans-serif-monospace</name>
            <name>monaco</name>
        </nameset>
        <fileset>
@@ -138,6 +137,17 @@
        </fileset>
    </family>

    <family>
        <nameset>
            <name>serif-monospace</name>
            <name>courier</name>
            <name>courier new</name>
        </nameset>
        <fileset>
            <file>CutiveMono.ttf</file>
        </fileset>
    </family>

    <family>
        <nameset>
            <name>casual</name>