Merged changes made in branch

This commit is contained in:
Luca Frosini 2022-04-07 17:43:30 +02:00
parent b53c51b46f
commit 61e2498084
3 changed files with 1225 additions and 13 deletions

View File

@ -1,17 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<enunciate <enunciate
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.14.0.xsd"> xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.14.0.xsd">
<api-classes> <api-classes>
<exclude pattern="org.gcube.gcat.rest.Docs" /> <exclude pattern="org.gcube.gcat.rest.Docs" />
</api-classes> </api-classes>
<modules> <modules>
<gwt-json-overlay disabled="true " /> <gwt-json-overlay disabled="true " />
<php-json-client disabled="true" /> <php-json-client disabled="true" />
<ruby-json-client disabled="true" /> <ruby-json-client disabled="true" />
<java-json-client disabled="true" /> <java-json-client disabled="true" />
<javascript-client disabled="true" /> <javascript-client disabled="true" />
<docs docsDir="${project.build.directory}" docsSubdir="docs" /> <docs docsDir="${project.build.directory}" docsSubdir="docs" />
<swagger basePath="/gcat"/> <swagger basePath="/${project.artifactId}" />
</modules> <docs freemarkerTemplate="${project.basedir}/src/main/resources/META-INF/enunciate/d4science_docs.fmt">
<additional-css
file="css/d4science_enunciate_custom.css" />
</docs>
</modules>
</enunciate> </enunciate>

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,25 @@
.d4science_intro {
top: 0;
z-index: 2000;
position: fixed;
display: block ruby;
padding: 10px;
background: white;
width: 100%;
}
.navbar-fixed-top {
top: 100px !important;
}
.sidebar {
top: 160px !important;
}
.navbar {
margin-bottom: 40px !important;
}
.main {
top: 90px;
}