Skip to content

Commit

Permalink
Merge pull request #650 from nikolaswise/master
Browse files Browse the repository at this point in the history
Faux Transarent Buttons
  • Loading branch information
paulcpederson authored Aug 11, 2016
2 parents 0da101e + d7427e8 commit 72c1b99
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## Unreleased

### Fixed
- `filter-dropdown-remove:after` no longer positioned absolutely

### Modified
- `btn-clear` has bg white, rathe than transparent for ACAG on light grays.

## 1.0.0-beta.30

### Removed
Expand Down
10 changes: 2 additions & 8 deletions docs/source/table_of_contents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -372,19 +372,13 @@ components:
modifiers: true
- title: 'Text Inputs'
link: text-inputs
modifiers:
- 'input-error'
- 'input-warning'
- 'input-success'
modifiers: true
- title: 'Input Groups'
link: input-groups
modifiers: true
- title: 'Selects'
link: selects
modifiers:
- input-error
- input-warning
- input-success
modifiers: true
- title: 'Checkboxes'
link: checkboxes
modifiers: true
Expand Down
2 changes: 1 addition & 1 deletion lib/sass/calcite-web/components/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

@mixin btn-clear() {
color: $blue;
background: transparent;
background: $white;
border-color: $blue;
&:hover {
color: $white;
Expand Down
5 changes: 2 additions & 3 deletions lib/sass/calcite-web/patterns/_filter-dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
@include box-sizing(border-box);
position: relative;
display: inline-block;
padding: $baseline/3 $baseline $baseline/3 $baseline/3;
padding: $baseline/3 0 $baseline/3 $baseline/3;
margin-right: $baseline/6;
margin-top: $baseline/6;
color: $darker-gray;
Expand All @@ -140,8 +140,7 @@
@include font-size(-1);
@extend %icon-font-styles;
@extend .icon-ui-close:before;
position: absolute;
right: 0;
margin-left: $baseline/3;
@if ($include-right-to-left) {
html[dir="rtl"] & {
right: auto;
Expand Down

0 comments on commit 72c1b99

Please sign in to comment.