Permalink
Browse files

Upgraded angular-js, bootstrap, and jquery. Removed angular-js, boots…

…trap, and jquery js and css files in favor of using webjars.
  • Loading branch information...
1 parent e846b34 commit 44edcfe55efe42f5f9b690d7350f2c069d57e021 @scottfrederick scottfrederick committed Apr 22, 2014
Showing with 188 additions and 32,986 deletions.
  1. +1 −0 .gitignore
  2. +7 −0 build.gradle
  3. +1 −0 src/main/java/org/cloudfoundry/samples/music/config/web/WebMvcConfig.java
  4. +16 −13 src/main/webapp/WEB-INF/index.html
  5. +20 −8 src/main/webapp/assets/css/app.css
  6. +0 −1,109 src/main/webapp/assets/css/bootstrap-responsive.css
  7. +0 −9 src/main/webapp/assets/css/bootstrap-responsive.min.css
  8. +0 −4,960 src/main/webapp/assets/css/bootstrap.css
  9. +0 −9 src/main/webapp/assets/css/bootstrap.min.css
  10. +59 −0 src/main/webapp/assets/css/multi-columns-row.css
  11. +4 −2 src/main/webapp/assets/js/albums.js
  12. +0 −167 src/main/webapp/assets/js/angular-bootstrap.js
  13. +0 −9 src/main/webapp/assets/js/angular-bootstrap.min.js
  14. +0 −457 src/main/webapp/assets/js/angular-resource.js
  15. +0 −10 src/main/webapp/assets/js/angular-resource.min.js
  16. +0 −1,461 src/main/webapp/assets/js/angular-ui.js
  17. +0 −7 src/main/webapp/assets/js/angular-ui.min.js
  18. +0 −14,760 src/main/webapp/assets/js/angular.js
  19. +0 −162 src/main/webapp/assets/js/angular.min.js
  20. +3 −2 src/main/webapp/assets/js/app.js
  21. +0 −169 src/main/webapp/assets/js/bootstrap-dropdown.js
  22. +0 −9,597 src/main/webapp/assets/js/jquery-1.9.1.js
  23. +0 −5 src/main/webapp/assets/js/jquery-1.9.1.min.js
  24. +1 −1 src/main/webapp/assets/templates/add.html
  25. +5 −5 src/main/webapp/assets/templates/albums.html
  26. +1 −1 src/main/webapp/assets/templates/footer.html
  27. +9 −9 src/main/webapp/assets/templates/grid.html
  28. +22 −17 src/main/webapp/assets/templates/header.html
  29. +37 −35 src/main/webapp/assets/templates/list.html
  30. +2 −2 src/main/webapp/assets/templates/status.html
View
@@ -1,5 +1,6 @@
*.iml
*.ipr
+*.ids
*.iws
.idea/
View
@@ -75,6 +75,13 @@ dependencies {
compile 'javax.validation:validation-api:1.0.0.GA'
compile 'org.hibernate:hibernate-validator:4.3.0.Final'
+ // Webjars
+ compile 'org.webjars:bootstrap:3.1.1'
+ compile 'org.webjars:angularjs:1.2.16'
+ compile 'org.webjars:angular-ui:0.4.0-2'
+ compile 'org.webjars:angular-ui-bootstrap:0.10.0-1'
+ compile 'org.webjars:jquery:2.1.0-2'
+
// Logging
compile 'org.slf4j:slf4j-api:1.7.2'
compile 'org.slf4j:slf4j-log4j12:1.7.2'
@@ -23,6 +23,7 @@ public InternalResourceViewResolver internalResourceViewResolver() {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/assets/**").addResourceLocations("/assets/");
+ registry.addResourceHandler("/webjars/**").addResourceLocations("/webjars/");
}
@Override
@@ -7,33 +7,36 @@
<link rel="shortcut icon" href="assets/favicon.ico">
<title>Spring Music</title>
- <link rel="stylesheet" type="text/css" href="assets/css/bootstrap.css">
+ <link rel="stylesheet" type="text/css" href="webjars/bootstrap/3.1.1/css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="assets/css/app.css">
- <link rel="stylesheet" type="text/css" href="assets/css/bootstrap-responsive.css">
+ <link rel="stylesheet" type="text/css" href="assets/css/multi-columns-row.css">
</head>
<body>
<div class="container">
- <div class="row-fluid">
- <div ng-include src="'assets/templates/header.html'"></div>
+ <div class="row">
+ <div ng-include="'assets/templates/header.html'"></div>
</div>
- <div id="body" class="row-fluid">
+ <div id="body" class="row">
<ng-view></ng-view>
</div>
- <div class="row-fluid">
- <div ng-include src="'assets/templates/footer.html'"></div>
+ <div class="row">
+ <div ng-include="'assets/templates/footer.html'"></div>
</div>
</div>
- <script type="text/javascript" src="assets/js/angular.js"></script>
- <script type="text/javascript" src="assets/js/angular-resource.js"></script>
- <script type="text/javascript" src="assets/js/angular-bootstrap.js"></script>
- <script type="text/javascript" src="assets/js/angular-ui.js"></script>
+ <script type="text/javascript" src="webjars/jquery/2.1.0/jquery.min.js"></script>
- <script type="text/javascript" src="assets/js/jquery-1.9.1.min.js"></script>
- <script type="text/javascript" src="assets/js/bootstrap-dropdown.js"></script>
+ <script type="text/javascript" src="webjars/angularjs/1.2.16/angular.js"></script>
+ <script type="text/javascript" src="webjars/angularjs/1.2.16/angular-resource.js"></script>
+ <script type="text/javascript" src="webjars/angularjs/1.2.16/angular-route.js"></script>
+ <script type="text/javascript" src="webjars/angular-ui/0.4.0/angular-ui.js"></script>
+ <script type="text/javascript" src="webjars/angular-ui-bootstrap/0.10.0/ui-bootstrap.js"></script>
+ <script type="text/javascript" src="webjars/angular-ui-bootstrap/0.10.0/ui-bootstrap-tpls.js"></script>
+
+ <script type="text/javascript" src="webjars/bootstrap/3.1.1/js/bootstrap.js"></script>
<script type="text/javascript" src="assets/js/app.js"></script>
<script type="text/javascript" src="assets/js/albums.js"></script>
@@ -2,7 +2,13 @@
padding-top: 10px;
}
-.navbar-inner {
+.navbar {
+ background-color: white;
+ border: 0;
+ margin-bottom: 20px;
+}
+
+.navbar .container {
background-color: #008a00;
background-image: -moz-linear-gradient(top, #008a00, #006b00);
background-image: -ms-linear-gradient(top, #008a00, #006b00);
@@ -12,12 +18,18 @@
background-image: linear-gradient(top, #008a00, #006b00);
}
-.navbar .brand {
- color: #ffffff;
+.navbar .navbar-brand {
+ color: white;
+}
+
+.navbar .navbar-brand:hover {
+ color: white;
}
-/* fix Bootstrap thumbnail padding when using row-fluid */
-.row-fluid ul.thumbnails li.span12 + li { margin-left : 0px; }
-.row-fluid ul.thumbnails li.span6:nth-child(2n + 3) { margin-left : 0px; }
-.row-fluid ul.thumbnails li.span4:nth-child(3n + 4) { margin-left : 0px; }
-.row-fluid ul.thumbnails li.span3:nth-child(4n + 5) { margin-left : 0px; }
+.btn {
+ background-color: white;
+}
+
+.icon-white {
+ color: white;
+}
Oops, something went wrong.

0 comments on commit 44edcfe

Please sign in to comment.