Skip to content

Commit

Permalink
Merge pull request #677 from danskernesdigitalebibliotek/develop
Browse files Browse the repository at this point in the history
Release 2024.27.0
  • Loading branch information
kasperg authored Jul 2, 2024
2 parents 44a8805 + a2d69f6 commit 50a60f2
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 61 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,20 @@
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.34.2",
"eslint-plugin-react": "^7.34.3",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-webpack-plugin": "^4.2.0",
"flatpickr": "^4.6.13",
"json": "^11.0.0",
"markdownlint-cli2": "^0.4.0",
"postcss": "^8.4.38",
"postcss": "^8.4.39",
"prettier": "^2.7.1",
"react": "^17.0.2",
"react-docgen-typescript": "^2.1.0",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
"react-scripts": "^4.0.3",
"sass": "^1.77.5",
"sass": "^1.77.6",
"skeleton-screen-css": "^1.1.0",
"storybook-addon-designs": "^6.2.1",
"stylelint": "^14.16.1",
Expand All @@ -92,7 +92,7 @@
"stylelint-prettier": "^3.0.0",
"stylelint-scss": "^5.3.2",
"typescript": "^4.7.4",
"web-vitals": "^4.1.1"
"web-vitals": "^4.2.1"
},
"publishConfig": {
"registry": "https://npm.pkg.github.com"
Expand Down
59 changes: 42 additions & 17 deletions src/stories/Library/warning-status/warning-status.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,57 @@
display: flex;
align-items: center;
justify-content: space-between;
flex-direction: column;
padding: $s-md;

@include media-query__small {
flex-direction: row;
padding: $s-md $s-xl;
}
}

.warning-bar__icon {
margin-right: $s-md;
min-width: 40px;
}
&__icon {
margin-right: $s-md;
min-width: 40px;
}

.warning-bar__left {
display: flex;
align-items: center;
}
&__left {
display: flex;
align-items: center;
width: 100%;
justify-content: flex-start;

.warning-bar__right {
display: flex;
align-items: center;
}
@include media-query__small {
width: auto;
}
}

.warning-bar__owes {
margin-right: $s-sm;
&__right {
display: flex;
flex-direction: column;
align-items: center;
width: 100%;
margin-top: $s-md;

@include media-query__small {
margin-right: $s-lg;
&:empty {
margin-top: 0;
}

@include media-query__small {
flex-direction: row;
justify-content: flex-start;
align-items: center;
width: auto;
margin-top: 0;
}
}

&__owes {
margin-right: $s-sm;
margin-bottom: $s-sm;

@include media-query__small {
margin-right: $s-lg;
margin-bottom: 0;
}
}
}
23 changes: 13 additions & 10 deletions src/styles/scss/tools/variables.colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,17 @@ $color__signal-alert: #d22d43;
);

// Global colors
--c-global-primary: $color__global-primary;
--c-global-secondary: $color__global-secondary;
--c-global-tertiary-1: $color__global-tertiary-1;
--c-global-tertiary-2: $color__global-tertiary-2;
--c-text-primary-white: $color__text-primary-white;
--c-text-primary-black: $color__text-primary-black;
--c-text-secondary-gray: $color__text-secondary-gray;
--c-signal-success: $color__signal-success;
--c-signal-aware: $color__signal-aware;
--c-signal-alert: $color__signal-alert;
--c-global-primary: #{$color__global-primary};
--c-global-secondary: #{$color__global-secondary};
--c-global-tertiary-1: #{$color__global-tertiary-1};
--c-global-tertiary-2: #{$color__global-tertiary-2};
--c-text-primary-white: #{$color__text-primary-white};
--c-text-primary-black: #{$color__text-primary-black};
--c-text-secondary-gray: #{$color__text-secondary-gray};
--c-signal-success: #{$color__signal-success};
--c-signal-aware: #{$color__signal-aware};
--c-signal-alert: #{$color__signal-alert};

// Fonts
--font-body: #{$font__body};
}
60 changes: 30 additions & 30 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4252,15 +4252,15 @@ array.prototype.toreversed@^1.1.2:
es-abstract "^1.22.1"
es-shim-unscopables "^1.0.0"

array.prototype.tosorted@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz#c8c89348337e51b8a3c48a9227f9ce93ceedcba8"
integrity sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==
array.prototype.tosorted@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"
integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==
dependencies:
call-bind "^1.0.5"
call-bind "^1.0.7"
define-properties "^1.2.1"
es-abstract "^1.22.3"
es-errors "^1.1.0"
es-abstract "^1.23.3"
es-errors "^1.3.0"
es-shim-unscopables "^1.0.2"

arraybuffer.prototype.slice@^1.0.2:
Expand Down Expand Up @@ -6985,7 +6985,7 @@ es-define-property@^1.0.0:
dependencies:
get-intrinsic "^1.2.4"

es-errors@^1.1.0, es-errors@^1.2.1, es-errors@^1.3.0:
es-errors@^1.2.1, es-errors@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
Expand Down Expand Up @@ -7303,16 +7303,16 @@ eslint-plugin-react-hooks@^4.2.0, eslint-plugin-react-hooks@^4.6.2:
resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596"
integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==

eslint-plugin-react@^7.21.5, eslint-plugin-react@^7.34.2:
version "7.34.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.34.2.tgz#2780a1a35a51aca379d86d29b9a72adc6bfe6b66"
integrity sha512-2HCmrU+/JNigDN6tg55cRDKCQWicYAPB38JGSFDQt95jDm8rrvSUo7YPkOIm5l6ts1j1zCvysNcasvfTMQzUOw==
eslint-plugin-react@^7.21.5, eslint-plugin-react@^7.34.3:
version "7.34.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz#9965f27bd1250a787b5d4cfcc765e5a5d58dcb7b"
integrity sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==
dependencies:
array-includes "^3.1.8"
array.prototype.findlast "^1.2.5"
array.prototype.flatmap "^1.3.2"
array.prototype.toreversed "^1.1.2"
array.prototype.tosorted "^1.1.3"
array.prototype.tosorted "^1.1.4"
doctrine "^2.1.0"
es-iterator-helpers "^1.0.19"
estraverse "^5.3.0"
Expand Down Expand Up @@ -12316,10 +12316,10 @@ picocolors@^0.2.1:
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==

picocolors@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
picocolors@^1.0.0, picocolors@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==

picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1:
version "2.3.1"
Expand Down Expand Up @@ -13126,13 +13126,13 @@ postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, po
picocolors "^0.2.1"
source-map "^0.6.1"

postcss@^8.1.0, postcss@^8.4.19, postcss@^8.4.38:
version "8.4.38"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
postcss@^8.1.0, postcss@^8.4.19, postcss@^8.4.39:
version "8.4.39"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.39.tgz#aa3c94998b61d3a9c259efa51db4b392e1bde0e3"
integrity sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==
dependencies:
nanoid "^3.3.7"
picocolors "^1.0.0"
picocolors "^1.0.1"
source-map-js "^1.2.0"

prelude-ls@^1.2.1:
Expand Down Expand Up @@ -14377,10 +14377,10 @@ sass-loader@^10.0.5:
schema-utils "^3.0.0"
semver "^7.3.2"

sass@^1.77.5:
version "1.77.5"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.5.tgz#5f9009820297521356e962c0bed13ee36710edfe"
integrity sha512-oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg==
sass@^1.77.6:
version "1.77.6"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.6.tgz#898845c1348078c2e6d1b64f9ee06b3f8bd489e4"
integrity sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
Expand Down Expand Up @@ -16492,10 +16492,10 @@ web-namespaces@^1.0.0:
resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec"
integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==

web-vitals@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-4.1.1.tgz#6619bd9c41b299c897a42a89c352c5a92fac91d8"
integrity sha512-wW3cdBZ56Rc5Az8p1Pw6g1zHU7X8HPLigQjD5Z0ef3EG9SPo4iO7RxsiU87aH3xaaEw0if6Ven2s+zlNGiXYqw==
web-vitals@^4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-4.2.1.tgz#67eec387ddd0ef4c25574a01ab9dae723eee2b97"
integrity sha512-U6bAxeudnhDqcXNl50JC4hLlqox9DZnngxfISZm3DMZnonW35xtJOVUc091L+DOY+6hVZVpKXoiCP0RiT6339Q==

webidl-conversions@^3.0.0:
version "3.0.1"
Expand Down

0 comments on commit 50a60f2

Please sign in to comment.