Compare commits

...

3 commits

23 changed files with 132 additions and 39 deletions

64
css/fonts-cabin.css Normal file
View file

@ -0,0 +1,64 @@
@font-face {
font-family: 'Cabin';
font-style: italic;
font-weight: 400;
font-stretch: normal;
font-display: swap;
src: url(/Themes/MMF/fonts/Cabin-Italic.woff2) format('woff2');
}
@font-face {
font-family: 'Cabin';
font-style: italic;
font-weight: 500;
font-stretch: normal;
font-display: swap;
src: url(/Themes/MMF/fonts/Cabin-MediumItalic.woff2) format('woff2');
}
@font-face {
font-family: 'Cabin';
font-style: italic;
font-weight: 600;
font-stretch: normal;
font-display: swap;
src: url(/Themes/MMF/fonts/Cabin-SemiBoldItalic.woff2) format('woff2');
}
@font-face {
font-family: 'Cabin';
font-style: italic;
font-weight: 700;
font-stretch: normal;
font-display: swap;
src: url(/Themes/MMF/fonts/Cabin-BoldItalic.woff2) format('woff2');
}
@font-face {
font-family: 'Cabin';
font-style: normal;
font-weight: 400;
font-stretch: normal;
font-display: swap;
src: url(/Themes/MMF/fonts/Cabin-Regular.woff2) format('woff2');
}
@font-face {
font-family: 'Cabin';
font-style: normal;
font-weight: 500;
font-stretch: normal;
font-display: swap;
src: url(/Themes/MMF/fonts/Cabin-Medium.woff2) format('woff2');
}
@font-face {
font-family: 'Cabin';
font-style: normal;
font-weight: 600;
font-stretch: normal;
font-display: swap;
src: url(/Themes/MMF/fonts/Cabin-SemiBold.woff2) format('woff2');
}
@font-face {
font-family: 'Cabin';
font-style: normal;
font-weight: 700;
font-stretch: normal;
font-display: swap;
src: url(/Themes/MMF/fonts/Cabin-Bold.woff2) format('woff2');
}

16
css/fonts-oswald.css Normal file
View file

@ -0,0 +1,16 @@
@font-face {
font-family: 'Oswald';
font-style: normal;
font-weight: 200 700;
font-display: swap;
src: url(/Themes/MMF/fonts/Oswald-Latin.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
@font-face {
font-family: 'Oswald';
font-style: normal;
font-weight: 200 700;
font-display: swap;
src: url(/Themes/MMF/fonts/Oswald-Latin-ext.woff2) format('woff2');
unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
}

View file

@ -30,7 +30,7 @@ html {
body {
background: var(--bgcolor);
font-size: 100%;
font-family: "Luciole","Ubuntu","Cantarell","Segoe UI","Roboto","Oxygen","Fira Sans","Droid Sans","Helvetica Neue","Helvetica","Arial",sans-serif;
font-family: "Cabin",sans-serif;
color: var(--dark-color);
position: relative;
height: 100%;
@ -42,6 +42,9 @@ body {
background: #99d4ff;
color: rgba(0, 0, 0, 0.6);
}
h1, h2, h3, h4, h5, h6 {
font-family: "Oswald",sans-serif;
}
/* General reset */
* {

BIN
fonts/Cabin-Bold.woff2 Normal file

Binary file not shown.

Binary file not shown.

BIN
fonts/Cabin-Italic.woff2 Normal file

Binary file not shown.

BIN
fonts/Cabin-Medium.woff2 Normal file

Binary file not shown.

Binary file not shown.

BIN
fonts/Cabin-Regular.woff2 Normal file

Binary file not shown.

BIN
fonts/Cabin-SemiBold.woff2 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
fonts/Oswald-Latin.woff2 Normal file

Binary file not shown.

13
images/.gitignore vendored Normal file
View file

@ -0,0 +1,13 @@
/boardicons.png
/icons/admin.png
/icons/alerts.png
/icons/home.png
/icons/login.png
/icons/members.png
/icons/moderate.png
/icons/pm.png
/icons/profile.png
/icons/recent.png
/icons/search.png
/icons/unread_replies.png
/icons/unread.png

16
images/Makefile Normal file
View file

@ -0,0 +1,16 @@
RSVGCONVERT := $(shell command -v rsvg-convert 2> /dev/null)
OPTIPNG := $(shell command -v optipng 2> /dev/null)
.PHONY: all png clean
all: png
png: boardicons.png icons/admin.png icons/alerts.png icons/home.png icons/login.png icons/members.png icons/moderate.png icons/pm.png icons/profile.png icons/recent.png icons/search.png icons/unread_replies.png icons/unread.png
%.png: %.svg
mkdir --parents $(shell dirname $@)
$(RSVGCONVERT) $< --output $@
$(OPTIPNG) -o7 -quiet $@
clean:
rm --force boardicons.png icons/admin.png icons/alerts.png icons/home.png icons/login.png icons/members.png icons/moderate.png icons/pm.png icons/profile.png icons/recent.png icons/search.png icons/unread_replies.png icons/unread.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

View file

@ -40,7 +40,7 @@
id="layer1"
transform="translate(-28.695021,-30.302504)"><path
sodipodi:type="star"
style="opacity:1;fill:#9890bd;fill-opacity:1;stroke:none;stroke-width:0.3;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
style="opacity:1;fill:#bd9098;fill-opacity:1;stroke:none;stroke-width:0.3;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
id="path1239"
inkscape:flatsided="true"
sodipodi:sides="6"
@ -55,7 +55,7 @@
d="M 23.526004,-19.420579 38.316886,6.1979766 23.526007,31.816533 -6.0557534,31.816535 -20.846635,6.1979795 -6.0557559,-19.420577 Z"
transform="matrix(0.38954086,0,0,0.38954086,37.105474,39.754841)" /><path
sodipodi:type="star"
style="fill:#9890bd;fill-opacity:1;stroke:none;stroke-width:0.3;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
style="fill:#bd9098;fill-opacity:1;stroke:none;stroke-width:0.3;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
id="path1239-2"
inkscape:flatsided="true"
sodipodi:sides="6"
@ -70,7 +70,7 @@
d="M 23.526004,-19.420579 38.316886,6.1979766 23.526007,31.816533 -6.0557534,31.816535 -20.846635,6.1979795 -6.0557559,-19.420577 Z"
transform="matrix(0.38954086,0,0,0.38954086,60.927134,39.754841)" /><path
sodipodi:type="star"
style="fill:#9890bd;fill-opacity:1;stroke:none;stroke-width:0.3;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
style="fill:#bd9098;fill-opacity:1;stroke:none;stroke-width:0.3;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
id="path1239-2-2"
inkscape:flatsided="true"
sodipodi:sides="6"
@ -85,7 +85,7 @@
d="M 23.526004,-19.420579 38.316886,6.1979766 23.526007,31.816533 -6.0557534,31.816535 -20.846635,6.1979795 -6.0557559,-19.420577 Z"
transform="matrix(0.38954086,0,0,0.38954086,60.927134,63.758258)" /><path
sodipodi:type="star"
style="fill:#9890bd;fill-opacity:1;stroke:none;stroke-width:0.3;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
style="fill:#bd9098;fill-opacity:1;stroke:none;stroke-width:0.3;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
id="path1239-2-8"
inkscape:flatsided="true"
sodipodi:sides="6"
@ -103,36 +103,36 @@
transform="translate(-0.26879614,-0.27100869)"><g
id="g3486-3"
transform="translate(-30.362466,25.451311)"
style="fill:#8530bf;fill-opacity:1"><path
style="fill:#8530bf;fill-opacity:1;stroke:none;stroke-width:0.561057;stroke-linejoin:round;stroke-miterlimit:2;paint-order:stroke fill markers"
style="fill:#e8304e;fill-opacity:1"><path
style="fill:#e8304e;fill-opacity:1;stroke:none;stroke-width:0.561057;stroke-linejoin:round;stroke-miterlimit:2;paint-order:stroke fill markers"
d="m 75.498274,22.254678 c 0,0 0.336734,0.634649 2.389664,1.133196 C 76.323512,22.35551 76.228957,21.18979 76.228957,21.18979"
id="path1508-2-3-5-9"
sodipodi:nodetypes="ccc" /><path
id="path1510-9-6-6-0"
style="fill:#8530bf;fill-opacity:1;stroke-width:0.52564;stroke-linejoin:round;stroke-miterlimit:2;paint-order:stroke fill markers"
style="fill:#e8304e;fill-opacity:1;stroke-width:0.52564;stroke-linejoin:round;stroke-miterlimit:2;paint-order:stroke fill markers"
d="m -73.092828,16.117323 a 5.3818111,3.35495 0 0 1 5.303552,2.798279 c -0.80402,0.185379 -1.675644,0.287321 -2.585888,0.287321 -2.060395,0 -3.922483,-0.522612 -5.251876,-1.351339 -0.418728,-0.261029 -0.782948,-0.550035 -1.085722,-0.861446 a 5.3818111,3.35495 0 0 1 3.619934,-0.872815 z m -4.047815,1.144633 c 0.34933,0.374265 0.771055,0.714774 1.250053,1.013375 1.426282,0.889124 3.370805,1.42782 5.515426,1.42782 0.933448,0 1.829376,-0.101859 2.660819,-0.290422 a 5.3818111,3.35495 0 0 1 0.0031,0.05995 5.3818111,3.35495 0 0 1 -5.381584,3.354834 5.3818111,3.35495 0 0 1 -5.3821,-3.354834 5.3818111,3.35495 0 0 1 1.334285,-2.210718 z"
transform="scale(-1,1)" /><g
id="g1642-1-9-8"
transform="translate(30.388612,-24.818836)"
style="fill:#8530bf;fill-opacity:1"><path
style="fill:#8530bf;fill-opacity:1;stroke:none;stroke-width:0.79375;stroke-linejoin:round;stroke-miterlimit:2;paint-order:stroke fill markers"
style="fill:#e8304e;fill-opacity:1"><path
style="fill:#e8304e;fill-opacity:1;stroke:none;stroke-width:0.79375;stroke-linejoin:round;stroke-miterlimit:2;paint-order:stroke fill markers"
d="m 36.583874,43.461557 c 0,0 -0.476392,0.897865 -3.380757,1.603179 2.213258,-1.460528 2.347029,-3.109719 2.347029,-3.109719"
id="path1508-27-4-8"
sodipodi:nodetypes="ccc" /><ellipse
style="fill:#8530bf;fill-opacity:1;stroke:none;stroke-width:0.743645;stroke-linejoin:round;stroke-miterlimit:2;paint-order:stroke fill markers"
style="fill:#e8304e;fill-opacity:1;stroke:none;stroke-width:0.743645;stroke-linejoin:round;stroke-miterlimit:2;paint-order:stroke fill markers"
id="path1510-0-8-5"
cx="39.986717"
cy="39.525448"
rx="7.6138706"
ry="4.7463861" /></g></g><g
id="g4200"
style="fill:#8530bf;fill-opacity:1"><path
style="fill:#8530bf;fill-opacity:1;stroke:none;stroke-width:0.561057;stroke-linejoin:round;stroke-miterlimit:2;paint-order:stroke fill markers"
style="fill:#e8304e;fill-opacity:1"><path
style="fill:#e8304e;fill-opacity:1;stroke:none;stroke-width:0.561057;stroke-linejoin:round;stroke-miterlimit:2;paint-order:stroke fill markers"
d="m 69.135808,47.705989 c 0,0 0.336734,0.634649 2.389664,1.133196 -1.564426,-1.032364 -1.658981,-2.198084 -1.658981,-2.198084"
id="path1508-2-3-5-96"
sodipodi:nodetypes="ccc" /><path
id="path1510-9-6-6-3"
style="fill:#8530bf;fill-opacity:1;stroke-width:0.52564;stroke-linejoin:round;stroke-miterlimit:2;paint-order:stroke fill markers"
style="fill:#e8304e;fill-opacity:1;stroke-width:0.52564;stroke-linejoin:round;stroke-miterlimit:2;paint-order:stroke fill markers"
d="m 66.730362,41.568634 a 5.3818111,3.35495 0 0 0 -5.303552,2.798279 c 0.80402,0.185379 1.675644,0.287321 2.585888,0.287321 2.060395,0 3.922483,-0.522612 5.251876,-1.351339 0.418728,-0.261029 0.782948,-0.550035 1.085722,-0.861446 a 5.3818111,3.35495 0 0 0 -3.619934,-0.872815 z m 4.047815,1.144633 c -0.34933,0.374265 -0.771055,0.714774 -1.250053,1.013375 -1.426282,0.889124 -3.370805,1.42782 -5.515426,1.42782 -0.933448,0 -1.829376,-0.101859 -2.660819,-0.290422 a 5.3818111,3.35495 0 0 0 -0.0031,0.05995 5.3818111,3.35495 0 0 0 5.381584,3.354834 5.3818111,3.35495 0 0 0 5.3821,-3.354834 5.3818111,3.35495 0 0 0 -1.334285,-2.210718 z" /></g><g
id="g4196"
style="fill:#dddddd;fill-opacity:1"><g

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View file

@ -1,12 +0,0 @@
/admin.png
/alerts.png
/home.png
/login.png
/members.png
/moderate.png
/pm.png
/profile.png
/recent.png
/search.png
/unread_replies.png
/unread.png

View file

@ -1,13 +0,0 @@
RSVGCONVERT := $(shell command -v rsvg-convert 2> /dev/null)
OPTIPNG := $(shell command -v optipng 2> /dev/null)
.PHONY: all png
all: png
png: admin.png alerts.png home.png login.png members.png moderate.png pm.png profile.png recent.png search.png unread_replies.png unread.png
%.png: %.svg
mkdir --parents $(shell dirname $@)
$(RSVGCONVERT) $< --output $@
$(OPTIPNG) -o7 -quiet $@

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 706 B

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

View file

@ -181,6 +181,12 @@ function template_html_above()
echo '
<link rel="index" href="', $scripturl, '?board=', $context['current_board'], '.0">';
// Include stylesheets for custom fonts.
// TODO: The theme path could probably be un-hardcoded.
echo '
<link rel="stylesheet" href="/Themes/MMF/css/fonts-cabin.css" />
<link rel="stylesheet" href="/Themes/MMF/css/fonts-oswald.css" />';
// Output any remaining HTML headers. (from mods, maybe?)
echo $context['html_headers'];