Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
update and mega footer fix
Browse files Browse the repository at this point in the history
  • Loading branch information
szk11001 committed Aug 7, 2014
2 parents 6755591 + 0580f50 commit 19fc77e
Show file tree
Hide file tree
Showing 11 changed files with 316 additions and 32 deletions.
179 changes: 179 additions & 0 deletions css/variables.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
/* - - - - - - - - - - - - - - - - - - -
== Variables
- - - - - - - - - - - - - - - - - - - */
/*
$contentBg: #fff;
$contentPadding: 1em;
*/
/* == Nav */
/*
$nav-secondary-border-color: #ccc !default;
$nav-secondary-border-radius: $border-radius-base !default;
$nav-secondary-padding: 5px !default;
$nav-secondary-bg-color: #fff !default;
$nav-secondary-font-size: .9em !default;
$nav-secondary-link-padding: $nav-link-padding !default;
$nav-secondary-link-border-radius: $border-radius-base !default;
$nav-secondary-link-bg: transparent !default;
$nav-secondary-link-hover-bg: $nav-link-hover-bg !default;
$nav-secondary-link-color: #428bca !default;
$nav-secondary-open-link-hover-color: $nav-open-link-hover-color !default;
$nav-secondary-active-link-hover-bg: $component-active-bg !default;
$nav-secondary-active-link-hover-color: $component-active-color !default;
/* == Widgets */
/*
$widget-border-color: #ccc !default;
$widget-border-radius: $border-radius-base !default;
$widget-border-width: 1px !default;
$widget-margin: 0 0 1.5em 0 !default;
$widget-padding: 0 !default;
$widget-bg: #fff !default;
$widget-content-margin: 1em;
$widget-color: #000 !default;
$widget-size: 1em !default;
$widget-link-color: $link-color !default;
$widget-link-hover: $link-hover-color !default;
$widget-head-bg: $widget-bg !default;
$widget-head-color: $widget-color !default;
$widget-head-border-width: 0 0 1px 0 !default;
$widget-head-border-color: $widget-border-color !default;
$widget-head-padding: .5em .5em .5em 1em !default;
$widget-head-size: $widget-size !default;
/* Sepcific Widgets */
/*
$footers-margin: 1.5em 0 0 0 !default;
$footers-bg: #eee !default;
$footers-color: #333 !default;
$footers-link-color: $link-color !default;
$footers-link-hover: $link-hover-color !default;
$footers-border-color: #ccc !default;
$footers-border-width: 2px 0 0 0 !default;
$megafooter-bg: transparent !default;
$megafooter-widget-bg: transparent !default;
$megafooter-widget-color: $footers-color !default;
$megafooter-widget-link-color: $footers-link-color !default;
$megafooter-widget-link-hover: $footers-link-hover !default;
$megafooter-widget-head-bg: transparent !default;
$megafooter-widget-head-color: $footers-color !default;
$uc-footer-link-color: $footers-link-color !default;
$uc-footer-link-hover: $footers-link-hover !default;
$uc-footer-link-spacing: 1em !default;;
@mixin uc-cal() {
.uc-cal {
padding:0;
&.uc-iconcal {
.uc-cal-list {
margin:$widget-content-margin;
a.uc-cal-event {
font-family:$font-family-base;
padding-left:65px;
min-height:65px;
.uc-cal-event-date {
border:none;
width:50px;
left:0;
box-shadow:none;
background-color:#eee;
.uc-cal-event-month {
height:auto;
padding:.4em .2em .3em .2em;
font-size:.8em;
background-color:$uc-ecw-month-bg;
color:$uc-ecw-month-color;
font-weight:normal;
letter-spacing:0;
text-transform:capitalize;
}
.uc-cal-event-day {
padding:.5em .1em .6em;
height:auto;
background-color:$uc-ecw-day-bg;
color:$uc-ecw-day-color;
font-size:1.2em;
}
}
.uc-cal-event-title {
color:$uc-ecw-title-color ;
font-size:1em;
line-height:$line-height-base;
margin-bottom:.3em;
margin-top:.2em;
}
.uc-cal-event-time {
color: $uc-ecw-time-color;
font-size:1em;
}
&:hover {
.uc-cal-event-title {
color: $uc-ecw-title-hover;
}
.uc-cal-event-time {
color: $uc-ecw-time-hover;
}
}
}
}
}
&.uc-listcal {
.uc-cal-list {
margin:$widget-content-margin;
a.uc-cal-event {
font-family:$font-family-base;
.uc-cal-event-date {
display:block;
font-weight:normal;
color:#aaa;
line-height:$line-height-base;
}
.uc-cal-event-title {
display:block;
color: $uc-ecw-title-color;
line-height:$line-height-base;
}
.uc-cal-event-time {
color: $uc-ecw-time-color;
}
&:hover {
.uc-cal-event-title {
color: $uc-ecw-title-hover;
}
.uc-cal-event-time {
color: $uc-ecw-time-hover;
}
}
}
}
}
}
}
/**/
3 changes: 2 additions & 1 deletion footer.php
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
* @package cornerstone
*/
?>
</div><!-- #page -->
</div><!-- .container-->
</div><!-- #content -->
<div id="footers">
<?php get_template_part( 'inc/mega', 'footer' ); ?>
<?php get_template_part('inc/mega','footer'); ?>
<footer id="footer" class="site-footer" role="contentinfo">
<div class="container">
<ul id="uc-footer-links" class="clearfix">
Expand Down
12 changes: 7 additions & 5 deletions js/cs.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,15 @@ function stickyFoot(){
/* Andrew's Sticky Footer JS. */
var wrapperH = document.getElementById('page').clientHeight;
var footerH = document.getElementById('footers').clientHeight;
console.log(wrapperH);
console.log(footerH);

var comboH = wrapperH + footerH;
var windowH = $(window).innerHeight();

if(windowH >= comboH){
$('body').addClass('sticky');
var windowH = window.innerHeight;
if(windowH>=comboH){
$('body').addClass('sticky')
} else {
$('body').removeClass('sticky');
$('body').removeClass('sticky')
}
}
window.onload = function (){
Expand Down
2 changes: 1 addition & 1 deletion js/min/cs.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 3 additions & 8 deletions page-home.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
$count = 1;
get_header(); ?>
<div id="page-home">
<?php include('inc/sidebar-check.php')?>
<?php while ( have_posts() ) : the_post(); ?>
<div class="row">
<div class="col-sm-<?php echo (is_active_sidebar( $sidebar )?9:12); ?>">

<?php for($i=0; $i<$rows; $i++){ /* Begin Homepage Builder... */?>
<div class="row">

Expand All @@ -28,18 +26,15 @@
<?php if ( is_active_sidebar( 'home'.$count ) ) { ?>
<?php dynamic_sidebar( 'home'.$count ); ?>
<?php } else { ?>
<h1>Home<?php echo $count; ?></h1>
<p>Go to Appearance > Customize, scroll down and open the Home<?php echo $count; ?> section to edit this area.</p>

<?php }; ?>
</div>
</div>
<?php $count ++; } ?>

</div><!-- /row-->
<?php } /* ... end Homepage Builder */?>
</div>
<?php include('inc/sidebar-if-active.php')?>
</div>

<?php endwhile; // end of the loop. ?>
</div>
<?php get_footer(); ?>
6 changes: 0 additions & 6 deletions sass/header-image.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
== Header Image
- - - - - - - - - - - - - - - - - - - */
#masthead {
-ms-word-break: break-all;
word-break: break-all;
word-break: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
}
#masthead.header-image .container {
position:relative;
Expand Down
6 changes: 5 additions & 1 deletion sass/widgets.scss
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,11 @@
}
}
}
&.widget_sp_image {}
&.widget_sp_image {
padding:0;
border:none;
background-color:transparent;
}
&.widget_metaslider_widget {
padding:0;
background-color:transparent;
Expand Down
14 changes: 5 additions & 9 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -6898,15 +6898,6 @@ button.close {
/* - - - - - - - - - - - - - - - - - - -
== Header Image
- - - - - - - - - - - - - - - - - - - */
#masthead {
-ms-word-break: break-all;
word-break: break-all;
word-break: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
}

#masthead.header-image .container {
position: relative;
}
Expand Down Expand Up @@ -7420,6 +7411,11 @@ object {
.widget.widget_rcpt ul .rcpt_item_date {
margin: .5em 5% 1em;
}
.widget.widget_sp_image {
padding: 0;
border: none;
background-color: transparent;
}
.widget.widget_metaslider_widget {
padding: 0;
background-color: transparent;
Expand Down
4 changes: 3 additions & 1 deletion style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,20 @@ Version: 1
Text Domain: cs
*/

$icon-font-path: "../../global/bootstrap-sass-master/assets/fonts/bootstrap/";
$icon-font-path: "../../global/bootstrap-sass-master/assets/fonts/bootstrap/" !default;


@import "../../global/bootstrap-sass-master/assets/stylesheets/bootstrap.scss";


@import "sass/variables.scss";
@import "sass/utilities.scss";
@import "sass/fonts.scss";
@import "sass/titlebar.scss";
@import "sass/nav.scss";
@import "sass/header-image.scss";


@import "sass/content.scss";
@import "sass/captions.scss";
@import "sass/alignments.scss";
Expand Down
55 changes: 55 additions & 0 deletions user-index-table.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php
/**
Template Name: User Table
* This page template has no padding, and does not display the page title.
* Useful for large images, iframes, or other edge cases.
*/

get_header(); ?>
<div id="page-blank">
<?php include('inc/sidebar-check.php')?>
<?php while ( have_posts() ) : the_post(); ?>
<?php include('inc/submenu-check.php')?>
<div class="row">
<div class="col-sm-<?php echo (is_active_sidebar( $sidebar )?9:12); ?>">
<div id="primary" class="content-area">
<main id="main" class="site-main" role="main">
<article id="post-<?php the_ID(); ?>" <?php post_class('clearfix'); ?>>
<header class="entry-header">
<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
</header><!-- .entry-header -->
<div class="entry-content">
<div class="user-index">
<?php $thing = get_the_ID(); $userTags = get_post_meta($thing, 'userTags', true);
$userTags = str_replace(' ', '', $userTags);
$userTags = explode(',',$userTags);
$args = array(
'tags' => $userTags,
'name' => true,
'image' => true,
'title' => true,
'phone1' => true,
'phone2' => false,
'email' => true,
'fax' => false,
'officeLocation' => false,
'officeHours' => false,
'mailingAddress' => false
);
echo table_list_all_public($args);
?>
</div>
</div><!-- .entry-content -->
<footer class="entry-footer">
<?php edit_post_link( __( 'Edit', 'cs' ), '<span class="edit-link">', '</span>' ); ?>
</footer><!-- .entry-footer -->
</article><!-- #post-## -->
</main>
</div>
</div>
<?php include('inc/sidebar-if-active.php')?>
</div>
<?php include('inc/submenu-closing-tags.php')?>
<?php endwhile; // end of the loop. ?>
</div>
<?php get_footer(); ?>
Loading

0 comments on commit 19fc77e

Please sign in to comment.