Skip to content

Commit 16da363

Browse files
authored
Merge pull request #154 from MerginMaps/rebranding
Rebranding - phase 2
2 parents 2d0584e + 2c44177 commit 16da363

32 files changed

+950
-292
lines changed

scripts/unreferenced_images.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ stringarray=($PICS)
1313
for i in "${stringarray[@]}"
1414
do
1515
bi="$(basename -- $i)"
16-
A1=`grep -rn "$bi" $SRC_DIR --include \*.md --include \*.vue --include="config.js"`
16+
A1=`grep -rn "$bi" $SRC_DIR --include \*.md --include \*.vue --include \*.styl --include="config.js"`
1717
if [ ! -z "$A1" ]
1818
then
1919
USED_PICS=$((USED_PICS + 1))

src/.vuepress/components/MerginMapsProject.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<span>
33
<a :href="`https://public.cloudmergin.com/projects/${id}/tree`" target="_blank" rel="noopener noreferrer">
4-
<img :alt="`Mergin Maps Project ${id}`" :src="$withBase('/Mergin.svg')" />
4+
<img :alt="`Mergin Maps Project ${id}`" :src="$withBase('/mm_icon_positive_no_padding.svg')" />
55
<span v-html="id" class="nospellcheck"></span>
66
<span>
77
<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound">

src/.vuepress/components/MerginMapsProjectShort.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<span>
33
<a :href="`https://public.cloudmergin.com/projects/${id}/tree`" target="_blank" rel="noopener noreferrer">
4-
<img :alt="`Mergin Maps Project ${id}`" :src="$withBase('/Mergin.svg')" />
4+
<img :alt="`Mergin Maps Project ${id}`" :src="$withBase('/mm_logo_positive_no_padding.svg')" />
55
<span>
66
<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound">
77
<path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path>

src/.vuepress/config.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
const { description } = require('../../package')
2-
2+
var path = require('path')
33
const pageSuffix = '/'
44

55
module.exports = {
66
/**
77
* Ref:https://v1.vuepress.vuejs.org/config/#title
88
*/
9-
title: 'Mergin & Input App',
9+
title: 'Mergin Maps Documentation',
1010
editLinks: true,
1111
/**
1212
* Ref:https://v1.vuepress.vuejs.org/config/#base
@@ -20,7 +20,7 @@ module.exports = {
2020
* ref:https://v1.vuepress.vuejs.org/config/#head
2121
*/
2222
head: [
23-
['meta', { name: 'theme-color', content: '#3eaf7c' }],
23+
['meta', { name: 'theme-color', content: '#00a884' }],
2424
['meta', { name: 'apple-mobile-web-app-capable', content: 'yes' }],
2525
['meta', { name: 'apple-mobile-web-app-status-bar-style', content: 'black' }],
2626
['link', { rel: 'icon', href: '/favicon.ico' }]
@@ -39,7 +39,7 @@ module.exports = {
3939
*/
4040
themeConfig: {
4141
// logo in navbar
42-
logo: '/merginmaps.svg',
42+
logo: '/mm_logo_positive_half_padding.png',
4343
// Optional options for generating "Edit this page" link
4444
docsRepo: 'merginmaps/docs',
4545
// if your docs are not at the root of the repo:
@@ -60,6 +60,10 @@ module.exports = {
6060
nav: [],
6161
sidebar: require('./sidebar/en')
6262
},
63+
64+
alias: {
65+
'@fonts': path.resolve(__dirname, './public/fonts')
66+
},
6367

6468
/**
6569
* Apply plugins,ref:https://v1.vuepress.vuejs.org/zh/plugin/
Lines changed: 1 addition & 0 deletions
Loading

src/.vuepress/public/Mergin.svg

Lines changed: 0 additions & 71 deletions
This file was deleted.

src/.vuepress/public/favicon.ico

13.6 KB
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)