Skip to content

Commit

Permalink
feat: Atualizado radius
Browse files Browse the repository at this point in the history
  • Loading branch information
Lucas Vergara committed Sep 10, 2024
1 parent c3883b0 commit 0fc5647
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 19 deletions.
13 changes: 13 additions & 0 deletions src/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,17 @@ $text-timeline: map-get($colors-gray, "dark-30");
$icon-danger-timeline: map-get($colors-red, "base");
$icon-warning-timeline: map-get($colors-yellow, "base");

$sizes: (
"xs": 2px,
"sm": 4px,
"base": 6px,
"lg": 8px,
"xl": 10px,
"xxl": 14px
);

$border-radius: map-get($sizes, "base");
$border-radius-sm: map-get($sizes, "sm");
$border-radius-lg: map-get($sizes, "lg");

// stylelint-enable
2 changes: 1 addition & 1 deletion src/components/alert/alert.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ $rootIcon: ".alert-icon";
$rootDismissible: ".alert-dismissible";

#{$root} {
border-radius: 2px;
border-radius: $border-radius-sm;
position: relative;

@each $name, $value in $alert-states {
Expand Down
10 changes: 5 additions & 5 deletions src/components/button/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ button:focus {
}

.btn {
border-radius: 2px;
font-family: $base-font;
text-transform: uppercase;
display: inline-flex;
align-items: center;
justify-content: center;
align-items: center;
font-family: $base-font;
text-transform: uppercase;
border-radius: $border-radius-sm;
> .material-icons {
vertical-align: middle;
}
Expand Down Expand Up @@ -266,7 +266,7 @@ button.btn-link:disabled {
font-style: normal;
font-weight: 400;
margin-right: 5px;
margin-top: -3px;
margin-top: -1px;
padding-right: 0;
vertical-align: middle;
}
Expand Down
4 changes: 4 additions & 0 deletions src/components/card/card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
@import '../../config';

.card {

border-radius: $border-radius-lg;
overflow: hidden;

&.bg-secondary {
background-color: palette('gray', 'light-30') !important;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/container/container.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $root: '.container';
.container {
&#{$root}-page {
background: palette('white');
border-radius: 2px;
border-radius: $border-radius-sm;
box-sizing: border-box;
min-height: 500px;
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion src/components/dropdown/dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $dropdown-color: map-get($colors-gray, "dark-20");

.dropdown-menu {
border-color: palette("gray", "light-10");
border-radius: 2px;
border-radius: $border-radius-sm;
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16);
.dropdown-header {
color: palette("gray", "dark-20");
Expand Down
4 changes: 2 additions & 2 deletions src/components/form/form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $input-addon-hover: map-get($colors-gray, "light-20");

.form-control {
border: 1px solid palette("gray");
border-radius: 2px;
border-radius: $border-radius-sm;
box-shadow: none;
color: palette("gray", "dark-30");
transition: none;
Expand Down Expand Up @@ -83,7 +83,7 @@ input[disabled] {
.input-group-addon {
background-color: palette("gray", "light-20");
border-color: palette("gray");
border-radius: 2px;
border-radius: $border-radius-sm;
color: palette("gray", "dark-20");
+ input[disabled] {
border-left: 1px solid palette("gray");
Expand Down
4 changes: 4 additions & 0 deletions src/components/modal/modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
border-color: palette("gray", "light-30");
}

.modal-content {
border-radius: $border-radius-lg;
}


/* ajuste do tamanho da modal xxl para monitores menores */

Expand Down
14 changes: 7 additions & 7 deletions src/components/nav/nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ nav.nav {
margin-bottom: -1px;
.nav-link {
border-bottom: 1px solid palette("gray", "light-10");
border-radius: 2px 2px 0 0;
border-radius: $border-radius-sm $border-radius-sm 0 0;
&.active {
border-bottom: 0;
border-left: 1px solid palette("gray", "light-10");
Expand Down Expand Up @@ -446,22 +446,22 @@ nav.nav {
&.active {
font-weight: normal;
&::after {
background-color: #3475c1;
border-color: #3475c1;
background-color: palette("blue", "base");
border-color: palette("blue", "base");
color: #fff;
}
}

&.checked:not(.active) {
color: #3475c1;
color: palette("blue", "base");
&::after {
content: "\F012C";
font-family: "Material Design Icons";
border-color: #3475c1;
color: #3475c1;
border-color: palette("blue", "base");
color: palette("blue", "base");
}
&::before {
border-color: #3475c1;
border-color: palette("blue", "base");
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/pagination/pagination.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
> .page-item {
margin-left: 4px;
.page-link {
border-radius: 2px;
border-radius: $border-radius-sm;
background-color: #fff;
border-color: silver;
color: #222;
Expand Down Expand Up @@ -44,7 +44,7 @@
&:first-child {
margin-left: 0;
.page-link {
border-radius: 2px;
border-radius: $border-radius-sm;
}
}

Expand Down

0 comments on commit 0fc5647

Please sign in to comment.