]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9dc04b 84f8018)
Merge branch 'v4-dev' of https://github.com/HMUDesign/bootstrap into HMUDesign-v4-dev
authorMark Otto <markdotto@gmail.com>
Sun, 30 Oct 2016 20:38:44 +0000 (13:38 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 30 Oct 2016 20:38:44 +0000 (13:38 -0700)
1  2 
scss/_images.scss patch | diff1 | diff2 | blob | history
scss/_tables.scss patch | diff1 | diff2 | blob | history
scss/_variables.scss patch | diff1 | diff2 | blob | history
scss/utilities/_background.scss patch | diff1 | diff2 | blob | history

diff --cc scss/_images.scss
Simple merge
diff --cc scss/_tables.scss
index aeedf0b69af0d2d66f58e807c783729fd0084b3a,ff3ea4e572c36614e89ef6b67145c232ec288afe..89b03e4b18a96f3ebdb03e00a1e55ab1898dea00
--- 1/scss/_tables.scss
--- 2/scss/_tables.scss
+++ b/scss/_tables.scss
@@@ -106,50 -121,29 +106,50 @@@
  .thead-inverse {
    th {
      color: #fff;
-     background-color: $gray-dark;
+     background-color: $table-bg-inverse;
    }
  }
 +
  .thead-default {
    th {
-     color: $gray;
-     background-color: $gray-lighter;
+     color: $table-head-color;
+     background-color: $table-head-bg;
    }
  }
  
  .table-inverse {
-   color: $gray-lighter;
-   background-color: $gray-dark;
+   color: $body-bg;
+   background-color: $table-bg-inverse;
  
 -  &.table-bordered {
 -    border: 0;
 -  }
 -
    th,
    td,
    thead th {
-     border-color: $gray;
+     border-color: $body-bg;
    }
 +
 +  &.table-bordered {
 +    border: 0;
 +  }
 +}
 +
 +
 +
 +// Responsive tables
 +//
 +// Wrap your tables in `.table-responsive` and we'll make them mobile friendly
 +// by enabling horizontal scrolling. Only applies <768px. Everything above that
 +// will display normally.
 +
 +.table-responsive {
 +  display: block;
 +  width: 100%;
 +  min-height: 0%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
 +  overflow-x: auto;
 +
 +  // TODO: find out if we need this still.
 +  //
 +  // border: $table-border-width solid $table-border-color;
 +  // -ms-overflow-style: -ms-autohiding-scrollbar; // See https://github.com/twbs/bootstrap/pull/10057
  }
  
  
diff --cc scss/_variables.scss
index 1a68a1fbf1fb84723e77e1f064b523a978011586,cc65867bac7da6d58a9d911899fe49c7166e5138..5f02e78dad68da36a17d16038e4633e953bfde21
--- 1/scss/_variables.scss
--- 2/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -154,11 -99,13 +154,13 @@@ $border-width: 1px !default
  //
  // Settings for the `<body>` element.
  
- $body-bg:    #fff !default;
- $body-color: $gray-dark !default;
+ $body-bg:       #fff !default;
+ $body-color:    $gray-dark !default;
+ $inverse-bg:    $gray-dark !default;
+ $inverse-color: $gray-lighter !default;
  
  
 -// Links
 +// 5. Links
  //
  // Style anchor elements.
  
@@@ -310,10 -246,14 +312,15 @@@ $table-cell-padding:            .75rem 
  $table-sm-cell-padding:         .3rem !default;
  
  $table-bg:                      transparent !default;
 -$table-bg-accent:               #f9f9f9 !default;
 -$table-bg-hover:                #f5f5f5 !default;
+ $table-bg-inverse:              $gray-dark !default;
++
 +$table-bg-accent:               rgba(0,0,0,.05) !default;
 +$table-bg-hover:                rgba(0,0,0,.075) !default;
  $table-bg-active:               $table-bg-hover !default;
  
+ $table-head-bg:                 $gray-lighter !default;
+ $table-head-color:              $gray !default;
+ 
  $table-border-width:            $border-width !default;
  $table-border-color:            $gray-lighter !default;
  
@@@ -839,12 -753,13 +846,13 @@@ $thumbnail-border-radius:     $border-r
  $thumbnail-box-shadow:        0 1px 2px rgba(0,0,0,.075) !default;
  
  
 -// Figures
 +// 30. Figures
  
  $figure-caption-font-size: 90% !default;
+ $figure-caption-color:     $gray-light !default;
  
  
 -// Breadcrumbs
 +// 31. Breadcrumbs
  
  $breadcrumb-padding-y:          .75rem !default;
  $breadcrumb-padding-x:          1rem !default;
diff --cc scss/utilities/_background.scss
index a81dcff2cae7e96ac1b43a1b2610de4f30f9f24e,000f3ab2245261835ad45d68cdf3f57e1d724d8e..b9ac295231cfa4cffb6a8ce7d30cce429c829c69
--- 1/scss/utilities/_background.scss
--- 2/scss/utilities/_background.scss
+++ b/scss/utilities/_background.scss
@@@ -2,8 -2,15 +2,8 @@@
  // Contextual backgrounds
  //
  
 -// Inverse
 -// TODO: redo this as a proper class
 -.bg-inverse {
 -  color: $inverse-color;
 -  background-color: $inverse-bg;
 -}
 -
  .bg-faded {
-   background-color: $gray-lightest;
+   background-color: darken($body-bg, 3%);
  }
  
  @include bg-variant('.bg-primary', $brand-primary);
Mirror of https://github.com/twbs/bootstrap.git