Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
jqhph committed Mar 5, 2021
1 parent 8188788 commit dfff97f
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 11 deletions.
10 changes: 10 additions & 0 deletions resources/assets/dcat/sass/components/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,16 @@ a.btn-sm, .btn-group-sm > a.btn {
color: #444!important;
}

.btn-secondary {
border-color: darken($border-color, 2.2%)!important;
background-color: lighten(#eee, 2.5%)!important;
color: $font-color!important;
box-shadow: none;
}
.btn-secondary:hover, .btn-secondary:focus {
box-shadow: $btn-shadow-hover!important;
}

.btn-no-shadow {
box-shadow: none;
}
Expand Down
6 changes: 3 additions & 3 deletions resources/assets/dcat/sass/mixins/_scrollbar.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

@mixin scrollbar($selector) {
#{$selector}::-webkit-scrollbar {
width: 12px;
height: 12px;
width: 10px;
height: 10px;
}
#{$selector}::-webkit-scrollbar-track {
background-color: #eee;
}
#{$selector}::-webkit-scrollbar-thumb {
background-color: darken(#ddd, 8%);
background-color: darken(#ddd, 7.5%);
border-radius: .4rem;
}
}
2 changes: 1 addition & 1 deletion resources/dist/adminlte/adminlte-blue-light.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/dist/adminlte/adminlte-blue.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/dist/adminlte/adminlte-green.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/dist/dcat/css/dcat-app-blue-light.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/dist/dcat/css/dcat-app-blue.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/dist/dcat/css/dcat-app-green.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/dist/dcat/css/dcat-app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Widgets/Widget.php
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ public function __call($method, $parameters)
if ($method === 'style' || $method === 'class') {
$value = $parameters[0] ?? null;
$append = $parameters[1] ?? ($method === 'class' ? false : true);

if (is_array($value)) {
$value = implode(' ', $value);
}
Expand Down

0 comments on commit dfff97f

Please sign in to comment.