Skip to content

Commit

Permalink
working mediaqueries for containers
Browse files Browse the repository at this point in the history
  • Loading branch information
Will Moritz authored and Rona Kilmer committed Apr 16, 2013
1 parent 5bd3b9e commit 03f6ace
Show file tree
Hide file tree
Showing 13 changed files with 261 additions and 66 deletions.
Empty file added .htaccess
Empty file.
23 changes: 19 additions & 4 deletions assets/css/masthead.css
@@ -1,14 +1,14 @@
/** Masthead/Header
*
*
* Masthead used for the CSS but we are
* calling it "header" where the user sees
* most people won't know the term "masthead"
*
* Default colors here will be over ridden by
* the ones choosen in the color settings
*
*
* These styles are loaded for the front-end and admin-settings screen
*
*
-------------------------------------------------- */

/** Featured Posts
Expand Down Expand Up @@ -55,7 +55,7 @@
top: 0;
z-index: 10;
}
.featured-description,
.featured-description,
.featured-description p {
font-size: 14px;
line-height: 20px;
Expand Down Expand Up @@ -162,4 +162,19 @@
background-color: rgb(153,153,153); /* fallback for IE */
background-color: rgba(153,153,153,.9);
color: #333;
}

/** Img archive
-------------------------------------------------- */

.img-archive {
background-color: #fff;
border: none;
margin: 0 15px;
}

.img-archive-container {
width: 1020px; /* 990 + 2*15px */
text-align: center;
margin: auto;
}
12 changes: 12 additions & 0 deletions assets/css/media-big-screen.css
Expand Up @@ -78,4 +78,16 @@ This file should be included in built css file when in production mode.
}
#nav-main ul {
text-align: right;
}

/* img-archive page */

.img-archive-container {
width: 1050px; /* 990 + 30*2 */
}

.img-archive {
background-color: #fff;
border: none;
margin: 0 15px;
}
19 changes: 19 additions & 0 deletions assets/css/media-mobile.css
Expand Up @@ -335,6 +335,15 @@ iPad (portrait) 768
#social .social-items-comments {
max-width: 280px;
}

.img-archive-container {
width: 300px;
}

.img-archive {
display: block;
margin: 0;
}
}

/* iPhone Landscape */
Expand Down Expand Up @@ -410,4 +419,14 @@ iPad (portrait) 768
margin: 0 auto 30px;
max-width: 310px;
}

/* Image archive pages */

.img-archive-container {
width: 475px; /* 460 + 2*7.5px */
}

.img-archive {
margin: 0 7.5px;
}
}
12 changes: 12 additions & 0 deletions assets/css/media-tablet.css
Expand Up @@ -125,4 +125,16 @@ iPad (portrait) 768
#social .social-items-comments {
max-width: 568px;
}

/* img-archive page */

.img-archive-container {
width: 723px; /* 708px + 2*7.5 */
}

.img-archive {
background-color: #fff;
border: none;
margin: 0 7.5px;
}
}
2 changes: 1 addition & 1 deletion excerpt/feed-format-image.php
Expand Up @@ -12,7 +12,7 @@
* **********************************************************************
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* **********************************************************************
*/

Expand Down
16 changes: 9 additions & 7 deletions excerpt/format-image.php
Expand Up @@ -12,7 +12,7 @@
* **********************************************************************
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* **********************************************************************
*/

Expand All @@ -21,22 +21,24 @@
if (CFCT_DEBUG) { cfct_banner(__FILE__); }

?>
<article id="post-excerpt-<?php the_ID() ?>" <?php post_class('excerpt clearfix'); ?>>
<div class="entry-header">
<h1 class="entry-title"><a href="<?php the_permalink() ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'favepersonal' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title() ?></a></h1>
<time class="entry-date" datetime="<?php the_time('c'); ?>" pubdate><a href="<?php the_permalink(); ?>"><?php echo cfcp_date(); ?></a></time>
</div>
<article id="post-excerpt-<?php the_ID() ?>" <?php post_class('excerpt clearfix featured img-archive'); ?>>

<?php if ( has_post_thumbnail() ) { ?>
<?php } ?>
<div class="entry-content">
<?php
if ( has_post_thumbnail() ) {
?>
<div class="entry-media">
<a href="<?php the_permalink() ?>"><?php the_post_thumbnail('medium-img'); ?></a>
<!-- <div class="entry-header">
<h1 class="entry-title"><a href="<?php the_permalink() ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'favepersonal' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title() ?></a></h1>
<time class="entry-date" datetime="<?php the_time('c'); ?>" pubdate><a href="<?php the_permalink(); ?>"><?php echo cfcp_date(); ?></a></time>
</div> -->
</div>
<?php
}
the_excerpt();
?>
</div>
<?php cfct_misc('entry-meta-excerpts'); ?>
</article>
40 changes: 40 additions & 0 deletions excerpt/format-imageTHEREALONE
@@ -0,0 +1,40 @@
<?php

/**
* @package favepersonal
*
* This file is part of the FavePersonal Theme for WordPress
* http://crowdfavorite.com/wordpress/themes/favepersonal/
*
* Copyright (c) 2008-2012 Crowd Favorite, Ltd. All rights reserved.
* http://crowdfavorite.com
*
* **********************************************************************
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* **********************************************************************
*/


if (__FILE__ == $_SERVER['SCRIPT_FILENAME']) { die(); }
if (CFCT_DEBUG) { cfct_banner(__FILE__); }

?>
<article id="post-excerpt-<?php the_ID() ?>" <?php post_class('excerpt clearfix'); ?>>
<div class="entry-header">
<h1 class="entry-title"><a href="<?php the_permalink() ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'favepersonal' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title() ?></a></h1>
<time class="entry-date" datetime="<?php the_time('c'); ?>" pubdate><a href="<?php the_permalink(); ?>"><?php echo cfcp_date(); ?></a></time>
</div>
<?php if ( has_post_thumbnail() ) { ?>
<?php } ?>
<div class="entry-content">
<div class="entry-media">
<a href="<?php the_permalink() ?>"><?php the_post_thumbnail('medium-img'); ?></a>
</div>
<?php
the_excerpt();
?>
</div>
<?php cfct_misc('entry-meta-excerpts'); ?>
</article>

0 comments on commit 03f6ace

Please sign in to comment.