Update to bootstrap 3.0.0rc1.

geonetwork · Aug 8, 2013 · 3e6b85e · 3e6b85e
1 parent 2f92747
commit 3e6b85e
Show file tree

Hide file tree

Showing 29 changed files with 723 additions and 529 deletions.
diff --git a/web-ui/src/main/resources/catalog/lib/bootstrap-3.0.0.js b/web-ui/src/main/resources/catalog/lib/bootstrap-3.0.0.js
diff --git a/web-ui/src/main/resources/catalog/lib/bootstrap-3.0.0.min.js b/web-ui/src/main/resources/catalog/lib/bootstrap-3.0.0.min.js
diff --git a/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/accordion.less b/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/accordion.less
@@ -11,7 +11,7 @@
 // Group == heading + body
 .accordion-group {
   margin-bottom: 2px;
-  border: 1px solid #e5e5e5;
+  border: 1px solid @accordion-border-color;
   border-radius: @border-radius-base;
 }
 .accordion-heading {
@@ -27,5 +27,5 @@
 // Inner needs the styles because you can't animate properly with any styles on the element
 .accordion-inner {
   padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
+  border-top: 1px solid @accordion-border-color;
 }
diff --git a/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/badges.less b/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/badges.less
@@ -10,12 +10,12 @@
   padding: 3px 7px;
   font-size: @font-size-small;
   font-weight: bold;
-  color: #fff;
+  color: @badge-color;
   line-height: 1;
   vertical-align: middle;
   white-space: nowrap;
   text-align: center;
-  background-color: @gray-light;
+  background-color: @badge-bg;
   border-radius: 10px;
 
   // Empty labels/badges collapse
@@ -28,7 +28,7 @@
 a.badge {
   &:hover,
   &:focus {
-    color: #fff;
+    color: @badge-link-hover-color;
     text-decoration: none;
     cursor: pointer;
   }
@@ -43,8 +43,8 @@ a.badge {
 // Account for counters in navs
 a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
-  color: @link-color;
-  background-color: #fff;
+  color: @badge-active-color;
+  background-color: @badge-active-bg;
 }
 .nav-pills > li > a > .badge {
   margin-left: 3px;

diff --git a/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/breadcrumbs.less b/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/breadcrumbs.less
@@ -5,21 +5,19 @@
 
 .breadcrumb {
   padding: 8px 15px;
-  margin: 0 0 @line-height-computed;
+  margin-bottom: @line-height-computed;
   list-style: none;
-  background-color: #f5f5f5;
+  background-color: @breadcrumb-bg;
   border-radius: @border-radius-base;
   > li {
     display: inline-block;
-    text-shadow: 0 1px 0 #fff;
     &+li:before {
-      display: inline-block;
       content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
       padding: 0 5px;
-      color: #ccc;
+      color: @breadcrumb-color;
     }
   }
   > .active {
-    color: @gray-light;
+    color: @breadcrumb-active-color;
   }
 }
diff --git a/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/button-groups.less b/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/button-groups.less
@@ -40,11 +40,12 @@
     float: left;
   }
   // Space out series of button groups
-  > .btn + .btn,
-  > .btn-group + .btn,
-  > .btn + .btn-group,
-  > .btn-group + .btn-group {
-    margin-left: 5px;
+  > .btn,
+  > .btn-group {
+    + .btn,
+    + .btn-group {
+      margin-left: 5px;
+    }
   }
 }
 
@@ -164,7 +165,7 @@
 
 
 // Checkbox and radio options
-.btn-group[data-toggle="buttons-radio"] > .btn > input[type="radio"],
-.btn-group[data-toggle="buttons-checkbox"] > .btn > input[type="checkbox"] {
+.btn-group[data-toggle="buttons"] > .btn > input[type="radio"],
+.btn-group[data-toggle="buttons"] > .btn > input[type="checkbox"] {
   display: none;
 }
diff --git a/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/buttons.less b/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/buttons.less
@@ -27,14 +27,13 @@
 
   &:hover,
   &:focus {
-    color: #fff;
+    color: @btn-hover-color;
     text-decoration: none;
   }
 
   &:active,
   &.active {
     outline: 0;
-    background-image: none;
     .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
   }
 
@@ -92,7 +91,6 @@
   &[disabled],
   fieldset[disabled] & {
     background-color: transparent;
-    background-image: none;
     .box-shadow(none);
   }
   &,

diff --git a/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/carousel.less b/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/carousel.less
@@ -72,9 +72,9 @@
   width: 15%;
   .opacity(.5);
   font-size: 20px;
-  color: #fff;
+  color: @carousel-control-color;
   text-align: center;
-  text-shadow: 0 1px 2px rgba(0,0,0,.6);
+  text-shadow: @carousel-text-shadow;
   // We can't have this transition here because webkit cancels the carousel
   // animation if you trip this while in the middle of another animation.
 
@@ -93,7 +93,7 @@
   // Hover/focus state
   &:hover,
   &:focus {
-    color: #fff;
+    color: @carousel-control-color;
     text-decoration: none;
     .opacity(.9);
   }
@@ -111,16 +111,17 @@
     height: 20px;
     margin-top: -10px;
     margin-left: -10px;
+    font-family: serif;
   }
   // Non-glyphicon toggles
   .icon-prev {
     &:before {
-      content: '\2039';
+      content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
     }
   }
   .icon-next {
     &:before {
-      content: '\203a';
+      content: '\203a';// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)
     }
   }
 }
@@ -129,11 +130,11 @@
 // -----------------------------
 .carousel-indicators {
   position: absolute;
-  bottom: 20px;
+  bottom: 10px;
   left: 50%;
   z-index: 15;
-  width: 100px;
-  margin-left: -50px;
+  width: 120px;
+  margin-left: -60px;
   padding-left: 0;
   list-style: none;
   text-align: center;
@@ -144,15 +145,15 @@
     height: 10px;
     margin: 1px;
     text-indent: -999px;
-    border: 1px solid #fff;
+    border: 1px solid @carousel-indicator-border-color;
     border-radius: 10px;
     cursor: pointer;
   }
   .active {
     margin: 0;
     width:  12px;
     height: 12px;
-    background-color: #fff;
+    background-color: @carousel-indicator-active-bg;
   }
 }
 
@@ -167,9 +168,9 @@
   z-index: 10;
   padding-top: 20px;
   padding-bottom: 20px;
-  color: #fff;
+  color: @carousel-caption-color;
   text-align: center;
-  text-shadow: 0 1px 2px rgba(0,0,0,.6);
+  text-shadow: @carousel-text-shadow;
   & .btn {
     text-shadow: none; // No shadow for button elements in carousel-caption
   }
@@ -196,4 +197,9 @@
     right: 20%;
     padding-bottom: 30px;
   }
+
+  // Move up the indicators
+  .carousel-indicators {
+    bottom: 20px;
+  }
 }
diff --git a/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/close.less b/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/close.less
@@ -8,13 +8,13 @@
   font-size: (@font-size-base * 1.5);
   font-weight: bold;
   line-height: 1;
-  color: #000;
-  text-shadow: 0 1px 0 rgba(255,255,255,1);
+  color: @close-color;
+  text-shadow: @close-text-shadow;
   .opacity(.2);
 
   &:hover,
   &:focus {
-    color: #000;
+    color: @close-color;
     text-decoration: none;
     cursor: pointer;
     .opacity(.5);

diff --git a/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/code.less b/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/code.less
@@ -13,8 +13,8 @@ pre {
 code {
   padding: 2px 4px;
   font-size: 90%;
-  color: #c7254e;
-  background-color: #f9f2f4;
+  color: @code-color;
+  background-color: @code-bg;
   white-space: nowrap;
   border-radius: 4px;
 }
@@ -29,9 +29,8 @@ pre {
   word-break: break-all;
   word-wrap: break-word;
   color: @gray-dark;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc; // IE8 fallback
-  border: 1px solid rgba(0,0,0,.15);
+  background-color: @pre-bg;
+  border: 1px solid @pre-border-color;
   border-radius: @border-radius-base;
 
   // Make prettyprint styles more spaced out for readability

diff --git a/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/component-animations.less b/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/component-animations.less
@@ -2,6 +2,10 @@
 // Component animations
 // --------------------------------------------------
 
+// Heads up!
+//
+// We don't use the `.opacity()` mixin here since it causes a bug with text
+// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552.
 
 .fade {
   opacity: 0;
@@ -12,12 +16,14 @@
 }
 
 .collapse {
+  display: none;
+  &.in {
+    display: block;
+  }
+}
+.collapsing {
   position: relative;
   height: 0;
   overflow: hidden;
   .transition(height .35s ease);
-
-  &.in {
-    height: auto;
-  }
 }
diff --git a/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/dropdowns.less b/web-ui/src/main/resources/catalog/style/bootstrap-3.0.0/dropdowns.less
@@ -11,7 +11,7 @@
   height: 0;
   margin-left: 2px;
   vertical-align: middle;
-  border-top:   4px solid #000;
+  border-top:   4px solid @dropdown-caret-color;
   border-right: 4px solid transparent;
   border-left:  4px solid transparent;
   content: "";
@@ -31,7 +31,7 @@
   margin: 2px 0 0; // override default ul
   list-style: none;
   background-color: @dropdown-bg;
-  border: 1px solid #ccc; // IE8 fallback
+  border: 1px solid @dropdown-fallback-border; // IE8 fallback
   border: 1px solid @dropdown-border;
   border-radius: @border-radius-base;
   .box-shadow(0 6px 12px rgba(0,0,0,.175));
@@ -45,7 +45,7 @@
 
   // Dividers (basically an hr) within the dropdown
   .divider {
-    .nav-divider(@dropdown-divider-top, @dropdown-divider-bottom);
+    .nav-divider(@dropdown-divider-bg);
   }
 
   // Links within the dropdown menu
@@ -102,7 +102,7 @@
     background-color: transparent;
     background-image: none; // Remove CSS gradient
     .reset-filter();
-    cursor: default;
+    cursor: not-allowed;
   }
 }
 
@@ -159,7 +159,7 @@
   // Reverse the caret
   .caret {
     border-top: 0;
-    border-bottom: 4px solid #000;
+    border-bottom: 4px solid @dropdown-caret-color;
     content: "";
   }
   // Different positioning for bottom up menu