Use the bootswatch spacelab theme to replace bootstrap

exo-archives · Jan 27, 2014 · 2953354 · 2953354
1 parent d6243b5
commit 2953354
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/acceptance-webapp/pom.xml b/acceptance-webapp/pom.xml
@@ -176,7 +176,7 @@
     </dependency>
     <dependency>
       <groupId>org.webjars</groupId>
-      <artifactId>bootstrap</artifactId>
+      <artifactId>bootswatch-spacelab</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -442,8 +442,8 @@
             </dependency>
             <dependency>
               <groupId>org.webjars</groupId>
-              <artifactId>bootstrap</artifactId>
-              <version>${webjars.bootstrap.version}</version>
+              <artifactId>bootswatch-spacelab</artifactId>
+              <version>${webjars.bootswatch.version}</version>
             </dependency>
             <dependency>
               <groupId>org.webjars</groupId>

diff --git a/acceptance-webapp/src/main/java/org/exoplatform/acceptance/ui/package-info.java b/acceptance-webapp/src/main/java/org/exoplatform/acceptance/ui/package-info.java
@@ -44,7 +44,7 @@
     {
         @WebJar(value = "angular-ui-bootstrap"),
         @WebJar(value = "angularjs"),
-        @WebJar(value = "bootstrap"),
+        @WebJar(value = "bootswatch-spacelab", version = "3.0.3+1"),
         @WebJar(value = "font-awesome"),
         @WebJar(value = "jquery", version = "2.0.3"),
         @WebJar(value = "lodash", version = "2.4.1"),
@@ -56,13 +56,13 @@
     {
         @Asset(id = "pace.js", value = "external/pace/0_4_16/pace.min.js"),
         @Asset(id = "pace.css", value = "external/pace/0_4_16/pace.css"),
-        @Asset(id = "bootstrap.css", value = "bootstrap/3.0.3/css/bootstrap.min.css"),
+        @Asset(id = "bootstrap.css", value = "bootswatch-spacelab/3.0.3+1/css/bootstrap.min.css"),
         @Asset(id = "font-awesome.css", value = "font-awesome/4.0.3/css/font-awesome.min.css"),
         @Asset(id = "jquery.js", value = "jquery/2.0.3/jquery.min.js"),
         @Asset(id = "angular.js", value = "angularjs/1.2.9/angular.min.js"),
         @Asset(id = "angular-route.js", value = "angularjs/1.2.9/angular-route.min.js"),
         @Asset(id = "lodash.js", value = "lodash/2.4.1/lodash.min.js"),
-        @Asset(id = "bootstrap.js", value = "bootstrap/3.0.3/js/bootstrap.min.js",
+        @Asset(id = "bootstrap.js", value = "bootswatch-spacelab/3.0.3+1/js/bootstrap.min.js",
                depends = {"jquery.js"}),
         @Asset(id = "restangular.js", value = "restangular/1.2.2/restangular.min.js",
                depends = {"angular.js", "angular-route.js", "lodash.js"}),

diff --git a/pom.xml b/pom.xml
@@ -85,7 +85,7 @@
     <tomcat.version>7.0.50</tomcat.version>
     <webjars.angularjs.version>1.2.9</webjars.angularjs.version>
     <webjars.angular-ui-bootstrap.version>0.9.0</webjars.angular-ui-bootstrap.version>
-    <webjars.bootstrap.version>3.0.3</webjars.bootstrap.version>
+    <webjars.bootswatch.version>3.0.3+1-1</webjars.bootswatch.version>
     <webjars.font-awesome.version>4.0.3</webjars.font-awesome.version>
     <webjars.jquery.version>2.0.3-1</webjars.jquery.version>
     <webjars.restangular.version>1.2.2</webjars.restangular.version>
@@ -556,8 +556,8 @@
       </dependency>
       <dependency>
         <groupId>org.webjars</groupId>
-        <artifactId>bootstrap</artifactId>
-        <version>${webjars.bootstrap.version}</version>
+        <artifactId>bootswatch-spacelab</artifactId>
+        <version>${webjars.bootswatch.version}</version>
       </dependency>
       <dependency>
         <groupId>org.webjars</groupId>