Posts made by zkab

OK and thanks for your support …

OK - I went to ~/MagicMirror directory and fired the gun …

pi@mirror:~/MagicMirror $ git stash
Saved working directory and index state WIP on master: 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
HEAD is now at 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
pi@mirror:~/MagicMirror $ git pull && npm install
remote: Counting objects: 70, done.
remote: Compressing objects: 100% (24/24), done.
remote: Total 70 (delta 38), reused 52 (delta 33), pack-reused 13
Unpacking objects: 100% (70/70), done.
From https://github.com/MichMich/MagicMirror
   8893df1..86ae704  develop    -> origin/develop
Already up-to-date.

> magicmirror@2.1.2 install /home/pi/MagicMirror
> cd vendor && npm install


> magicmirror@2.1.2 postinstall /home/pi/MagicMirror
> sh installers/postinstall/postinstall.sh

MagicMirror installation successful!
npm WARN grunt-yamllint@0.2.0 requires a peer of grunt@~0.4.0 but none was installed.
pi@mirror:~/MagicMirror $ git stash apply
On branch master
Your branch is ahead of 'origin/master' by 4 commits.
  (use "git push" to publish your local commits)
Changes not staged for commit: ~/MagicMirror
  (use "git add ..." to update what will be committed)
  (use "git checkout -- ..." to discard changes in working directory)

	modified:   css/custom.css
	modified:   modules/default/currentweather/currentweather.js

Untracked files:
  (use "git add ..." to include in what will be committed)

	css/custom.css.leo
	fonts/my_fonts/

no changes added to commit (use "git add" and/or "git commit -a")
pi@mirror:~/MagicMirror $

OK - what I did before I read you answer was … made a copy of my changes and issued ‘git reset --hard’ … and copied back the changed moduled and after that following:

git stash
git pull && npm install
git stash apply
but got some warnings … how do I get rid of this …

1. no such file or directory, open '/home/pi/MagicMirror/modules/package.json - this is not anything I have done
2. what about Changes not staged for commit and Untracked files

pi@mirror:~/MagicMirror/modules/default/currentweather $ git stash
Saved working directory and index state WIP on master: 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
HEAD is now at 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
pi@mirror:~/MagicMirror/modules/default/currentweather $ git pull && npm install
Already up-to-date.
npm WARN enoent ENOENT: no such file or directory, open '/home/pi/MagicMirror/modules/package.json'
npm WARN enoent ENOENT: no such file or directory, open '/home/pi/MagicMirror/modules/node_modules/node_helper/package.json'
npm WARN modules No description
npm WARN modules No repository field.
npm WARN modules No README data
npm WARN modules No license field.
pi@mirror:~/MagicMirror/modules/default/currentweather $ git stash apply
On branch master
Your branch is ahead of 'origin/master' by 4 commits.
  (use "git push" to publish your local commits)
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git checkout -- ..." to discard changes in working directory)

	modified:   ../../../css/custom.css
	modified:   currentweather.js

Untracked files:
  (use "git add ..." to include in what will be committed)

	../../../css/custom.css.leo
	../../../fonts/my_fonts/

no changes added to commit (use "git add" and/or "git commit -a")
pi@mirror:~/MagicMirror/modules/default/currentweather $

Still confused but at a higher level …

Thanks for your reply.
It failed already on the first command …

pi@mirror:~/MagicMirror $ git stash
modules/default/currentweather/currentweather.js: needs merge
modules/default/currentweather/currentweather.js: needs merge
modules/default/currentweather/currentweather.js: unmerged (73774c3dcc4a780ac9c42142224ab3bbb65e1a3d)
modules/default/currentweather/currentweather.js: unmerged (050917657a61f6edc56195e8f502ff2c67a322e2)
modules/default/currentweather/currentweather.js: unmerged (ff34891ca2036ea844e0d4f511a551593cbbdd52)
fatal: git-write-tree: error building trees
Cannot save the current index state
pi@mirror:~/MagicMirror $

Is there away to shrink the image so it doesn’t cover the whole screen … ie only the lower 1/3

How can this be fixed ? Not an expert on git …

pi@mirror:~/MagicMirror $ git pull && npm install
D	19820
M	css/custom.css
M	css/custom.css.org
U	modules/default/currentweather/currentweather.js
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm '
as appropriate to mark resolution, or use 'git commit -a'.
pi@mirror:~/MagicMirror $

Thanks - I didn’t saw the misspell … sorry
The font is SHOTGUNN.TTF and nothing else.
Problem is solved and thanks again.

Didn’t get it right …

What I want to do is write two textlines with ‘helloword’ - the first one with ‘upper_third’ and the second one with ‘bottom_bar’.
Fonts should be zapfchan (‘upper_third’) and shotgunk (‘bottom_bar’) but only ‘upper_third’ is OK.
I have place the fonts in a folder my-fonts …

:~/MagicMirror/fonts/my_fonts $ ls -l
total 96
-rwxr-xr-x 1 pi pi 34276 apr 6 15:32 SHOTGUNN.TTF
-rwxr-xr-x 1 pi pi 59964 apr 6 15:51 ZAFCHAB.TTF

My custom.css looks like this:

@font-face {
  font-family: zapfchan;
  font-style: normal;
  font-weight: 400;
  src:
    local("zapfchan"),
    url("../fonts/my_fonts/ZAFCHAB.TTF") format("truetype");
}
@font-face {
  font-family: shotgunk;
  font-style: normal;
  font-weight: 400;
  src:
    local("shotgunk"),
    url("../fonts/my_fonts/SHOTGUNK.TTF") format("truetype");
}
.region.upper.third .helloworld div {
font-size: 71px;
color: #74bbf1;
font-family: "zapfchan";
font-style: normal;
}
.region.bottom .helloworld div {
font-size: 100px;
color: #74bbf1;
font-family: "shotgunk";
font-style: normal;
}

Where have I missed ?

OK - I will place the code in custom.css but where do I store the actual font “SHOTGUNK.TTF” … in the MagicMirror/fonts subdir ?

I have my own font ‘SHOTGUNK.TTF’ that I want to use in ‘helloworld’ … don’t figure out the syntax in custom.css