Merge pull request #83 from rachelnicole/header-footer-classnames

🆕 more semantic class name
punchcard-cms · Jun 28, 2016 · 25a8745 · 25a8745
2 parents e4f261b + 7a3d3a7
commit 25a8745
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 30 deletions.
diff --git a/src/sass/_punchcard.scss b/src/sass/_punchcard.scss
@@ -27,6 +27,5 @@
 //////////////////////////////
 // LAYOUTS
 @import 'partials/layouts/header';
-@import 'partials/layouts/footer';
 @import 'partials/layouts/login';
 //////////////////////////////
diff --git a/src/sass/partials/layouts/_footer.scss b/src/sass/partials/layouts/_footer.scss
diff --git a/src/sass/partials/layouts/_header.scss b/src/sass/partials/layouts/_header.scss
@@ -1,4 +1,4 @@
-header {
+.header {
   background-color: color('gray', 90);
   height: 75px;
 }
@@ -9,7 +9,7 @@ header {
 
   margin: 0 auto;
 
-  .punchcard-logo {
+  .nav--logo {
     height: 18px;
   }
 

diff --git a/views/_donut.html b/views/_donut.html
@@ -17,10 +17,6 @@
     {% endblock %}
   </main>
 
-  {% block footer %}
-    {% include "_footer.html" %}
-  {% endblock %}
-
   <script src="/js/app.js"></script>
   {% block pageFoot %}
     <script type="text/javascript">

diff --git a/views/_footer.html b/views/_footer.html
diff --git a/views/_header.html b/views/_header.html
@@ -1,3 +1,3 @@
-<header class="main-header">
+<header class="header">
   {% include "_nav.html" %}
 </header>
diff --git a/views/_nav.html b/views/_nav.html
@@ -1,6 +1,6 @@
 <nav class="nav">
   <ul class="nav--list">
-    <li class="nav--item"><a href="/"><img src="/images/punchcard-type.svg" alt="punchcard-logo" class="punchcard-logo"></a></li>
+    <li class="nav--item"><a href="/" class="nav--home"><img src="/images/punchcard-type.svg" class="nav--logo" alt="punchcard-logo"></a></li>
     {% for item in nav %}
     <li class="nav--item"><a href="/{{item.path}}" class="nav--a">{{item.label}}</a></li>
     {% endfor %}

diff --git a/views/login.html b/views/login.html
@@ -5,10 +5,10 @@
 {% endblock %}
 
 {% block header %}
-<header class="main-header">
+<header class="header">
   <nav class="nav">
   <ul class="nav--list">
-    <li class="nav-item"><a href="/"><img src="/images/punchcard-type.svg" alt="punchcard-logo" class="punchcard-logo"></a></li>
+    <li class="nav--item"><a href="/"><img src="/images/punchcard-type.svg" alt="punchcard-logo" class="nav--logo"></a></li>
   </ul>
 </nav>