add .content for consistent padding around content

yuehong0813 · Oct 11, 2021 · f504d96 · f504d96
1 parent 1cf1553
commit f504d96
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 deletions.
diff --git a/assets/css/_main.scss b/assets/css/_main.scss
@@ -51,7 +51,7 @@ body {
   }
 }
 
-.section {
+.content, .section {
   padding: calc(var(--feather-grid-mega) * 2) 0;
 }
 
@@ -348,11 +348,17 @@ br {
 
 /* Less than 600px */
 @media (max-width: 600px) {
-  .section {
+  .content, .section {
     padding: calc(var(--feather-grid-mega) * 1.5) 0;
   }
 
   .container {
     margin: 0 var(--feather-grid-medium);
   }
 }
+
+@media (max-width: 480px) {
+  .content, .section {
+    padding: var(--feather-grid-large) 0;
+  }
+}
diff --git a/assets/css/index.scss b/assets/css/index.scss
@@ -1,5 +1,9 @@
 /* Styles specific to home page */
 
+.content {
+  padding: 0;
+}
+
 .grey {
   background-color: var(--tw-color-gray-faint);
 

diff --git a/assets/css/memberships.scss b/assets/css/memberships.scss
@@ -27,12 +27,6 @@
   }
 }
 
-@media (max-width: 480px) {
-  .section {
-    padding: var(--feather-grid-large) 0;
-  }
-}
-
 /* Membership card elements that are consistent throughout all screen sizes */
 
 .membership {

diff --git a/assets/css/projects.scss b/assets/css/projects.scss
@@ -7,12 +7,6 @@
   --search-bar-width: 450px;
 }
 
-.all-projects {
-  padding-top: var(--feather-grid-mega);
-  padding-bottom: calc(var(--feather-grid-mega) * 2);
-}
-
-
 .project-card {
   position: relative;
   padding: var(--feather-grid-mega) calc(var(--feather-grid-mega) * 1.5);

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -8,7 +8,7 @@
     {{ partial "nav.html" . }}
 
     <!-- Site wrapper -->
-    <div class="site">
+    <main>
       <div class="header">
         <div class="Grid container">
           <div id="header-text" class="Grid-cell">
@@ -19,8 +19,10 @@
           </div>
         </div>
       </div>
-        {{ block "main" . }}{{ end }}
-    </div>
+      <div class="content">
+        {{ block "content" . }}{{ end }}
+      </div>
+    </main>
 
     {{ partial "footer.html" . }}
   </body>

diff --git a/layouts/_default/memberships.html b/layouts/_default/memberships.html
@@ -1,5 +1,4 @@
-{{ define "main" }}
-<div class="section">
+{{ define "content" }}
 	<div class="Grid membership-container container">
 		{{ range $.Site.Data.memberships }}
 		<div class="Grid-cell sizeFull membership">
@@ -29,5 +28,4 @@ <h2>{{ .name }}</h2>
 		</div>
 		{{ end }}
 	</div>
-</div>
 {{ end }}
diff --git a/layouts/_default/projects.html b/layouts/_default/projects.html
@@ -6,7 +6,7 @@ <h1 class="large-title">Projects</h1>
 </div>
 {{ end }}
 
-{{ define "main" }}
+{{ define "content" }}
 <!-- Container for no results text -->
 <div class="Grid container no-results-container"></div>
 

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -1,3 +1,5 @@
-{{ define "main" }}
-  {{ .Content }}
+{{ define "content" }}
+  <div class="container">
+    {{ .Content }}
+  </div>
 {{ end }}
diff --git a/layouts/index.html b/layouts/index.html
@@ -5,6 +5,6 @@ <h1 class="subtitle">
 <h1 class="large-title">Open Source is Happening</h1>
 {{ end }}
 
-{{ define "main" }}
+{{ define "content" }}
   {{ .Content }}
 {{ end }}