 Daniel Seifert
|
4686d48902
|
Merge remote-tracking branch 'remotes/upstream/master'
|
2020-05-28 09:10:07 +02:00 |
|
Daniel Seifert
|
48e0d0c734
|
Merge branch 'master' of github.com:dauxio/daux.io
# Conflicts:
# daux_libraries/README.md
# src/css/theme_daux/_components.scss
# src/css/theme_daux/_fonts.scss
# src/css/theme_daux/_homepage.scss
# src/css/theme_daux/_mixins.scss
# src/css/theme_daux/_print.scss
# src/css/theme_daux/_structure.scss
# src/css/theme_daux/_typography.scss
# src/css/theme_daux/_variables.scss
# src/css/theme_daux/theme-blue.scss
# src/css/theme_daux/theme-green.scss
# src/css/theme_daux/theme-navy.scss
# src/css/theme_daux/theme-red.scss
# src/css/theme_daux/theme.scss
# src/css/theme_daux/vendor/normalize.scss
# src/css/theme_daux_singlepage/_fonts.scss
# src/css/theme_daux_singlepage/_print.scss
# src/css/theme_daux_singlepage/_typography.scss
# src/css/theme_daux_singlepage/main.scss
# themes/d3/js/README.md
# themes/d3/js/daux.js
# themes/d3/js/highlight.pack.js
# themes/d3/js/html5shiv-3.7.3.min.js
# themes/d3/js/jquery-1.11.3.min.js
# themes/d3/scss/_components.scss
# themes/d3/scss/_fonts.scss
# themes/d3/scss/_homepage.scss
# themes/d3/scss/_mixins.scss
# themes/d3/scss/_print.scss
# themes/d3/scss/_structure.scss
# themes/d3/scss/_typography.scss
# themes/d3/scss/_variables.scss
# themes/d3/scss/theme-blue.scss
# themes/d3/scss/theme-green.scss
# themes/d3/scss/theme-navy.scss
# themes/d3/scss/theme-red.scss
# themes/d3/scss/theme.scss
# themes/d3/scss/vendor/highlight.scss
# themes/d3/scss/vendor/normalize.scss
# themes/daux/config.json
# themes/daux/css/theme-blue.min.css
# themes/daux/css/theme-blue.min.css.map
# themes/daux/css/theme-green.min.css
# themes/daux/css/theme-green.min.css.map
# themes/daux/css/theme-navy.min.css
# themes/daux/css/theme-navy.min.css.map
# themes/daux/css/theme-red.min.css
# themes/daux/css/theme-red.min.css.map
# themes/daux/js/README.md
# themes/daux/scss/_components.scss
# themes/daux/scss/_fonts.scss
# themes/daux/scss/_homepage.scss
# themes/daux/scss/_mixins.scss
# themes/daux/scss/_print.scss
# themes/daux/scss/_structure.scss
# themes/daux/scss/_typography.scss
# themes/daux/scss/_variables.scss
# themes/daux/scss/theme-blue.scss
# themes/daux/scss/theme-green.scss
# themes/daux/scss/theme-navy.scss
# themes/daux/scss/theme-red.scss
# themes/daux/scss/theme.scss
# themes/daux/scss/vendor/normalize.scss
# themes/daux_singlepage/css/main.min.css
# themes/daux_singlepage/css/main.min.css.map
|
2019-09-24 10:43:01 +02:00 |
|
Daniel Seifert
|
38a01e1069
|
changed wrong resource link
|
2018-07-20 21:01:23 +02:00 |
|
Daniel Seifert
|
36a9e7134c
|
add versionselector variable check
|
2018-07-19 20:27:39 +02:00 |
|
Daniel Seifert
|
0b92136bbd
|
clean themes, note theme name change!
|
2018-07-11 23:26:40 +02:00 |
|
Daniel Seifert
|
42093faa3a
|
allow parent directory, add version selector in home page
|
2018-07-10 22:01:30 +02:00 |
|
Daniel Seifert
|
e6a5ab0771
|
fix selected
|
2018-07-10 01:02:19 +02:00 |
|
Daniel Seifert
|
bd04e8ca1e
|
add versionselector option
|
2018-07-10 00:28:24 +02:00 |
|
Daniel Seifert
|
773859d60a
|
add d3 individualizations
|
2018-07-08 22:39:35 +02:00 |