diff --git a/pom.xml b/pom.xml index d60099650214..5669c590d604 100644 --- a/pom.xml +++ b/pom.xml @@ -960,6 +960,17 @@ 2.44.4 3.12.0 2.3.3 + 1.2.1 + + 4.4.0 + 1.16.0 + 3.4.1 + 4.4.1 + 3.2.2 + 5.12.0 + + 4.7.0 + 2.7.0 0.27 1.11.0 @@ -2795,7 +2806,7 @@ org.webjars font-awesome - 4.7.0 + ${refguide.fontawesome.version} jar true **/css/font-awesome.css, @@ -2808,7 +2819,7 @@ org.webjars MathJax - 2.7.0 + ${refguide.mathjax.version} jar true **/MathJax.js, @@ -2846,22 +2857,43 @@ - io.github.devacfr.maven.skins - reflow-default-webdeps - ${reflow-maven-skin.version} - jar - false - **/css/bootstrap.min.css, - **/css/themes/litera/bootstrap.min.css, - **/css/fontawesome/*, - **/css/fontawesome/webfonts/*, - **/js/*.js, - **/js/languages/*, - **/js/styles/github.min.css, - **/js/styles/default.min.css + org.webjars + bootstrap + ${site.bootstrap.version} + **/js/bootstrap.min.js + + + org.webjars.npm + bootswatch + ${site.bootswatch.version} + **/litera/bootstrap.min.css + + + org.webjars + popper.js + ${site.popperjs.version} + **/umd/popper.min.js + + + org.webjars + jquery + ${site.jquery.version} + **/jquery.min.js + + + org.webjars + anchorjs + ${site.anchorjs.version} + **/anchor.min.js + + + org.webjars + font-awesome + ${site.fontawesome.version} + **/css/all.min.css,**/webfonts/* - ${project.build.directory}/site + ${project.build.directory} @@ -3012,6 +3044,67 @@ + + copy-website-resources + + copy-resources + + pre-site + + ${project.build.outputDirectory} + + + ${project.build.directory}/META-INF/resources/webjars/bootstrap/${site.bootstrap.version}/js + ${project.build.directory}/site/js + + bootstrap.min.js + + + + ${project.build.directory}/META-INF/resources/webjars/bootswatch/${site.bootswatch.version}/dist/litera + ${project.build.directory}/site/css/themes/litera + + bootstrap.min.css + + + + ${project.build.directory}/META-INF/resources/webjars/popper.js/${site.popperjs.version}/umd + ${project.build.directory}/site/js + + popper.min.js + + + + ${project.build.directory}/META-INF/resources/webjars/jquery/${site.jquery.version} + ${project.build.directory}/site/js + + jquery.min.js + + + + ${project.build.directory}/META-INF/resources/webjars/anchorjs/${site.anchorjs.version} + ${project.build.directory}/site/js + + anchor.min.js + + + + ${project.build.directory}/META-INF/resources/webjars/font-awesome/${site.fontawesome.version}/css + ${project.build.directory}/site/css/fontawesome + + all.min.css + + + + ${project.build.directory}/META-INF/resources/webjars/font-awesome/${site.fontawesome.version} + ${project.build.directory}/site/css + + webfonts/* + + + + + @@ -3043,17 +3136,17 @@ - + - + - + @@ -3066,7 +3159,7 @@ - + diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css index 17faa5b035b6..cece2e3a1504 100644 --- a/src/site/resources/css/site.css +++ b/src/site/resources/css/site.css @@ -30,8 +30,10 @@ /** Restore earlier code block styles. */ pre { + background-color: #f5f5f5; border-radius: 6px; border: 1px solid rgba(0, 0, 0, 0.15); + padding: 10px; } footer { diff --git a/src/site/site.xml b/src/site/site.xml index 58a887632d0f..bb71739e419d 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -35,7 +35,6 @@ true - true Apache HBase Project Project Information @@ -43,7 +42,9 @@ ASF bootswatch-litera - true + false + false + false ]]> index.html