Skip to content

Commit

Permalink
HDDS-2000. Don't depend on bootstrap/jquery versions from hadoop-trun…
Browse files Browse the repository at this point in the history
…k snapshot

Closes apache#1339
  • Loading branch information
vivekratnavel authored and ahussein committed Oct 29, 2019
1 parent 201cba2 commit de7cf1e
Show file tree
Hide file tree
Showing 31 changed files with 11,330 additions and 48 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="{{ "js/jquery.min.js" | relURL}}"></script>
<script src="{{ "js/jquery-3.4.1.min.js" | relURL}}"></script>
<script src="{{ "js/ozonedoc.js" | relURL}}"></script>
<script src="{{ "js/bootstrap.min.js" | relURL}}"></script>
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand hidden-xs" href="#">Apache Hadoop Ozone/HDDS documentation</a>
<a href="#" class="navbar-left" style="height: 50px; padding: 5px 5px 5px 0;">
<img src="ozone-logo-small.png" width="40"/>
</a>
<a class="navbar-brand hidden-xs" href="#">
Apache Hadoop Ozone/HDDS documentation
</a>
<a class="navbar-brand visible-xs-inline" href="#">Hadoop Ozone</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions hadoop-hdds/docs/themes/ozonedoc/static/css/bootstrap.min.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions hadoop-hdds/docs/themes/ozonedoc/static/js/bootstrap.min.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions hadoop-hdds/docs/themes/ozonedoc/static/js/jquery.min.js

This file was deleted.

27 changes: 0 additions & 27 deletions hadoop-hdds/framework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,4 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy web resources</id>
<phase>compile</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<copy toDir="${project.build.directory}/classes/webapps/static">
<fileset
dir="${basedir}/../../hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static">
</fileset>
</copy>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit de7cf1e

Please sign in to comment.