Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@openstax/os-webview",
"version": "2.144.1",
"version": "2.145.2",
"description": "OpenStax webview",
"scripts": {
"test": "jest --coverage ./test/src",
Expand Down
6 changes: 6 additions & 0 deletions src/app/components/shell/router-helpers/page-loaders.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
} from 'react-router-dom';
import loadable from 'react-loadable';
import LoadingPlaceholder from '~/components/loading-placeholder/loading-placeholder';
import useLayoutContext from '~/contexts/layout';

function useAnalyticsPageView() {
const location = useLocation();
Expand Down Expand Up @@ -57,6 +58,11 @@ function usePage(name) {
export function ImportedPage({name}) {
const {pathname} = useLocation();
const Page = usePage(name);
const {layoutParameters, setLayoutParameters} = useLayoutContext();

if (layoutParameters.name === null) {
setLayoutParameters();
}

useAnalyticsPageView();

Expand Down
4 changes: 0 additions & 4 deletions src/app/components/shell/router-helpers/page-routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ export function DetailsRoutes() {
export function OtherPageRoutes() {
const dir = assertDefined(useParams().dir);
const {'*': path} = useParams();
const {layoutParameters, setLayoutParameters} = useLayoutContext();

if (['books', 'textbooks'].includes(dir)) {
return path === '' ? <Error404 /> : (
Expand Down Expand Up @@ -93,9 +92,6 @@ export function OtherPageRoutes() {
'separatemap'
].includes(dir)
) {
if (layoutParameters.name === null) {
setLayoutParameters({name: 'default'});
}
return <ImportedPage name={dir} />;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function AccountItem() {

return (
mosIsAvailable ?
<MenuItem label="Account Dashboard" url="/#account" /> :
<MenuItem label="Account Dashboard" url="/account" /> :
<MenuItem label="Account Profile" url={`${settings.accountHref}/profile`} />
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
display: grid;
grid-auto-flow: column;
grid-column-gap: 1rem;
width: max-content;
margin: 0 auto;

@include width-up-to($phone-max) {
display: flex;
Expand Down
10 changes: 9 additions & 1 deletion src/app/pages/partners/partners.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,18 @@
}

.banner {
background-image: url('/dist/images/partners/header-right.jpg');
background-position: right;
background-repeat: no-repeat;
background-size: 55%;
border-bottom: thin solid os-color(green);
padding-bottom: 8rem;
position: relative;

@include width-up-to($tablet-max) {
background-image: none;
}

a {
color: adjust-color(text-color(link), $lightness: + 30%);

Expand Down Expand Up @@ -73,7 +81,7 @@
.text-block {
text-align: left;

@include wider-than($phone-max) {
@include wider-than($tablet-max) {
max-width: 57rem;
width: 50%;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/partners/partners.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ function Partners({data}: {data: PartnerPageData}) {
</a>
<a
className="btn"
href="/webinars/explore/collections/Ally%20Partners"
href="/webinars/explore/collections/Technology%20Partners"
>
Watch webinars
</a>
Expand Down
3 changes: 2 additions & 1 deletion src/app/pages/partners/results/results.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

&.results-10 {
border-color: os-color(gold);
margin-bottom: 4rem;
}

&.results-7 {
Expand All @@ -66,7 +67,7 @@

h3 {
@include title-font(2.6rem);
margin-bottom: 2rem;
margin: 0 0 2rem;
width: 100%;
text-align: center;
}
Expand Down
Binary file added src/images/partners/header-right.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/images/partners/partner-heading-bg.webp
Binary file not shown.
Loading