Skip to content

Commit bea39bb

Browse files
committed
some fixes, version 1.10.6
1 parent afd561a commit bea39bb

File tree

7 files changed

+20
-8
lines changed

7 files changed

+20
-8
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/htdocs/img/gv/
55
/htdocs/login/css/
66
/src/img/gv/
7-
/src/less/fonts
7+
/src/less/iconfont.less
88
/tests/test-forms/err.log
99
/tests/tests.log
1010
/tests/tests.html

Changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## latest
44

5+
1.10.6
6+
gulp task for iconfont generation with preview page
7+
8+
1.10.5
9+
graphviz generates map file, first travis build
10+
511
1.10.0
612
rebase Dockerfile to uwegerdes/nodejs
713

entrypoint.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ if [ ! -d "${APP_HOME}/bower_components" ]; then
55
bower install
66
fi
77

8-
if [ ! -f "${APP_HOME}/htdocs/css/bootstrap.css" ]; then
9-
echo "initial building frontend-development"
10-
gulp build
11-
fi
12-
138
if [ ! -f "${APP_HOME}/htdocs/css/fonts/iconfont.ttf" ]; then
149
echo "initial building iconfont"
1510
gulp iconfont
1611
fi
1712

13+
if [ ! -f "${APP_HOME}/htdocs/css/bootstrap.css" ]; then
14+
echo "initial building frontend-development"
15+
gulp build
16+
fi
17+
1818
if [ -d "${APP_HOME}/tests/compare-layouts" -a ! -f "${APP_HOME}/tests/compare-layouts/css/app.css" ]; then
1919
echo "initial building tests/compare-layouts"
2020
cd "${APP_HOME}/tests/compare-layouts/"

gulpfile.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,12 @@ gulp.task('graphviz', function () {
187187
if (!fs.existsSync(path.join(srcDir, 'img', 'gv'))) {
188188
fs.mkdirSync(path.join(srcDir, 'img', 'gv'));
189189
}
190+
if (!fs.existsSync(path.join(destDir, 'img'))) {
191+
fs.mkdirSync(path.join(destDir, 'img'));
192+
}
193+
if (!fs.existsSync(path.join(destDir, 'img', 'gv'))) {
194+
fs.mkdirSync(path.join(destDir, 'img', 'gv'));
195+
}
190196
return gulp.src(watchFilesFor.graphviz, {read: false})
191197
.pipe(changed(destPng, {extension: '.png'}))
192198
.pipe(shell('dot <%= params(file.path) %> "<%= file.path %>"', {

htdocs/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ <h3>Docker-Server</h3>
3535
<h2>Demos</h2>
3636
<p>Beispiele zu verschiedenen Techniken für die Web-Entwicklung und Tests dazu.</p>
3737
<p><a href="/login/index.php">Login</a>: mit Registrierung, E-Mail mit Bestätigungslink, Datenänderung, Löschen</p>
38+
<p><a href="/css/fonts/iconfont.html">Iconfont</a>: Erzeugen von Iconfont-Dateien aus svg Icons mit <a href="/css/iconfont.html">Preview-Page</a></p>
3839

3940
<h2>Feedback</h2>
4041
<p>Für Fragen, Anregungen, Fehler oder anders bitte folgende Adressen verwenden:</p>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "frontend-development",
33
"description": "Gulp and other packages for frontend development and testing",
4-
"version": "1.10.5",
4+
"version": "1.10.6",
55
"keywords": [
66
"gulp",
77
"frontend",

src/iconfont/template.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
text-decoration: none;
2121
text-transform: none;
2222
}
23-
2423
<% _.each(glyphs, function(glyph) { %>
2524
.<%= fontName %>-<%= glyph.fileName %>:before {
2625
content: "\<%= glyph.codePoint %>";

0 commit comments

Comments
 (0)