Merge pull request #3317 from twosigma/tom/3311

#3311 - Upgraded Angular Bootstrap from 0.14.3 to 1.0.3
twosigma · Jan 12, 2016 · 3f2f78a · 3f2f78a
2 parents abd9c72 + f0ba0b1
commit 3f2f78a
Show file tree

Hide file tree

Showing 9 changed files with 6,295 additions and 9,659 deletions.
diff --git a/core/bower.json b/core/bower.json
@@ -13,7 +13,7 @@
     "d3": "3.5.10",
     "codemirror": "5.2.0",
     "q": "0.9.7",
-    "angular-bootstrap": "0.14.3",
+    "angular-bootstrap": "1.0.3",
     "bootstrap-sass": "3.3.5",
     "moment": "2.10.3",
     "moment-timezone": "0.4.0",

diff --git a/core/src/main/web/vendor/bower_components/angular-bootstrap/.bower.json b/core/src/main/web/vendor/bower_components/angular-bootstrap/.bower.json
@@ -11,21 +11,21 @@
   "license": "MIT",
   "ignore": [],
   "description": "Native AngularJS (Angular) directives for Bootstrap.",
-  "version": "0.14.3",
+  "version": "1.0.3",
   "main": [
     "./ui-bootstrap-tpls.js"
   ],
   "dependencies": {
-    "angular": ">=1.3.0"
+    "angular": ">=1.4.0"
   },
   "homepage": "https://github.com/angular-ui/bootstrap-bower",
-  "_release": "0.14.3",
+  "_release": "1.0.3",
   "_resolution": {
     "type": "version",
-    "tag": "0.14.3",
-    "commit": "306d1a30b4a8e8144741bb9c0126331ac884126a"
+    "tag": "v1.0.3",
+    "commit": "d42c36fc2fc4130b4cb5d4577cb2afda61c59abe"
   },
   "_source": "git://github.com/angular-ui/bootstrap-bower.git",
-  "_target": "0.14.3",
+  "_target": "1.0.3",
   "_originalSource": "angular-bootstrap"
 }
diff --git a/core/src/main/web/vendor/bower_components/angular-bootstrap/bower.json b/core/src/main/web/vendor/bower_components/angular-bootstrap/bower.json
@@ -11,9 +11,9 @@
     "license": "MIT",
     "ignore": [],
     "description": "Native AngularJS (Angular) directives for Bootstrap.",
-    "version": "0.14.3",
+    "version": "1.0.3",
     "main": ["./ui-bootstrap-tpls.js"],
     "dependencies": {
-        "angular": ">=1.3.0"
+        "angular": ">=1.4.0"
     }
 }
diff --git a/core/src/main/web/vendor/bower_components/angular-bootstrap/package.json b/core/src/main/web/vendor/bower_components/angular-bootstrap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-bootstrap",
-  "version": "0.14.3",
+  "version": "1.0.3",
   "description": "Bootstrap widgets for Angular",
   "main": "index.js",
   "homepage": "http://angular-ui.github.io/bootstrap/",
@@ -17,7 +17,7 @@
   ],
   "author": "https://github.com/angular-ui/bootstrap/graphs/contributors",
   "peerDependencies": {
-    "angular": "^1.3.x || >= 1.4.0-beta.0 || >= 1.5.0-beta.0"
+    "angular": ">= 1.4.0-beta.0 || >= 1.5.0-beta.0"
   },
   "license": "MIT"
 }
diff --git a/core/src/main/web/vendor/bower_components/angular-bootstrap/ui-bootstrap-csp.css b/core/src/main/web/vendor/bower_components/angular-bootstrap/ui-bootstrap-csp.css
@@ -3,4 +3,51 @@
 .ng-animate.item:not(.left):not(.right) {
   -webkit-transition: 0s ease-in-out left;
   transition: 0s ease-in-out left
+}
+.uib-tab > div {
+  position: relative;
+  display: block;
+  padding: 10px 15px;
+  outline: 0;
+  color: #337ab7;
+}
+.uib-tab > div:focus,
+.uib-tab > div:hover {
+  background-color: #eee;
+  color: #23527c;
+}
+.uib-tab.disabled > div {
+  color: #777;
+}
+.uib-tab.disabled > div:focus,
+.uib-tab.disabled > div:hover {
+  color: #777;
+  cursor: not-allowed;
+  background-color: transparent;
+}
+.nav-tabs > .uib-tab > div {
+  margin-right: 2px;
+  line-height: 1.42857143;
+  border: 1px solid transparent;
+  border-radius: 4px 4px 0 0;
+}
+.nav-tabs > .uib-tab > div:hover {
+  border-color: #eee #eee #ddd;
+}
+.nav-tabs > .uib-tab.active > div,
+.nav-tabs > .uib-tab.active > div:focus,
+.nav-tabs > .uib-tab.active > div:hover {
+  color: #555;
+  cursor: default;
+  background-color: #fff;
+  border-color: #ddd #ddd transparent #ddd;
+}
+.nav-pills > .uib-tab > div {
+  border-radius: 4px;
+}
+.nav-pills > .uib-tab.active > div,
+.nav-pills > .uib-tab.active > div:focus,
+.nav-pills > .uib-tab.active > div:hover {
+  color: #fff;
+  background-color: #337ab7;
 }