Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

188059170 about content sim to front #31

Merged
merged 3 commits into from
Aug 21, 2024
Merged

188059170 about content sim to front #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b000df7
about tab markup and styling
bacalj Aug 21, 2024
d907f43
call selectSelf on body click
bacalj Aug 21, 2024
9ae73aa
newline
bacalj Aug 21, 2024
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
34 changes: 34 additions & 0 deletions src/assets/scss/about-tab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,35 @@
@import "./vars.scss";

.about-tab {
color:#333;
padding: 20px;
box-sizing: border-box;
width: $location-tab-width;
height: $location-tab-height;
padding: $tab-padding;
height: 800px; // extend beyond enclaosing for scroll

h2 {
font-size: 1.2em;
margin-bottom: 10px;
}

h3 {
font-size: 1em;
margin-bottom: 10px;
text-transform: uppercase;
font-weight: medium;
}

hr {
border-top: 1px solid $codap-teal-light;
margin-top: 20px;
margin-bottom: 20px;
}

.subsection {
p {
padding-left:10px;
}
}
}
4 changes: 2 additions & 2 deletions src/components/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
);
}
}
console.log("|| App: dataContextChange", values);

Check warning on line 138 in src/components/App.tsx

View workflow job for this annotation

GitHub Actions / Build and Run Jest Tests 

Unexpected console statement

Check warning on line 138 in src/components/App.tsx

View workflow job for this annotation

GitHub Actions / S3 Deploy 

Unexpected console statement
}, [handleCaseSelectionInCodap]);

useEffect(() => {
Expand All @@ -158,7 +158,7 @@
action: "update",
resource: "interactiveFrame",
values: {
dimensions: tab === "location" ? kInitialDimensions : kSimulationTabDimensions
dimensions: ( tab === "location" || tab === "about" ) ? kInitialDimensions : kSimulationTabDimensions
}
}).then(() => {
// This brings the plugin window to the front within CODAP
Expand All @@ -184,7 +184,7 @@


return (
<div className="App">
<div className="App" onClick={selectSelf}>
<Header
activeTab={activeTab}
onTabClick={handleTabClick}
Expand Down
12 changes: 11 additions & 1 deletion src/components/about-tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,17 @@ import "../assets/scss/about-tab.scss";
export const AboutTab: React.FC = () => {
return (
<div className="about-tab">
<p>about</p>
<h2>Lorem ipsum dolor sit amet</h2>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam auctor, nisl nec ultricies lacinia, nisl nisl aliquam nisl, nec aliquam nisl nisl sit amet nisl.</p>
<p>Donec auctor, nisl nec ultricies lacinia, nisl nisl aliquam nisl, nec aliquam nisl nisl sit amet nisl. Nullam auctor, nisl nec ultricies lacinia, nisl nisl aliquam nisl.</p>
<hr/>
<h2>Consectetur adipiscing elit</h2>
<div className="subsection">
<h3>Nullam auctor</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam auctor, nisl nec ultricies lacinia, nisl nisl aliquam nisl, nec aliquam nisl nisl sit amet nisl.</p>
<h3>Nisl nec ultricies</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam auctor, nisl nec ultricies lacinia, nisl nisl aliquam nisl, nec aliquam nisl nisl sit amet nisl.</p>
</div>
</div>
);
};
Expand Down
Loading