Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

navbar hovers, config cleans

  • Loading branch information...
commit 1871a34a8db7e4c16b38bc1689531b2e956bf6ab 1 parent 5600c79
authored December 15, 2012
2  themes/_s/config.php
@@ -19,7 +19,7 @@
19 19
 define( 'CHURCHTHEMES_OPTIONS_LOGO_TOP_MARGIN', 32 );
20 20
 
21 21
 // Custom background
22  
-define( 'CHURCHTHEMES_DEFAULT_BACKGROUND_IMAGE',  WP_THEME_DIR . '/images/bg_body.jpg'  );
  22
+// define( 'CHURCHTHEMES_DEFAULT_BACKGROUND_IMAGE',  WP_THEME_DIR . '/images/bg_body.jpg'  );
23 23
 define( 'CHURCHTHEMES_DEFAULT_BACKGROUND_COLOR', 'd9d9d1' );
24 24
 
25 25
 // Update script
26  themes/scacseattle.org/config.php
... ...
@@ -1,26 +0,0 @@
1  
-<?php
2  
-/*
3  
-===================================================================================================
4  
-WARNING! DO NOT EDIT THIS FILE OR ANY TEMPLATE FILES IN THIS THEME!
5  
-
6  
-To make it easy to update your theme, you should not edit this file. Instead, you should create a
7  
-Child Theme first. This will ensure your template changes are not lost when updating the theme.
8  
-
9  
-You can learn more about creating Child Themes here: http://codex.wordpress.org/Child_Themes
10  
-
11  
-You have been warned! :)
12  
-===================================================================================================
13  
-*/
14  
-
15  
-// Theme options
16  
-define( 'CHURCHTHEMES_OPTIONS_MAIN_COLOR', '#629fa6' );
17  
-define( 'CHURCHTHEMES_OPTIONS_LOGO_WIDTH', 277 );
18  
-define( 'CHURCHTHEMES_OPTIONS_LOGO_HEIGHT', 25 );
19  
-define( 'CHURCHTHEMES_OPTIONS_LOGO_TOP_MARGIN', 32 );
20  
-
21  
-// Custom background
22  
-define( 'CHURCHTHEMES_DEFAULT_BACKGROUND_IMAGE',  WP_THEME_DIR . '/images/bg_body.jpg'  );
23  
-define( 'CHURCHTHEMES_DEFAULT_BACKGROUND_COLOR', 'd9d9d1' );
24  
-
25  
-// Update script
26  
-define( 'CHURCHTHEMES_UPDATE_API_URL', 'http://churchthemes.net/updates/antioch/' );
14  themes/scacseattle.org/js/main.js
... ...
@@ -1,5 +1,7 @@
1 1
 
2 2
 jQuery(function ($) {
  3
+
  4
+  /*** Search Box ***/
3 5
   $('#s').focus(function () {
4 6
     if ($(this).val() == "Search")
5 7
       $(this).val("");
@@ -10,6 +12,8 @@ jQuery(function ($) {
10 12
       $(this).val("Search");
11 13
   });
12 14
 
  15
+
  16
+  /*** Address Box ***/
13 17
   $("#startAddr").focus(function () {
14 18
     if ($(this).val() == "From")
15 19
       $(this).val("");
@@ -20,6 +24,16 @@ jQuery(function ($) {
20 24
       $(this).val("From");
21 25
   });
22 26
 
  27
+  /*** Navbar Hovers ***/
  28
+  $('.nav-item').hover(
  29
+    function () {
  30
+      $(this).children("a").children("span").addClass("nav_hover");
  31
+    },
  32
+    function () {
  33
+      $(this).children("a").children("span").removeClass("nav_hover");
  34
+    }
  35
+  );
  36
+
23 37
 
24 38
   $(window).load(function() {
25 39
       $(".flexslider").flexslider({
18  themes/scacseattle.org/navbar.php
@@ -7,22 +7,18 @@
7 7
   <table  id="primary-nav" role="navigation" class="site-navigation main-navigation  black-bar">
8 8
     <tr class="navbar clearfix">
9 9
       <td class="nav-item"><a href="<?php echo home_url("/church/our-vision/"); ?>">
10  
-        <?php if(is_page('church') || $post->post_parent == $church_page->ID) : ?>
11  
-          <span class="active_tab"></span>
12  
-        <?php endif; ?>
  10
+        <span class="<?php echo (is_page('church') || $post->post_parent == $church_page->ID ? "active_tab" : "");?>"></span>
13 11
         Church</a>
14 12
       </td>
15  
-      <td class="nav-item"><a href="<?php echo home_url("/visit/"); ?>">
16  
-        <?php if(is_page('visit')) : ?>
17  
-          <span class="active_tab"></span>
18  
-        <?php endif; ?>
19  
-        Visit</a>
  13
+      <td class="nav-item">
  14
+        <a href="<?php echo home_url("/visit/"); ?>">
  15
+          <span class="<?php echo (is_page('visit') ? "active_tab" : "");?>"></span>
  16
+          Visit
  17
+        </a>
20 18
       </td>
21 19
       <td class="nav-item disabled"><a href="#">Ministries</a></td>
22 20
       <td class="nav-item"><a href="<?php echo home_url("/sermons/"); ?>">
23  
-        <?php if(get_post_type() == 'ct_sermon') : ?>
24  
-          <span class="active_tab"></span>
25  
-        <?php endif; ?>
  21
+        <span class="<?php echo (get_post_type() == 'ct_sermon' ? "active_tab" : "");?>"></span>
26 22
         Sermons</a>
27 23
       </td>
28 24
       <td class="nav-item disabled"><a href="#">Give</a></td>
2  themes/scacseattle.org/sass/colors.css.sass
@@ -3,6 +3,8 @@ $text-grey: #777
3 3
 
4 4
 $active-link-color: #77991F
5 5
 
  6
+$nav-hover-color: $active-link-color
  7
+
6 8
 $light-grey: #ECEDED
7 9
 $medium-grey: #CCCCCC
8 10
 $search-box-bg: #EFEFEF
23  themes/scacseattle.org/sass/navbar.css.sass
@@ -9,13 +9,7 @@
9 9
       padding: 0 0 20px 0px
10 10
       display: table-row
11 11
       width: 100%
12  
-      .active_tab
13  
-        border-top: 7px solid $active-link-color
14  
-        position: absolute
15  
-        display: block
16  
-        width: 100%
17  
-        top: 0px
18  
-        left: 0px
  12
+
19 13
       .nav-item
20 14
         display: table-cell
21 15
         width: 20%
@@ -25,10 +19,19 @@
25 19
 
26 20
         a
27 21
           padding: 20px 0px
28  
-          margin: 0 4%
29 22
           text-transform: uppercase
30 23
           color: black
31 24
           font-size: 12px
32 25
 
33  
-          &:hover
34  
-            color: #AAA
  26
+          .nav_hover, .active_tab
  27
+            position: absolute
  28
+            display: block
  29
+            width: 100%
  30
+            top: 0px
  31
+            left: 0px
  32
+
  33
+          .active_tab
  34
+            border-top: 7px solid $active-link-color
  35
+
  36
+          .nav_hover
  37
+            border-top: 7px solid $nav-hover-color
20  themes/scacseattle.org/style.css
@@ -69,13 +69,6 @@
69 69
       padding: 0 0 20px 0px;
70 70
       display: table-row;
71 71
       width: 100%; }
72  
-      .primary-nav-container #primary-nav .navbar .active_tab {
73  
-        border-top: 7px solid #77991f;
74  
-        position: absolute;
75  
-        display: block;
76  
-        width: 100%;
77  
-        top: 0px;
78  
-        left: 0px; }
79 72
       .primary-nav-container #primary-nav .navbar .nav-item {
80 73
         display: table-cell;
81 74
         width: 20%;
@@ -84,12 +77,19 @@
84 77
         text-align: center; }
85 78
         .primary-nav-container #primary-nav .navbar .nav-item a {
86 79
           padding: 20px 0px;
87  
-          margin: 0 4%;
88 80
           text-transform: uppercase;
89 81
           color: black;
90 82
           font-size: 12px; }
91  
-          .primary-nav-container #primary-nav .navbar .nav-item a:hover {
92  
-            color: #aaaaaa; }
  83
+          .primary-nav-container #primary-nav .navbar .nav-item a .nav_hover, .primary-nav-container #primary-nav .navbar .nav-item a .active_tab {
  84
+            position: absolute;
  85
+            display: block;
  86
+            width: 100%;
  87
+            top: 0px;
  88
+            left: 0px; }
  89
+          .primary-nav-container #primary-nav .navbar .nav-item a .active_tab {
  90
+            border-top: 7px solid #77991f; }
  91
+          .primary-nav-container #primary-nav .navbar .nav-item a .nav_hover {
  92
+            border-top: 7px solid #77991f; }
93 93
 
94 94
 .site-footer {
95 95
   position: relative;

0 notes on commit 1871a34

Please sign in to comment.
Something went wrong with that request. Please try again.