classroom??

bherceha · bherceha · commit 8ac947d5b66f · 2026-01-19T20:19:03.000-05:00
diff --git a/.github/workflows/classroom.yml b/.github/workflows/classroom.yml
@@ -25,11 +25,22 @@ jobs:
         command: |
             REPO="${{ github.repository }}"
             REPO="${REPO##*/}"
+<<<<<<< HEAD
             STUDENT="${REPO##*-}"
             COUNT=$(git log main --author="$STUDENT" --pretty=oneline | wc -l | tr -d ' ')
             echo "Student: $STUDENT"
             echo "Commit count on main: $COUNT"
             [ "$COUNT" -ge 5 ]
+=======
+
+            # 1. Strip assignment prefix
+            STUDENT="${REPO#mozilla-website-}"
+
+            # 2. Strip trailing -<digits> if present
+            STUDENT="$(echo "$STUDENT" | sed -E 's/-[0-9]+$//')"
+
+            echo "Student: $STUDENT"
+>>>>>>> ba8040b138934725f788b0efd9be0fa96affb84a
         timeout: 2
         max-score: 10
     - name: Autograding Reporter
diff --git a/index.html b/index.html
@@ -13,7 +13,7 @@
   <body class="oswald-funfont">
     <h1> Mozilla Firefox is Fire! </h1>
     <img src="images/firefox-icon.png" alt="The Firefox logo: a flaming fox surrounding the Earth." />
-    <p>At Mozilla, we're a global community of</p>
+    <p>At Mozilla, we're a global community of...</p>
 
       <p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras semper tellus quis est lacinia, non consectetur urna consequat. Aliquam sed finibus ipsum. Suspendisse nec euismod nibh. Donec id orci risus. Aliquam erat volutpat. Praesent in sem diam. Nam rutrum dui vitae ante scelerisque gravida. In eget erat sed tellus dignissim tincidunt eget non eros. Nulla facilisi. Aenean arcu tellus, gravida sed ex ut, pellentesque dapibus erat. Duis quis quam eget diam rhoncus euismod. </p>
 
@@ -39,7 +39,7 @@ <h1> Mozilla Firefox is Fire! </h1>
 	</ul>
 
 	<p>working together to keep the fifth most used web broswer alive and kicking.</p>
-
+  <p> We believe this act of human collaboration across an open platform is essential to individual growth and our collective future.</p>
 	<p> Our 
 		<a href="https://www.mozilla.org/en-US/about/manifesto/"> Mozilla Manifesto</a> 
 		outlines the values and principles that guide our work.
diff --git a/styles/style.css b/styles/style.css
@@ -12,8 +12,9 @@ body {
 	  font-style: normal;
 	  width: 600px;
 	  margin: 0 auto;
+    margin-top: 50px;
 	  background-color: #FDAA46;
-	  padding: 0 20px 20px 20px;
+	  padding: 20px 20px 20px 20px;
 	  border: 5px solid black;
 }
 
