Permalink
Browse files

STUDIO-45: Responsive styles

  • Loading branch information...
1 parent d333e37 commit 335492489866cc04aac387ff75f8d9b8d119d664 @abledaccess abledaccess committed Jan 10, 2012
View
@@ -1 +1,2 @@
wp-config.php
+.DS_Store
View
@@ -1,10 +1,8 @@
<?php get_header(); ?>
- <div id="content-container" class="fl-clearfix fl-col-mixed2 fl-push">
-
-<?php get_sidebar("non-index"); ?>
-
- <section id="nav:content" class="fl-clearfix fl-col-main" role="main">
+ <section id="nav:content" class="main fl-clearfix fl-col-main" role="main">
+ <!-- This is where the Table of Contents will be displayed -->
+ <div class="flc-toc-tocContainer toc"></div><!-- /.flc-tocContainer -->
<article id="404" class="fl-centered">
<h1>Page not found</h1>
@@ -16,6 +14,4 @@
</section><!-- /#nav:content -->
<?php get_footer(); ?>
-
- </div><!-- /#content-container -->
View
@@ -1,41 +1,36 @@
<?php get_header(); ?>
- <div id="content-container" class="fl-clearfix fl-col-mixed2 fl-push">
-
-<?php get_sidebar("non-index"); ?>
-
- <section id="nav:content" class="fl-clearfix fl-col-main" role="main">
-
- <!-- This is where the Table of Contents will be displayed -->
- <div class="flc-toc-tocContainer toc"> </div>
+ <section id="nav:content" class="main fl-clearfix fl-col-main" role="main">
+ <!-- This is where the Table of Contents will be displayed -->
+ <div class="flc-toc-tocContainer toc"></div><!-- /.flc-tocContainer -->
<?php if (have_posts()) : ?>
<?php $post = $posts[0]; // hack: set $post so that the_date() works ?>
<?php if (is_category()) { ?>
- <h1>Archive for the &quot;<?php single_cat_title(); ?>&quot; Category</h1>
+ <h1 class="archive-title">Archive for the &quot;<?php single_cat_title(); ?>&quot; Category</h1>
<?php if (strlen(trim(category_description())) > 0 && trim(category_description()) != "<br />") {
echo category_description();
}
?>
<?php } elseif(is_tag()) { ?>
- <h1>Posts Tagged &quot;<?php single_tag_title(); ?>&quot;</h1>
+ <h1 class="archive-title">Posts Tagged &quot;<?php single_tag_title(); ?>&quot;</h1>
<?php } elseif (is_day()) { ?>
- <h1>Archive for <?php the_time('F jS, Y'); ?></h1>
+ <h1 class="archive-title">Archive for <?php the_time('F jS, Y'); ?></h1>
<?php } elseif (is_month()) { ?>
- <h1>Archive for <?php the_time('F, Y'); ?></h1>
+ <h1 class="archive-title">Archive for <?php the_time('F, Y'); ?></h1>
<?php } elseif (is_year()) { ?>
- <h1>Archive for <?php the_time('Y'); ?></h1>
+ <h1 class="archive-title">Archive for <?php the_time('Y'); ?></h1>
<?php } elseif (is_author()) { ?>
- <h1>Author Archive</h1>
+ <h1 class="archive-title">Author Archive</h1>
<?php } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
- <h1>Blog Archives</h1>
+ <h1 class="archive-title">Blog Archives</h1>
<?php } ?>
<?php query_posts($query_string); ?>
@@ -70,5 +65,3 @@
<?php get_footer(); ?>
- </div><!-- /#content-container -->
-
View
@@ -1,12 +1,14 @@
-
- <footer class="footer" role="contentinfo">
- &copy; <?= date('Y'); ?> OCAD University — <a href="#nav:page-top" title="Return to the top of this page">Top</a>
-
- <!-- Required for wordpress to put in the admin bar at the top! -->
- <?php wp_footer(); ?>
+ <footer class="contentinfo fl-centered" role="contentinfo">
+ <div class="colophon">
+ &copy; <?= date('Y'); ?> OCAD University &mdash; <a href="/about/">About Fluid Studios</a> &mdash; <a href="#nav:page-top" title="Return to the top of this page">TOP</a>
+ </div><!-- /.colophon -->
+
+ <!-- Required for wordpress to put in the admin bar at the top! -->
+ <?php wp_footer(); ?>
- </footer>
+ </footer>
+ </div><!-- /.wrapper -->
</body>
View
@@ -10,6 +10,9 @@
// The number of characters for content excerpt on the index page
if ( ! defined("FL_MAX_WORDS_IN_EXCERPT") ) define("FL_MAX_WORDS_IN_EXCERPT", 20);
+// The maximum number of characters in the "new post" page, "title" field
+if ( ! defined("FL_MAX_CHARS_IN_TITLE") ) define("FL_MAX_CHARS_IN_TITLE", 80);
+
// The size of the featured image on the index page
if ( ! defined("FL_THUMBNAIL_WIDTH") ) define("FL_THUMBNAIL_WIDTH", 240);
if ( ! defined("FL_THUMBNAIL_HEIGHT") ) define("FL_THUMBNAIL_HEIGHT", 160);
@@ -48,13 +51,6 @@ function fl_admin_footer() {
}
add_filter('admin_footer_text', 'fl_admin_footer');
-// Customize the WP admin interface styles.
-function fl_custom_admin_css() {
- echo '<link rel="stylesheet" type="text/css" href="' . get_bloginfo( 'template_url', 'display' ) . '/style-admin.css" media="all" />
-';
-}
-add_action('admin_head', 'fl_custom_admin_css');
-
// Build an HTML link for a tag
function fl_tag_link($aTag) {
$tag_link = get_tag_link($aTag->term_id);
@@ -92,4 +88,5 @@ function fl_tags_summary($tagList) {
return $html;
}
+
?>
View
@@ -1,6 +1,6 @@
<!DOCTYPE html>
-<html id="studios" class="no-js" <?php language_attributes(); ?>>
+<html id="fluid-studios" class="no-js" <?php language_attributes(); ?>>
<head>
@@ -19,36 +19,34 @@
<?php } ?>
<meta name="viewport" content="initial-scale=1.0, width=device-width" />
-<?php $template_url = get_bloginfo( 'template_url', 'display' ); ?>
-<link rel="shortcut icon" href="<?php echo $template_url; ?>/favicon.ico" type="image/x-icon" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/framework/fss/css/fss-reset-global.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/framework/fss/css/fss-layout.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/framework/fss/css/fss-text.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/components/uiOptions/css/FatPanelUIOptions.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/framework/fss/css/fss-reset-global.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/framework/fss/css/fss-layout.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/framework/fss/css/fss-text.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/components/uiOptions/css/fss/fss-theme-bw-uio.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/components/uiOptions/css/fss/fss-theme-wb-uio.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/components/uiOptions/css/fss/fss-theme-by-uio.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/components/uiOptions/css/fss/fss-theme-yb-uio.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/components/uiOptions/css/fss/fss-text-uio.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/components/uiOptions/css/fss/fss-theme-bw-uio.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/components/uiOptions/css/fss/fss-theme-wb-uio.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/components/uiOptions/css/fss/fss-theme-by-uio.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/components/uiOptions/css/fss/fss-theme-yb-uio.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/components/uiOptions/css/fss/fss-text-uio.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/lib/jquery/ui/css/fl-theme-hc/hc.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/lib/jquery/ui/css/fl-theme-hci/hci.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/lib/jquery/ui/css/fl-theme-by/by.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/lib/jquery/ui/css/fl-theme-yb/yb.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/lib/jquery/ui/css/fl-theme-hc/hc.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/lib/jquery/ui/css/fl-theme-hci/hci.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/lib/jquery/ui/css/fl-theme-by/by.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/infusion/lib/jquery/ui/css/fl-theme-yb/yb.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/infusion/components/uiOptions/css/FatPanelUIOptions.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/style.css" media="all" />
-<link rel="stylesheet" type="text/css" href="<?php echo $template_url; ?>/style-media.css" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('stylesheet_url'); ?>" media="all" />
+<link rel="stylesheet" type="text/css" href="<?php bloginfo('template_url'); ?>/css/media-queries.css" media="all" />
-<script type="text/javascript" src="<?php echo $template_url; ?>/infusion/MyInfusion.js"></script>
-<script type="text/javascript" src="<?php echo $template_url; ?>/js/fluid-studios.js"></script>
+<script type="text/javascript" src="<?php bloginfo('template_url'); ?>/infusion/MyInfusion.js"></script>
+<script type="text/javascript" src="<?php bloginfo('template_url'); ?>/js/modernizr.js"></script>
<title><?php if (function_exists('is_tag') && is_tag()) { single_tag_title("Tag Archive for &quot;"); echo'&quot; &mdash; '; } elseif (is_archive()) { wp_title(''); echo ' Archive &mdash; '; } elseif (is_search()) { echo 'Search for &quot;'.esc_html($s).'&quot; &mdash; '; } elseif (!(is_404()) && (is_single()) || (is_page())) { wp_title(''); echo ' &mdash; '; } elseif (is_404()) { echo '404 Error &mdash; Page not found &mdash; '; } if (is_home()) { bloginfo('name'); echo ' &mdash; '; bloginfo('description'); } else { bloginfo('name'); } ?><?php if ($paged>1) { echo ' &mdash; page '. $paged; } ?></title>
-<link rel="shortcut icon" href="<?php echo $template_url; ?>/favicon.ico" type="image/x-icon" />
-<link rel="apple-touch-icon" href="<?php echo $template_url; ?>/apple-touch-icon.png"/>
-
+<link rel="shortcut icon" href="<?php bloginfo('template_url'); ?>/favicon.ico" type="image/x-icon" />
+<link rel="apple-touch-icon" href="<?php bloginfo('template_url'); ?>/apple-touch-icon.png"/>
+
<link rel="alternate" type="text/xml" title="<?php bloginfo('name'); ?> RSS 0.92 Feed" href="<?php bloginfo('rss_url'); ?>">
<link rel="alternate" type="application/atom+xml" title="<?php bloginfo('name'); ?> Atom Feed" href="<?php bloginfo('atom_url'); ?>">
<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS 2.0 Feed" href="<?php bloginfo('rss2_url'); ?>">
@@ -76,27 +74,39 @@
<script type="text/javascript">
// Instantiate the UI Enhancer component, specifying the table of contents' template URL
fluid.pageEnhancer({
- tocTemplate: "<?php echo $template_url; ?>/infusion/components/tableOfContents/html/TableOfContents.html",
+ tocTemplate: "<?php bloginfo('template_url'); ?>/infusion/components/tableOfContents/html/TableOfContents.html",
classnameMap: {
theme: {
"default": "fls-theme"
}
- },
- listeners: {
- modelChanged: fls_hide_background
}
});
// Start up UI Options
fluid.uiOptions.fatPanel(".flc-uiOptions-fatPanel", {
- prefix: "<?php echo $template_url; ?>/infusion/components/uiOptions/html/",
- slidingPanel: {
+ prefix: "<?php bloginfo('template_url'); ?>/infusion/components/uiOptions/html/",
+ slidingPanel: {
options: {
strings: {
showText: "Show Display Preferences",
hideText: "Hide Display Preferences"
}
}
- }
+ }
});
</script>
+
+ <div class="wrapper">
+ <header class="banner" role="banner">
+ <div class="masthead fl-centered fl-clearfix">
+ <div class="fls-logo fl-push">
+ <a href="/" title="Go Home" class="fl-hidden-replace" rel="home">Fluid Studios</a>
+ </div><!-- /.fls-logo -->
+ <nav class="access">
+ <ul>
+ <li class="fls-loginout-link"><a href="/wp-login.php">Log in</a></li>
+ <?php if(is_single()) echo('<li class="fls-back-link"><a href="javascript: void();" onclick="javascript: window.history.back();" title="Go Back">Back</a></li>'); ?>
+ </ul>
+ </nav><!-- /.access -->
+ </div><!-- /.masthead -->
+ </header><!-- /.banner -->
View
No changes.
@@ -1,6 +1,3 @@
<div class="fls-logo fl-push">
<a href="<?php echo esc_url(get_home_url()); ?>" title="Fluid Studios logo" class="fl-hidden-replace">Fluid Studios</a>
</div>
-<div class="fls-loginout-link fl-push">
- <?php wp_loginout(); ?>
-</div>
@@ -1,4 +1,4 @@
- <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <article id="post-<?php the_ID(); ?>" <?php post_class('index-summary'); ?>>
<header>
<div class="fs-post-thumbnail">
<a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'fluid-studios' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php
@@ -7,12 +7,11 @@
the_post_thumbnail();
} else {
// the current post lacks a thumbnail, display the default picture
- echo '<img alt="Featured image is missing" src="' . get_stylesheet_directory_uri() .'/images/placeholder.jpg" width="' . FL_THUMBNAIL_WIDTH . '" />';
+ echo '<img alt="Featured image is missing" src="' . get_stylesheet_directory_uri() .'/images/placeholder.jpg" />';
}
?></a>
</div>
<h2 class="entry-title"><a href="<?php the_permalink() ?>" rel="bookmark" title="Direct Link to <?php the_title_attribute(); ?>"><?php echo the_title('', '', false); ?></a></h2>
- <time class="entry-meta" datetime="<?php the_time('Y-m-d') ?>" pubdate="pubdate" class="updated"><?php the_time('F j, Y') ?></time>
</header>
<section class="entry-content">
<?php echo the_excerpt(); ?>
View
@@ -1,45 +1,37 @@
<?php get_header(); ?>
- <div id="content-container" class="fl-clearfix fl-col-mixed2 fl-push">
-
-<?php get_sidebar(); ?>
-
- <section id="nav:content" role="main">
- <div class="fl-clearfix fl-col-main">
-
- <!-- This is where the Table of Contents will be displayed -->
- <div class="flc-toc-tocContainer toc"> </div>
-
- <ul class="fl-grid">
- <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
-
- <li><?php include (TEMPLATEPATH . '/inc/single-post-summary.php' ); ?></li>
-
- <?php endwhile; ?>
- </ul>
-
- <?php
- $next_posts = get_next_posts_link('&laquo; Older articles');
- $prev_posts = get_previous_posts_link('Newer articles &raquo;');
- if( $next_posts || $prev_posts ) { ?><nav id="next-prev-links">
- <ul class="fl-container-flex fl-clearfix">
- <?php if( $next_posts ) echo '<li class="alignleft">'.$next_posts.'</li>'; ?>
-
- <?php if( $prev_posts ) echo '<li class="alignright">'.$prev_posts.'</li>'; ?>
-
- </ul>
- </nav><!-- /#next-prev-links -->
- <?php } ?>
-
- <?php else : ?>
-
- <?php include (TEMPLATEPATH . '/inc/not-found.php' ); ?>
-
- <?php endif; ?>
-
- </div>
- </section><!-- /#nav:content -->
-
- <?php get_footer(); ?>
-
- </div><!-- /#content-container -->
+ <section id="nav:content" class="main fl-clearfix fl-centered fl-col-main" role="main">
+ <!-- This is where the Table of Contents will be displayed -->
+ <div class="flc-toc-tocContainer toc"></div><!-- /.flc-tocContainer -->
+
+ <ul class="fl-grid">
+ <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
+
+ <li><?php include (TEMPLATEPATH . '/inc/single-post-summary.php' ); ?></li>
+
+ <?php endwhile; ?>
+ </ul>
+
+ <?php
+ $next_posts = get_next_posts_link('&laquo; Older articles');
+ $prev_posts = get_previous_posts_link('Newer articles &raquo;');
+ if( $next_posts || $prev_posts ) { ?>
+ <nav id="next-prev-links">
+ <ul class="fl-container-flex fl-clearfix">
+ <?php if( $next_posts ) echo '<li class="alignleft">'.$next_posts.'</li>'; ?>
+
+ <?php if( $prev_posts ) echo '<li class="alignright">'.$prev_posts.'</li>'; ?>
+
+ </ul>
+ </nav><!-- /#next-prev-links -->
+ <?php } ?>
+
+ <?php else : ?>
+
+ <?php include (TEMPLATEPATH . '/inc/not-found.php' ); ?>
+
+ <?php endif; ?>
+
+ </section><!-- /#nav:content -->
+
+<?php get_footer(); ?>
@@ -1,39 +0,0 @@
-/*
-Copyright 2011 OCAD University
-
-Licensed under the Educational Community License (ECL), Version 2.0 or the New
-BSD license. You may not use this file except in compliance with one these
-Licenses.
-
-You may obtain a copy of the ECL 2.0 License and BSD License at
-https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
-*/
-
-// Declare dependencies
-/*global jQuery*/
-
-// JSLint options
-/*jslint white: true, funcinvoke: true, undef: true, newcap: true, nomen: true, regexp: true, bitwise: true, browser: true, forin: true, maxerr: 100, indent: 4 */
-
-(function ($) {
- var fls_go_back = function () {
- history.back(-1);
- return false;
- };
-
- $(document).ready(function() {
- $("#flsc-go-back-link").click(fls_go_back);
- });
-
-
- fls_hide_background = function (newModel, oldModel, changeRequest) {
- if (newModel.theme !== oldModel.theme) {
- if (newModel.theme === "default") {
- $("html").removeClass("fs-no-background");
- } else {
- $("html").addClass("fs-no-background");
- }
- }
- };
-
-})(jQuery);
Oops, something went wrong.

0 comments on commit 3354924

Please sign in to comment.