Commit b1bda62f authored by Marc Coiffier's avatar Marc Coiffier
Browse files

Minor tweaks

parent 1c58bc9e
......@@ -8,4 +8,5 @@ Curly_Test.hs
*.o
*.js
*.jsmod
*/dist
\ No newline at end of file
config.mk
*/dist
all: build
config.mk:
scripts/new-config "$(WATCH)" "$(NOTIFY)" "$(DOC)" "$(PREFIX)" "$(TARGETS)" > $@
-include config.mk
ifeq ($(WATCH),true)
STACK_FLAGS += --file-watch
endif
......
No preview for this file type
......@@ -24,15 +24,7 @@ body { width: 100%; }
body { width: 65%; }
}
<<<<<<< HEAD
body { margin: auto; font-family: 'Titillium Web'; line-height: 180%; font-size: 120%; }
=======
<<<<<<< Updated upstream
body { margin: auto; font-family: 'Titillium Web'; line-height: 180%; }
=======
body { margin: auto; font-family: 'Titillium Web'; line-height: 180%; font-size: 1.6em; }
>>>>>>> Stashed changes
>>>>>>> master
p, div, body { font-family: 'Titillium Web'; }
p { text-indent: 0.7em; margin-left: 1em; }
article { margin-left: 1em; margin-right: 1em; }
......
......@@ -122,7 +122,8 @@ view-trans set-viewMat
"press L" { auto-toggle auto-loop } bind-key
'loop-body { lightVect east-west { dyz } { dzy } if ** set-lightVect refresh } def
'update-sun { lightVect east-west { dyz } { dzy } if ** set-lightVect refresh } def
'loop-body { update-sun } def
'east-west true def
"press E" { 'east-west { 1 swap - } modify } bind-key
......@@ -12,8 +12,8 @@ build-type: Simple
cabal-version: >=1.10
library
exposed-modules: Data.Matricial
build-depends: base >=4.9 && <4.10,definitive-base >=2.6 && <2.7
exposed-modules: Data.Matricial Data.Font
build-depends: base >=4.9 && <4.10,definitive-base >=2.6 && <2.7, freetype2
default-extensions: TypeSynonymInstances, NoMonomorphismRestriction, StandaloneDeriving, GeneralizedNewtypeDeriving, TypeOperators, RebindableSyntax, FlexibleInstances, FlexibleContexts, FunctionalDependencies, TupleSections, MultiParamTypeClasses, Rank2Types, AllowAmbiguousTypes, RoleAnnotations, ViewPatterns, LambdaCase
hs-source-dirs: src
default-language: Haskell2010
......
#!/bin/bash
cat <<EOF
WATCH := $1
NOTIFY := $2
DOC := $3
PREFIX := $4
TARGETS := $5
EOF
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment