Skip to content

Commit

Permalink
Merge pull request #1315 from digitalfabrik/develop
Browse files Browse the repository at this point in the history
Release 2022.3.6
  • Loading branch information
timobrembeck authored Mar 22, 2022
2 parents 13aec24 + 735275f commit a9cabe8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
UNRELEASED
----------

* [ [#1314](https://github.com/digitalfabrik/integreat-cms/issues/1314) ] Fix layout of media library on small screens


2022.3.5
--------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function EditDirectorySidebar({

{
return (
<div className="2xl:absolute w-full h-full flex flex-col rounded border border-blue-500 bg-white border-solid shadow-2xl">
<div className="absolute w-full h-full flex flex-col rounded border border-blue-500 bg-white border-solid shadow-2xl">
<div class="rounded w-full p-4 bg-water-500 font-bold">
<Sliders class="mr-1 inline-block h-5" />
{mediaTranslations.heading_directory_properties}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default function EditSidebar({
}, [file]);

return (
<div className="2xl:absolute w-full h-full flex flex-col rounded border border-blue-500 shadow-2xl bg-white">
<div className="absolute w-full h-full flex flex-col rounded border border-blue-500 shadow-2xl bg-white">
<div class="rounded w-full p-4 bg-water-500 font-bold">
<div class="flex flex-row justify-between">
<span>
Expand Down
8 changes: 4 additions & 4 deletions integreat_cms/static/src/js/media-management/library.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,10 @@ export default function Library({
)}
</div>
)}
<div className="flex flex-1 flex-col-reverse relative lg:flex-row gap-4 mt-4">
<div className="flex flex-1 relative flex-row gap-4 mt-4">
<div className="relative flex-1">
<div
className="2xl:absolute w-full h-full flex flex-col bg-white border border-blue-500 shadow-2xl rounded"
className="absolute w-full h-full flex flex-col bg-white border border-blue-500 shadow-2xl rounded"
onClick={() => setFileIndex(null)}
>
<div class="rounded w-full bg-water-500 font-bold">
Expand All @@ -277,7 +277,7 @@ export default function Library({
</div>

{fileIndex !== null ? (
<div className="relative w-full lg:w-96 2xl:w-120 ">
<div className="relative w-56 md:w-72 lg:w-96 2xl:w-120">
<EditSidebar
directory={directory}
fileIndexState={[fileIndex, setFileIndex]}
Expand All @@ -295,7 +295,7 @@ export default function Library({
</div>
) : (
directory && (
<div className="relative w-full lg:w-96 2xl:w-120 ">
<div className="relative w-56 md:w-72 lg:w-96 2xl:w-120">
<EditDirectorySidebar
directory={directory}
apiEndpoints={apiEndpoints}
Expand Down

0 comments on commit a9cabe8

Please sign in to comment.