Commit 7d664626 authored by Øyvind Julsrud's avatar Øyvind Julsrud Committed by Oyvind
Browse files

DEICH-5940: deichman.no: MR fix

parent 15eca773
......@@ -26,25 +26,33 @@
}
.loan-order-box {
.loan-order-box__header {
margin-top: var(--spacing-4);
}
.loan-order-box__button {
margin-top: var(--spacing-4);
}
.loan-order-box__button-mobile {
.loan-order-box__text {
margin-top: var(--spacing-4);
}
}
}
@media (max-width: 600px) {
.loan-order-box__button-desktop {
display: none;
}
}
.loan-order-box {
.loan-order-box__header {
order: 1;
}
@media (min-width: 601px) {
.loan-order-box__button-mobile {
display: none;
.loan-order-box__button {
order: 3;
}
.loan-order-box__text {
order: 2;
}
}
}
......
import { Block, Button, Container, Flex, Loader } from "@digibib/deichman-ui";
import React, { Fragment } from "react";
import { parse } from "date-fns";
import PropTypes from "prop-types";
import React, { Fragment } from "react";
import { loggedInPages } from "../../constants/navItems";
import { withAuthSync } from "../../utilities/auth";
import { connect } from "react-redux";
import FullScreen from "../../components/FullScreen";
import Head from "../../components/Head";
import SubNav from "../../components/SubNav";
import LoanList from "../../components/LoanList";
import Outlined from "../../components/Outlined";
import SubNav from "../../components/SubNav";
import { loggedInPages } from "../../constants/navItems";
import FullScreen from "../../components/FullScreen";
import { Container, Block, Loader, Button, Flex } from "@digibib/deichman-ui";
import { fetchAllProfileData } from "../../store/profile";
import { startPayFine } from "../../store/payments";
import { extendAllLoans } from "../../store/checkouts";
import { getFavourites } from "../../store/favourites";
import { startPayFine } from "../../store/payments";
import { fetchAllProfileData } from "../../store/profile";
import { withAuthSync } from "../../utilities/auth";
const dueDateComparator = (a, b) => {
if (parse(b.dueDate) < parse(a.dueDate)) {
......@@ -149,8 +150,10 @@ class MyLoans extends React.Component {
<div className="loan-order-box">
<Block bottom={4}>
<Flex justify="space-between" wrap>
<h3>Lån med gebyr</h3>
<div className="loan-order-box__button-desktop">
<div className="loan-order-box__header">
<h3>Lån med gebyr</h3>
</div>
<div className="loan-order-box__button">
<Button
disabled={kemnersaker && kemnersaker.length > 0}
loading={isRequestingNetsUrl}
......@@ -160,22 +163,15 @@ class MyLoans extends React.Component {
Betal gebyr 100,-
</Button>
</div>
<div className="loan-order-box__text">
<p>
Du har purregebyr følgende lån.
Bibliotekkortet ditt åpnes igjen når gebyret er
betalt.
</p>
</div>
</Flex>
</Block>
<p>
Du har purregebyr følgende lån. Bibliotekkortet
ditt åpnes igjen når gebyret er betalt.
</p>
<div className="loan-order-box__button-mobile">
<Button
disabled={kemnersaker && kemnersaker.length > 0}
loading={isRequestingNetsUrl}
onClick={() => this.props.startPayFine(purreId)}
primary
>
Betal gebyr 100,-
</Button>
</div>
</div>
</LoanList>
</Outlined>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment