Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@XanxusX
XanxusX committed Mar 30, 2022
2 parents 22a0cf0 + 4fcd9fb commit 278e708
Show file tree
Hide file tree
Showing 16 changed files with 1,119 additions and 858 deletions.
1,042 changes: 422 additions & 620 deletions dist/css/pdis-design-system.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/pdis-design-system.css.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/pdis-design-system.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/pdis-design-system.min.css.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"docs-vnu": "node build/vnu-jar.js",
"docs-lint": "npm-run-all --aggregate-output --parallel docs-vnu docs-linkinator docs-spellcheck",
"docs-serve": "hugo server --port 9001 --disableFastRender",
"docs-serve-with-cssCompile": "npm-run-all css-compile docs-serve",
"docs-serve-with-css": "npm-run-all css docs-serve",
"docs-serve-only": "npx sirv-cli _site --port 9001",
"lockfile-lint": "lockfile-lint --allowed-hosts npm --allowed-schemes https: --empty-hostname false --type npm --path package-lock.json",
"update-deps": "ncu -u -x eslint,eslint-plugin-unicorn,globby,karma-browserstack-launcher && npm update && echo Manually update site/assets/js/vendor",
Expand Down
37 changes: 33 additions & 4 deletions scss/_badge.scss
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,44 @@
.badge {
margin: 0 0.25rem;
padding: 0.5rem;
color: var(--bs-on-background);
background-color: var(--brand-base);
@extend .label-text;
margin: 0 0.5rem;
padding: 0.125rem 0.625rem;
color: var(--on-brand-flat);
background-color: var(--brand-flat);

&:first-child {
margin-left: 0;
}
&:last-child {
margin-right: 0;
}

&.badge-numerical {
padding: 0 0.5rem;
border-radius: 0.5rem;
}

&.bg-secondary-flat {
color: var(--on-surface);
background-color: var(--surface) !important;
}
}

.badge-sm {
@extend .label-text-sm;

&.badge-numerical {
padding: 0 0.375rem;
border-radius: 0.375rem;
}
}

.badge-lg {
@extend .label-text-lg;

&.badge-numerical {
padding: 0 0.625rem;
border-radius: 0.625rem;
}
}

.badge-collections {
Expand Down
114 changes: 105 additions & 9 deletions scss/_button.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,95 @@
.btn {
.button-text {
@extend .label-text;
// border-radius: 10px;
// padding: 8px 18px;

&:hover {
color: var(--on-background);
background-color: var(--surface);
}

&:focus, &:active {
color: var(--on-background);
background-color: var(--surface-1);
box-shadow: 0 0 0 2px var(--brand-flat-strong);
}

i {
margin-left: 0.25rem;
margin-right: 0.25rem;
font-size: 1.125rem;
font-weight: 500;

&:first-child {
margin-left: 0;
}

&:last-child {
margin-right: 0;
}
}
}

.button-text-sm {
@extend .label-text-sm;

&:hover {
color: var(--on-background);
background-color: var(--surface);
}

&:focus, &:active {
color: var(--on-background);
background-color: var(--surface-1);
box-shadow: 0 0 0 2px var(--brand-flat-strong);
}

i {
margin-left: 0.25rem;
margin-right: 0.25rem;
font-size: 1rem;
font-weight: 500;

&:first-child {
margin-left: 0;
}

&:last-child {
margin-right: 0;
}
}
}

.button-text-lg {
@extend .label-text-lg;

&:hover {
color: var(--on-background);
background-color: var(--surface);
}

&:focus, &:active {
color: var(--on-background);
background-color: var(--surface-1);
box-shadow: 0 0 0 2px var(--brand-flat-strong);
}

i {
margin-left: 0.25rem;
margin-right: 0.25rem;
font-size: 1.25rem;
font-weight: 500;

&:first-child {
margin-left: 0;
}

&:last-child {
margin-right: 0;
}
}
}

.btn {
@extend .button-text;

@each $key, $value in $color-envs {
&.btn-#{$key} {
Expand Down Expand Up @@ -155,15 +243,23 @@
}

&.btn-sm {
@extend .label-text-sm;
// padding: 8px 16px;
// border-radius: 8px;
@extend .button-text-sm;
}

&.btn-lg {
@extend .label-text-lg;
// padding: 8px 20px;
// border-radius: 12px;
@extend .button-text-lg;
}

.badge {
top: 0;
margin: 0 0.25rem;

&:first-child {
margin-left: 0;
}
&:last-child {
margin-right: 0;
}
}
}

Expand Down
85 changes: 67 additions & 18 deletions scss/_card.scss
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,93 @@
.card {
background: var(--surface);
border: 1px solid var(--outline);

.card-header {
color: var(--on-surface);
background-color: var(--surface-variant);
font-weight: 500;
padding: 1rem 1.5rem 1rem 1.5rem;
}
border-radius: 0.5rem;

.card-body {
padding: 1rem 1.5rem 1.5rem 1.5rem;
padding: 1rem;

.card-title {
@extend .title-text;
color: var(--on-surface);
margin-bottom: 1rem;
font-weight: 500;
margin-bottom: 0;
}

.card-text {
@extend .body-text;
color: var(--on-surface-variant);
//margin-bottom: 1rem;
}

}

.card-actions {
padding: 1rem
}

.card-img-top {
border-top-right-radius: 0.5rem;
border-top-left-radius: 0.5rem;
}

img {
aspect-ratio: 4 / 3;
}

.card-image {
width: 100%;
background-size: cover !important;
background-position: center !important;
height: 100%;
aspect-ratio: 2/3;

@media (max-width: 768px) {
aspect-ratio: 1/1;
}
}

&.elevated {
background: var(--surface);

.card-actions {
background: var(--surface);
}
}
}

.text-card {
.masonry-card {
.card-header {
@extend .title-text;
color: var(--on-surface);
background-color: var(--surface-2);
padding: 1rem;
border-top-right-radius: 0.5rem;
border-top-left-radius: 0.5rem;
}

.card-body {
padding: 1.5rem;
background-color: var(--surface);

.card-title {
font-weight: 900;
@extend .heading-text;
margin-bottom: 1rem;
}

.card-text {
ul, ol {
margin-bottom: 0;
}
}
}

.card-actions {
background: var(--surface);
}

.list-group {
&:last-child {
border-bottom-left-radius: 0.5rem;
border-bottom-right-radius: 0.5rem;
}
}
}
/*
.list-card {
.card-body {
background-color: var(--surface-1);
Expand Down Expand Up @@ -83,4 +132,4 @@
}
}
}
}
} */
8 changes: 0 additions & 8 deletions scss/_general.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,6 @@ a {
}
}

.image {
width: 100%;
padding-bottom: 75%;
background-size: cover !important;
background-position: center !important;
height: 100%;
}

.icon {
margin-right: 0.5rem;
}
Expand Down
Loading

0 comments on commit 278e708

Please sign in to comment.