spiderfw 0.6.26.pre1 → 0.6.26

data/apps/core/components/public/bootstrap/scss/_pagination.scss

@@ -4,61 +4,52 @@
 .pagination {
   height: $baseLineHeight * 2;
   margin: $baseLineHeight 0;
-  
-  ul {
-    display: inline-block;
-    @include ie7-inline-block();
-    margin-left: 0;
-    margin-bottom: 0;
-    @include border-radius(3px);
-    @include box-shadow(0 1px 2px rgba(0,0,0,.05));
-  }
-
-  li {
+ }
+.pagination ul {
+  display: inline-block;
+  @include ie7-inline-block();
+  margin-left: 0;
+  margin-bottom: 0;
+  @include border-radius(3px);
+  @include box-shadow(0 1px 2px rgba(0,0,0,.05));
+}
+.pagination li {
     display: inline;
   }
-  
-  a {
-    float: left;
-    padding: 0 14px;
-    line-height: ($baseLineHeight * 2) - 2;
-    text-decoration: none;
-    border: 1px solid #ddd;
-    border-left-width: 0;
-  }
-  
-  a:hover,
-  .active a {
-    background-color: #f5f5f5;
-  }
-  
-  .active a {
-    color: $grayLight;
-    cursor: default;
-  }
-  
-  .disabled a,
-  .disabled a:hover {
-    color: $grayLight;
-    background-color: transparent;
-    cursor: default;
-  }
-  
-  li:first-child a {
-    border-left-width: 1px;
-    @include border-radius(3px 0 0 3px);
-  }
-  
-  li:last-child a {
-    @include border-radius(0 3px 3px 0);
-  }
+.pagination a {
+  float: left;
+  padding: 0 14px;
+  line-height: ($baseLineHeight * 2) - 2;
+  text-decoration: none;
+  border: 1px solid #ddd;
+  border-left-width: 0;
+}
+.pagination a:hover,
+.pagination .active a {
+  background-color: #f5f5f5;
+}
+.pagination .active a {
+  color: $grayLight;
+  cursor: default;
+}
+.pagination .disabled a,
+.pagination .disabled a:hover {
+  color: $grayLight;
+  background-color: transparent;
+  cursor: default;
+}
+.pagination li:first-child a {
+  border-left-width: 1px;
+  @include border-radius(3px 0 0 3px);
+}
+.pagination li:last-child a {
+  @include border-radius(0 3px 3px 0);
 }
 
 // Centered
 .pagination-centered {
   text-align: center;
 }
-
 .pagination-right {
   text-align: right;
 }

data/apps/core/components/public/bootstrap/scss/_reset.scss

@@ -108,7 +108,7 @@ input[type="button"],
 input[type="reset"],
 input[type="submit"] {
   cursor: pointer; // Cursors on all buttons applied consistently
-  -webkit-appearance: button; // Style clicable inputs in iOS
+  -webkit-appearance: button; // Style clickable inputs in iOS
 }
 input[type="search"] { // Appearance in Safari/Chrome
   -webkit-appearance: textfield;

data/apps/core/components/public/bootstrap/scss/_sprites.scss

@@ -9,24 +9,26 @@
 // All icons receive the styles of the <i> tag with a base class 
 // of .i and are then given a unique class to add width, height, 
 // and background-position. Your resulting HTML will look like
-// <i class="i icon-inbox"></i>.
+// <i class="icon-inbox"></i>.
 
 // For the white version of the  icons, just add the .icon-white class:
-// <i class="i icon-inbox icon-white"></i>
+// <i class="icon-inbox icon-white"></i>
 
-[class^="icon-"] {
+[class^="icon-"],
+[class*=" icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
+  line-height: 14px;
   vertical-align: text-top;
-  background-image: url(../img/glyphicons-halflings.png);
+  background-image: url($iconSpritePath);
   background-position: 14px 14px;
   background-repeat: no-repeat;
 
   @include ie7-restore-right-whitespace();
 }
 .icon-white {
-  background-image: url(../img/glyphicons-halflings-white.png);
+  background-image: url($iconWhiteSpritePath);
 }
 
 .icon-glass              { background-position: 0      0; }

data/apps/core/components/public/bootstrap/scss/_tables.scss

@@ -25,14 +25,15 @@ table {
     padding: 8px;
     line-height: $baseLineHeight;
     text-align: left;
+    vertical-align: top;
     border-top: 1px solid #ddd;
   }
   th {
     font-weight: bold;
-    vertical-align: bottom;
   }
-  td {
-    vertical-align: top;
+  // Bottom align for column headings
+  thead th {
+    vertical-align: bottom;
   }
   // Remove top border from thead by default
   thead:first-child tr th,
@@ -113,6 +114,16 @@ table {
 }
 
 
+// HOVER EFFECT
+// ------------
+// Placed here since it has to come after the potential zebra striping
+.table {
+  tbody tr:hover td,
+  tbody tr:hover th {
+    background-color: #f5f5f5;
+  }
+}
+
 
 // TABLE CELL SIZING
 // -----------------

data/apps/core/components/public/bootstrap/scss/_thumbnails.scss

@@ -2,13 +2,13 @@
 // ----------
 
 .thumbnails {
-  margin-left: -20px;
+  margin-left: -$gridGutterWidth;
   list-style: none;
   @include clearfix();
 }
 .thumbnails > li {
   float: left;
-  margin: 0 0 $baseLineHeight 20px;
+  margin: 0 0 $baseLineHeight $gridGutterWidth;
 }
 .thumbnail {
   display: block;

data/apps/core/components/public/bootstrap/scss/_type.scss

@@ -110,7 +110,8 @@ ol {
 li {
   line-height: $baseLineHeight;
 }
-ul.unstyled {
+ul.unstyled,
+ol.unstyled {
   margin-left: 0;
   list-style: none;
 }
@@ -137,7 +138,7 @@ dd {
 hr {
   margin: $baseLineHeight 0;
   border: 0;
-  border-top: 1px solid #e5e5e5;
+  border-top: 1px solid $hrBorder;
   border-bottom: 1px solid $white;
 }
 

data/apps/core/components/public/bootstrap/scss/_variables.scss

@@ -4,13 +4,13 @@
 
 
 
-// LINK COLORS
-// -----------
+// GLOBAL VALUES
+// --------------------------------------------------
 
+// Links
 $linkColor:             #08c !default;
 $linkColorHover:        darken($linkColor, 15) !default;
 
-
 // Grays
 $black:                 #000 !default;
 $grayDarker:            #222 !default;
@@ -18,7 +18,7 @@ $grayDark:              #333 !default;
 $gray:                  #555 !default;
 $grayLight:             #999 !default;
 $grayLighter:           #eee !default;
-$white:                 #ffffff !default;
+$white:                 #fff !default;
 
 // Accent colors
 $blue:                  #049cdb !default;
@@ -54,13 +54,21 @@ $zindexFixedNavbar:     1030 !default;
 $zindexModalBackdrop:   1040 !default;
 $zindexModal:           1050 !default;
 
+// Sprite icons path
+$iconSpritePath:          "../img/glyphicons-halflings.png";
+$iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
+
 // Input placeholder text color
 $placeholderText:       $grayLight !default;
 
+// Hr border color
+$hrBorder:              $grayLighter;
+
 // Navbar
 $navbarHeight:                    40px !default;
 $navbarBackground:                $grayDarker !default;
 $navbarBackgroundHighlight:       $grayDark !default;
+$navbarLinkBackgroundHover:       transparent;
 
 $navbarText:                      $grayLight !default;
 $navbarLinkColor:                 $grayLight !default;