Skip to content

Commit

Permalink
Merge pull request thomaspark#446 from Panman8201/gh-pages
Browse files Browse the repository at this point in the history
paper: fade effect for table-hover
  • Loading branch information
thomaspark committed Apr 29, 2015
2 parents 044953d + d642b40 commit d8ccdc2
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 7 deletions.
14 changes: 11 additions & 3 deletions paper/_bootswatch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,14 @@ a {

// Tables =====================================================================

.table-hover {
> tbody > tr:hover,
> tbody > tr:hover > th,
> tbody > tr:hover > td {
@include transition(all 0.2s);
}
}

// Forms ======================================================================

label {
Expand Down Expand Up @@ -488,18 +496,18 @@ input[type="checkbox"],
background-color: lighten($progress-bar-bg, 35%);
}
}

&-success:last-child.progress-bar:before {
background-color: lighten($brand-success, 35%);
}

&-info:last-child.progress-bar:before {
background-color: lighten($brand-info, 45%);
}
&-warning:last-child.progress-bar:before {
background-color: lighten($brand-warning, 35%);
}

&-danger:last-child.progress-bar:before {
background-color: lighten($brand-danger, 25%);
}
Expand Down
7 changes: 7 additions & 0 deletions paper/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -6785,6 +6785,13 @@ a {
-o-transition: all 0.2s;
transition: all 0.2s;
}
.table-hover > tbody > tr:hover,
.table-hover > tbody > tr:hover > th,
.table-hover > tbody > tr:hover > td {
-webkit-transition: all 0.2s;
-o-transition: all 0.2s;
transition: all 0.2s;
}
label {
font-weight: normal;
}
Expand Down
2 changes: 1 addition & 1 deletion paper/bootstrap.min.css

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions paper/bootswatch.less
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,14 @@ a {

// Tables =====================================================================

.table-hover {
> tbody > tr:hover,
> tbody > tr:hover > th,
> tbody > tr:hover > td {
.transition(all 0.2s);
}
}

// Forms ======================================================================

label {
Expand Down Expand Up @@ -488,18 +496,18 @@ input[type="checkbox"],
background-color: lighten(@progress-bar-bg, 35%);
}
}

&-success:last-child.progress-bar:before {
background-color: lighten(@brand-success, 35%);
}

&-info:last-child.progress-bar:before {
background-color: lighten(@brand-info, 45%);
}
&-warning:last-child.progress-bar:before {
background-color: lighten(@brand-warning, 35%);
}

&-danger:last-child.progress-bar:before {
background-color: lighten(@brand-danger, 25%);
}
Expand Down

0 comments on commit d8ccdc2

Please sign in to comment.