Majors piece

2026/liberal-arts-decline-src/src/components/ArticleContent.jsx

@@ -68,11 +68,7 @@ const chartCredit = {
 const ArticleSection = ({ header, paragraphs }) => (
     <section className="max-w-2xl mx-auto px-4 my-12">
         {header && (
-<<<<<<< HEAD
             <h2 className="text-2xl font-bold mb-6 font-serif">{header}</h2>
-=======
-            <h2 className="text-3xl font-light mb-6 font-serif">{header}</h2>
->>>>>>> origin/main
         )}
         {paragraphs.map((paragraph, i) => (
             <p
@@ -180,14 +176,10 @@ export default function ArticleContent({ windowHeight, windowWidth }) {
             <ArticleSection paragraphs={section1.slice(12)} />
 
             {/* Section 2: fiefdom in Saieh */}
-<<<<<<< HEAD
             <ArticleSection
                 header={section2Header}
                 paragraphs={section2.slice(0, 6)}
             />
-=======
-            <ArticleSection paragraphs={section2.slice(0, 6)} />
->>>>>>> origin/main
 
             <figure className="my-16 flex flex-col items-start max-w-2xl mx-auto">
                 <img
@@ -244,14 +236,10 @@ export default function ArticleContent({ windowHeight, windowWidth }) {
             <MajorExplorer />
 
             {/* Section 3: history of UChicago */}
-<<<<<<< HEAD
             <ArticleSection
                 header={section3Header}
                 paragraphs={section3.slice(0, 3)}
             />
-=======
-            <ArticleSection paragraphs={section3.slice(0, 3)} />
->>>>>>> origin/main
 
             <figure className="my-16 flex flex-col items-start max-w-2xl mx-auto">
                 <img
@@ -280,26 +268,18 @@ export default function ArticleContent({ windowHeight, windowWidth }) {
             <ArticleSection paragraphs={section3.slice(7)} />
 
             {/* Section 4: Newman & humanities decline */}
-<<<<<<< HEAD
             <ArticleSection
                 header={section4Header}
                 paragraphs={section4.slice(0, 2)}
             />
-=======
-            <ArticleSection paragraphs={section4.slice(0, 2)} />
->>>>>>> origin/main
 
             {/* English/PoliSci chart */}
             <figure className="my-16 flex flex-col items-start max-w-3xl mx-auto px-2 sm:px-8">
                 <div className="w-full">
                     <AriChartDemo />
                 </div>
                 <figcaption className="text-xs text-gray-600 italic mt-4 w-full text-left">
-<<<<<<< HEAD
                     In 2005, English and political science accounted for 20
-=======
-                    In 2005, English and Political science accounted for 20
->>>>>>> origin/main
                     percent of graduating students. Today, they make up just
                     over 7 percent of the Class of 2024. Their decline began
                     around 2012, the year that students entering college during
@@ -328,14 +308,10 @@ export default function ArticleContent({ windowHeight, windowWidth }) {
             <ArticleSection paragraphs={section4.slice(8)} />
 
             {/* Section 5: humanities response */}
-<<<<<<< HEAD
             <ArticleSection
                 header={section5Header}
                 paragraphs={section5.slice(0, 4)}
             />
-=======
-            <ArticleSection paragraphs={section5.slice(0, 4)} />
->>>>>>> origin/main
 
             <figure className="my-8 flex flex-col items-start max-w-2xl mx-auto">
                 <img
@@ -368,14 +344,10 @@ export default function ArticleContent({ windowHeight, windowWidth }) {
             <ArticleSection paragraphs={section5.slice(12)} />
 
             {/* Section 6: conclusion */}
-<<<<<<< HEAD
             <ArticleSection
                 header={section6Header}
                 paragraphs={section6.slice(0, -1)}
             />
-=======
-            <ArticleSection paragraphs={section6.slice(0, -1)} />
->>>>>>> origin/main
             <section className="max-w-2xl mx-auto px-4 my-12">
                 <p className="text-lg leading-relaxed mb-5 font-serif font-normal">
                     <span
@@ -399,17 +371,11 @@ export default function ArticleContent({ windowHeight, windowWidth }) {
                     <span className="italic">Maroon</span>.
                 </p>
                 <p className="text-sm mt-2">
-<<<<<<< HEAD
                     The version of this article published in the May 20 print
                     edition incorrectly stated that all but two humanities
                     majors had seen declines in the share of students enrolling
                     over the past 20 years. All but three had seen such
                     declines.{' '}
-=======
-                    Editor’s note: The version of this article published in the
-                    May 20 print edition misstated the number of humanities
-                    majors that had not seen a decline in the past 20 years.
->>>>>>> origin/main
                 </p>
             </section>
         </div>

2026/liberal-arts-decline-src/src/components/Footer.jsx

@@ -116,11 +116,7 @@ export default function Credits() {
                 </p>
                 <p className="text-[16px] mt-3 font-serif">
                     Find the code for this interactive on{' '}
-<<<<<<< HEAD
-                    <a href="https://github.com/nshaff3r/folkfest-src">
-=======
                     <a href="https://github.com/chicagomaroon/data-visualizations/tree/main/2026/liberal-arts-decline-src">
->>>>>>> origin/main
                         GitHub
                     </a>
                     .

2026/liberal-arts-decline-src/src/components/Header.jsx

@@ -70,11 +70,7 @@ const Subhead = ({ windowWidth }) => {
             }}
         >
             <h1
-<<<<<<< HEAD
                 className="text-lg sm:text-2xl text-[black] sm:text-white"
-=======
-                className="text-lg sm:text-3xl text-[black] sm:text-white"
->>>>>>> origin/main
                 style={{
                     textShadow:
                         windowWidth < 640

2026/liberal-arts-decline-src/src/components/Interactives.jsx

@@ -647,11 +647,7 @@ export const MajorExplorer = () => {
             )}
 
             {/* Search input + dropdown */}
-<<<<<<< HEAD
             <div className="relative w-72 mb-16">
-=======
-            <div className="relative w-72 mb-8">
->>>>>>> origin/main
                 <input
                     type="text"
                     placeholder={
@@ -687,11 +683,7 @@ export const MajorExplorer = () => {
             {chartSeries.length > -1 ? (
                 <figure className="w-full flex flex-col ">
                     <MajorChart series={chartSeries} />
-<<<<<<< HEAD
                     <figcaption className="text-xs text-gray-600 italic mt-4 text-left px-4">
-=======
-                    <figcaption className="text-sm text-gray-600 italic mt-4 max-w-xl text-left px-5">
->>>>>>> origin/main
                         Share of UChicago graduates majoring in each selected
                         field, 2005–2024. Use the search above to add or remove
                         majors. UChicago-specific majors, such as LLSO, are

2026/liberal-arts-decline-src/src/components/english_polisci_chart.jsx

@@ -12,11 +12,7 @@ export default function AriChart({
     data,
     width = 700,
     height = 400,
-<<<<<<< HEAD
     margin = { top: 70, right: 100, bottom: 30, left: 50 }
-=======
-    margin = { top: 40, right: 100, bottom: 30, left: 50 }
->>>>>>> origin/main
 }) {
     const svgRef = useRef();
     const windowWidth = useWindowWidth();

2026/liberal-arts-decline-src/src/components/penn_chart.jsx

@@ -12,11 +12,7 @@ export default function PennChart({
     data,
     width = 750,
     height = 400,
-<<<<<<< HEAD
-    margin = { top: 80, right: 60, bottom: 30, left: 70 }
-=======
-    margin = { top: 80, right: 80, bottom: 30, left: 50 }
->>>>>>> origin/main
+    margin = { top: 80, right: 50, bottom: 30, left: 70 }
 }) {
     const svgRef = useRef();
     const windowWidth = useWindowWidth();
@@ -114,15 +110,10 @@ export default function PennChart({
         // Chart title
         setChartTitleLines(svg.append('text'), windowWidth, {
             x: margin.left,
-            y: margin.top - 90,
+            y: margin.top - 115,
             lines: [
-<<<<<<< HEAD
                 'Percentage of Students with Business,',
                 'Economics, or Finance Majors'
-=======
-                'Percentage of Students',
-                'with Business, Economics, or Finance Majors'
->>>>>>> origin/main
             ]
         });
 

2026/liberal-arts-decline-src/src/components/substitution_chart.jsx

@@ -122,11 +122,7 @@ export default function SubstitutionChart({
 
         // Label above the line
         svg.append('text')
-<<<<<<< HEAD
             .attr('x', x(2013))
-=======
-            .attr('x', x(2014.25))
->>>>>>> origin/main
             .attr('y', margin.top + 18)
             .attr('text-anchor', 'middle')
             .attr('fill', '#666')
@@ -164,11 +160,7 @@ export default function SubstitutionChart({
 
         svg.append('text')
             .attr('x', x(2006.25))
-<<<<<<< HEAD
             .attr('y', y(lastMath.value - 2))
-=======
-            .attr('y', y(lastMath.value - 1))
->>>>>>> origin/main
             .attr('dy', '0.35em')
             .attr('fill', '#2a7f3e')
             .attr('font-size', getSeriesLabelFontSize(windowWidth))