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

Commit

Permalink
Browse files Browse the repository at this point in the history
Working on A lot of changes.
  • Loading branch information
andrewmbacon committed Jul 29, 2014
1 parent 24f5768 commit 92ecf20
Show file tree
Hide file tree
Showing 10 changed files with 330 additions and 110 deletions.
2 changes: 1 addition & 1 deletion _notes/dwsync.xml

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions css/titlebar.css
Expand Up @@ -57,7 +57,7 @@
}

#uc-site-header #uc-site-title {
padding-bottom: 30px;
padding-bottom: 20px;
}

#uc-site-header #uc-site-title a {
Expand All @@ -70,10 +70,6 @@
#site-title .searchform .form-group {
width: 100%;
}
#site-title .searchform .form-group .search {
#site-title .searchform .form-group .form-control {
width: 150px;
}
#site-title .searchform .form-group .search:focus {
width: 300px;
transition: all 2s ease;
}
66 changes: 66 additions & 0 deletions page-blog.php
@@ -0,0 +1,66 @@
<?php
/*
Template Name: Blog
*/
get_header(); ?>
<?php include('inc/sidebar-check.php')?>

<div class="row" id="primary">
<div class="col-sm-<?php echo (is_active_sidebar( $sidebar )?9:12); ?>">

<?php
/*
function getCategory(){
$thePost = get_the_ID();
$theCategory = get_post_meta($thePost, 'category', true);
return $theCategory;
}
<?php query_posts('post_type=post&post_status=publish&cat=news-2&paged='. get_query_var('paged')); ?>
*/
?>
<?php query_posts('post_type=post&post_status=publish&paged='. get_query_var('paged')); ?>
<?php if( have_posts() ): ?>
<?php while( have_posts() ): the_post(); ?>
<div class="post content clearfix">
<div class="post-header">
<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">
<?php the_title(); ?>
</a></h2>
</div>
<div class="post-content clearfix">
<?php the_content(); ?>
</div>
<div class="post-meta">
<?php the_date( 'F j, Y', '<span class="post-date"><i class="icon-calendar"></i>', '</span>' ); ?>
<span class="post-author"><a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>"><i class="icon-user"></i>
<?php the_author_meta( 'display_name' ); ?>
</a></span>
<?php
// PHP Request: If the_tags is empty, do not generate the HTML. I don't want the labels and markup making empty space when there are no tags.
the_tags( '<span class="post-tags"><i class="icon-tags"></i>', ', ', '</span>' );
?>
</div>
</div>
<?php endwhile; ?>
<div class="navigation"> <span class="older">
<?php next_posts_link(__('&laquo; Older','example')) ?>
</span> <span class="newer">
<?php previous_posts_link(__('Newer &raquo;','example')) ?>
</span> </div>
<!-- /.navigation -->

<?php else: ?>
<div id="post-404" class="noposts">
<p>
<?php _e('None found.','example'); ?>
</p>
</div>
<!-- /#post-404 -->

<?php endif; wp_reset_query(); ?>
</div>
<!-- /col9/12 -->
<?php include('inc/sidebar-if-active.php')?>
</div>
<!-- /row -->
<?php get_footer(); ?>
2 changes: 1 addition & 1 deletion sass/_notes/dwsync.xml
@@ -1 +1 @@
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="uup.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488480050" remote="7783447347" Dst="-1" /><file name="in-page-menus.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488488365" remote="7783455662" Dst="-1" /><file name="accessibility.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981695" remote="-4611742485168403418" Dst="-1" /><file name="admin-style.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981687" remote="-4611742485168403418" Dst="-1" /><file name="cal.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488991327" remote="-4611742485168403417" Dst="-1" /><file name="fonts.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981828" remote="-4611742485168403417" Dst="-1" /><file name="galleries.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981817" remote="-4611742485168403417" Dst="-1" /><file name="in-page-menus.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981795" remote="-4611742485168403416" Dst="-1" /><file name="link-flags.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981778" remote="-4611742485168403416" Dst="-1" /><file name="nav.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488988531" remote="-4611742485168403416" Dst="-1" /><file name="table-stripper.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981758" remote="-4611742485168403416" Dst="-1" /><file name="titlebar.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981750" remote="-4611742485168403415" Dst="-1" /><file name="uup.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981732" remote="-4611742485168403415" Dst="-1" /><file name="widgets.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3489004443" remote="-4611742485168391259" Dst="-1" /><file name="alignments.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981849" remote="-4611742485168403418" Dst="-1" /><file name="captions.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981836" remote="-4611742485168403417" Dst="-1" /><file name="content.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981678" remote="-4611742485168403417" Dst="-1" /><file name="footer.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981822" remote="-4611742485168403417" Dst="-1" /><file name="header-image.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981807" remote="-4611742485168403416" Dst="-1" /><file name="media.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981769" remote="-4611742485168403416" Dst="-1" /><file name="utilities.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981742" remote="-4611742485168403415" Dst="-1" /><file name="variables.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488998551" remote="-4611742485168397114" Dst="-1" /></dwsync>
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="uup.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488480050" remote="7783447347" Dst="-1" /><file name="in-page-menus.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488488365" remote="7783455662" Dst="-1" /><file name="accessibility.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981695" remote="-4611742485168403418" Dst="-1" /><file name="admin-style.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981687" remote="-4611742485168403418" Dst="-1" /><file name="cal.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488991327" remote="-4611742485168403417" Dst="-1" /><file name="fonts.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981828" remote="-4611742485168403417" Dst="-1" /><file name="galleries.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981817" remote="-4611742485168403417" Dst="-1" /><file name="in-page-menus.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981795" remote="-4611742485168403416" Dst="-1" /><file name="link-flags.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981778" remote="-4611742485168403416" Dst="-1" /><file name="nav.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488988531" remote="-4611742485168403416" Dst="-1" /><file name="table-stripper.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981758" remote="-4611742485168403416" Dst="-1" /><file name="titlebar.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981750" remote="-4611742485168403415" Dst="-1" /><file name="uup.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981732" remote="-4611742485168403415" Dst="-1" /><file name="widgets.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3489004443" remote="-4611742485168391259" Dst="-1" /><file name="alignments.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981849" remote="-4611742485168403418" Dst="-1" /><file name="captions.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981836" remote="-4611742485168403417" Dst="-1" /><file name="content.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981678" remote="-4611742485168403417" Dst="-1" /><file name="footer.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981822" remote="-4611742485168403417" Dst="-1" /><file name="header-image.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981807" remote="-4611742485168403416" Dst="-1" /><file name="media.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981769" remote="-4611742485168403416" Dst="-1" /><file name="utilities.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488981742" remote="-4611742485168403415" Dst="-1" /><file name="variables.scss" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488998551" remote="1055227494786262214" Dst="-1" /></dwsync>
Expand Down
8 changes: 8 additions & 0 deletions sass/content.scss
Expand Up @@ -34,6 +34,10 @@ code {
overflow:hidden;
@include cs-word-break;
}
.page {
@include uc-cal;
}

/* POSTS
--------------------------------------------------------------*/

Expand Down Expand Up @@ -123,3 +127,7 @@ code {
width: 50%;
}



/* In Page Calendars */

7 changes: 4 additions & 3 deletions sass/nav.scss
Expand Up @@ -173,7 +173,7 @@ $nav-secondary-pills-active-link-hover-color: $component-active-color !
.navbar-default .navbar-brand {
height:auto;
float:none;
margin-right:110px;
margin-right:130px;
font:500 18px "Proxima Nova", Helvetica, Arial, sans-serif;
color:black;
}
Expand All @@ -190,8 +190,9 @@ $nav-z: 9999;
z-index:$nav-z;
#site-navigation {
z-index:$nav-z;
& * {
z-index:$nav-z;

.dropdown-menu{
z-index:$nav-z;
}
}
}
Expand Down
10 changes: 2 additions & 8 deletions sass/titlebar.scss
Expand Up @@ -50,7 +50,7 @@
letter-spacing: 1px;
}
#uc-site-header #uc-site-title {
padding-bottom:30px;
padding-bottom:20px;
}
#uc-site-header #uc-site-title a {
font-weight:500;
Expand All @@ -63,14 +63,8 @@

.form-group {
width:100%;
.search {
.form-control {
width:150px;


&:focus {
width:300px;
transition:all 2s ease;
}
}
}

Expand Down
120 changes: 108 additions & 12 deletions sass/variables.scss
Expand Up @@ -9,6 +9,8 @@ $contentPadding: 1em;





/* == Nav */

$nav-secondary-border-color: #ccc !default;
Expand All @@ -35,21 +37,22 @@ $nav-secondary-active-link-hover-color: $component-active-color !defaul
/* == Widgets */

$widget-border-color: #ccc !default;
$widget-border-radius: $border-radius-base !default;
$widget-border-radius: $border-radius-base !default;
$widget-border-width: 1px !default;
$widget-margin: 0 0 1.5em 0 !default;
$widget-padding: none !default;
$widget-bg: #fff !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-link-color: $link-color !default;
$widget-link-hover: $link-hover-color !default;

$widget-head-bg: $widget-bg !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-padding: .5em .5em .5em 1em !default;
$widget-head-size: $widget-size !default;

/* Sepcific Widgets */
Expand All @@ -65,9 +68,9 @@ $uc-ecw-day-color: #333 !default;

$footers-margin: 1.5em 0 0 0 !default;
$footers-bg: #eee !default;
$footers-color: #000 !default;
$footers-link-color: blue !default;
$footers-link-hover: red !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;
Expand All @@ -82,4 +85,97 @@ $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;;
$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;

.uc-cal-event-date {
border:none;
width:33px;
left:0;

.uc-cal-event-month {
height:auto;
padding:.4em;
font-size:.7em;
background-color:$uc-ecw-month-bg;
color:$uc-ecw-month-color;
}

.uc-cal-event-day {
padding:.4em;
height:auto;
background-color:$uc-ecw-day-bg;
color:$uc-ecw-day-color;
font-size:.8em;
}
}
.uc-cal-event-title {
color: $widget-link-color;
}
.uc-cal-event-time {
color: $widget-link-color;
opacity:.6;
}
&:hover {
.uc-cal-event-title {
color: $widget-link-hover;
}
.uc-cal-event-time {
color: $widget-link-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;
}

.uc-cal-event-title {
display:block;
color: $widget-link-color;
}

&:hover {
.uc-cal-event-title {
color: $widget-link-hover;
}
.uc-cal-event-time {
color: $widget-link-hover;
}
}
}
}
}
}
}



0 comments on commit 92ecf20

Please sign in to comment.