marko
|
f1ba938327
|
Merge /media/sdb1/gitRepositories/judo into redesign2018
Conflicts:
homepage/redesign2018/markdownExperiment/src/yaml/images.yaml
homepage/redesign2018/markdownExperiment/src/yaml/navTargets.yaml
|
2018-08-05 12:40:28 +02:00 |
|
marko
|
238390a5c2
|
Merge /media/sdb1/gitRepositories/judo into redesign2018
Conflicts:
homepage/redesign2018/markdownExperiment/src/md/galerien.md
homepage/redesign2018/markdownExperiment/src/yaml/images.yaml
|
2018-08-04 19:30:32 +02:00 |
|
marko
|
33a2555cf8
|
Schreibfehler korrigiert
On branch redesign2018
Changes to be committed:
- Genitivendung korrigiert
modified: src/md/galerie.md
modified: src/md/galerien.md
modified: src/md/kontakt.md
modified: src/md/trainingszeiten.md
|
2018-08-03 14:36:46 +02:00 |
|
marko
|
293df72388
|
- Verschieben der yamlMetadaten in den srcOrdner
On branch redesign2018
Changes to be committed:
- buildProzess angepasst
modified: Makefile
- überflüssige Datei entfernt
deleted: cleancss
- eigentliches Verschieben
renamed: yaml/datenschutz.subNav.yaml -> src/yaml/datenschutz.subNav.yaml
renamed: yaml/download.subNav.yaml -> src/yaml/download.subNav.yaml
renamed: yaml/extras.subNav.yaml -> src/yaml/extras.subNav.yaml
renamed: yaml/galerie.subNav.yaml -> src/yaml/galerie.subNav.yaml
renamed: yaml/galerien.subNav.yaml -> src/yaml/galerien.subNav.yaml
renamed: yaml/hilfsmittel.subNav.yaml -> src/yaml/hilfsmittel.subNav.yaml
renamed: yaml/images.yaml -> src/yaml/images.yaml
renamed: yaml/impressum.subNav.yaml -> src/yaml/impressum.subNav.yaml
renamed: yaml/index.subNav.yaml -> src/yaml/index.subNav.yaml
renamed: yaml/kontakt.subNav.yaml -> src/yaml/kontakt.subNav.yaml
renamed: yaml/links.subNav.yaml -> src/yaml/links.subNav.yaml
renamed: yaml/mainNav.yaml -> src/yaml/mainNav.yaml
renamed: yaml/navTargets.yaml -> src/yaml/navTargets.yaml
renamed: yaml/news.subNav.yaml -> src/yaml/news.subNav.yaml
renamed: yaml/quiz.subNav.yaml -> src/yaml/quiz.subNav.yaml
renamed: yaml/trainingszeiten.subNav.yaml -> src/yaml/trainingszeiten.subNav.yaml
renamed: yaml/verein.subNav.yaml -> src/yaml/verein.subNav.yaml
renamed: yaml/wkKalender.subNav.yaml -> src/yaml/wkKalender.subNav.yaml
|
2018-08-03 14:26:01 +02:00 |
|
marko
|
4b81de20ef
|
Berichtigung eines früheren Commits
Changes to be committed:
renamed: src/cwsvJudo-2018-content.css -> src/css/cwsvJudo-2018-content.css
renamed: src/cwsvJudo-2018-footer.css -> src/css/cwsvJudo-2018-footer.css
renamed: src/cwsvJudo-2018-galTable.css -> src/css/cwsvJudo-2018-galTable.css
renamed: src/cwsvJudo-2018-header.css -> src/css/cwsvJudo-2018-header.css
renamed: src/cwsvJudo-2018-layout.css -> src/css/cwsvJudo-2018-layout.css
renamed: src/cwsvJudo-2018-mainNav.css -> src/css/cwsvJudo-2018-mainNav.css
renamed: src/cwsvJudo-2018-news.css -> src/css/cwsvJudo-2018-news.css
renamed: src/cwsvJudo-2018-quiz.css -> src/css/cwsvJudo-2018-quiz.css
renamed: src/cwsvJudo-2018-sideBar.css -> src/css/cwsvJudo-2018-sideBar.css
renamed: src/cwsvJudo-2018-sponsorList.css -> src/css/cwsvJudo-2018-sponsorList.css
renamed: src/cwsvJudo-2018-subNav.css -> src/css/cwsvJudo-2018-subNav.css
renamed: src/cwsvJudo-2018-wkKalender.css -> src/css/cwsvJudo-2018-wkKalender.css
renamed: src/cwsvJudo-2018.css -> src/css/cwsvJudo-2018.css
|
2018-08-01 13:41:53 +02:00 |
|
marko
|
32d8c3aa68
|
Verschieben der markdownQuellen für die Seiten in den srcOrdner
- (dependencies der) (build)Targets angepasst
modified: Makefile
- die verschobenen Dateien
renamed: md/datenschutz.md -> src/md/datenschutz.md
renamed: md/download.md -> src/md/download.md
renamed: md/extras.md -> src/md/extras.md
renamed: md/galerie.md -> src/md/galerie.md
renamed: md/galerien.md -> src/md/galerien.md
renamed: md/hilfsmittel.md -> src/md/hilfsmittel.md
renamed: md/impressum.md -> src/md/impressum.md
renamed: md/index.md -> src/md/index.md
renamed: md/kontakt.md -> src/md/kontakt.md
renamed: md/links.md -> src/md/links.md
renamed: md/news.md -> src/md/news.md
renamed: md/quiz.md -> src/md/quiz.md
renamed: md/trainingszeiten.md -> src/md/trainingszeiten.md
renamed: md/verein.md -> src/md/verein.md
renamed: md/wkKalender.md -> src/md/wkKalender.md
|
2018-07-31 14:16:52 +02:00 |
|
marko
|
13601be59e
|
Verschieben der einzelnen cascade style sheets in den srcOrdner
- die neue Struktur dokumentieren
new file: readMe.md
- wenn die Quellen sich verschieben, änder sich auch die
(Abhangigkeiten der) Targets
modified: Makefile
- Verschieben der cssDateien
renamed: css/cwsvJudo-2018-content.css -> src/cwsvJudo-2018-content.css
renamed: css/cwsvJudo-2018-footer.css -> src/cwsvJudo-2018-footer.css
renamed: css/cwsvJudo-2018-galTable.css -> src/cwsvJudo-2018-galTable.css
renamed: css/cwsvJudo-2018-header.css -> src/cwsvJudo-2018-header.css
renamed: css/cwsvJudo-2018-layout.css -> src/cwsvJudo-2018-layout.css
renamed: css/cwsvJudo-2018-mainNav.css -> src/cwsvJudo-2018-mainNav.css
renamed: css/cwsvJudo-2018-navBar.css.bak -> src/cwsvJudo-2018-navBar.css.bak
renamed: css/cwsvJudo-2018-news.css -> src/cwsvJudo-2018-news.css
renamed: css/cwsvJudo-2018-quiz.css -> src/cwsvJudo-2018-quiz.css
renamed: css/cwsvJudo-2018-sideBar.css -> src/cwsvJudo-2018-sideBar.css
renamed: css/cwsvJudo-2018-sponsorList.css -> src/cwsvJudo-2018-sponsorList.css
renamed: css/cwsvJudo-2018-subNav.css -> src/cwsvJudo-2018-subNav.css
renamed: css/cwsvJudo-2018-subNav.css.bak -> src/cwsvJudo-2018-subNav.css.bak
renamed: css/cwsvJudo-2018-wkKalender.css -> src/cwsvJudo-2018-wkKalender.css
renamed: css/cwsvJudo-2018.css -> src/cwsvJudo-2018.css
|
2018-07-31 11:56:53 +02:00 |
|