This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge branch 'johnny-STUDIO-53' into development

* johnny-STUDIO-53:
  STUDIO-53: addressed the single page link behaviour to target more specific areas on the page so linked images receive focus all the way around the images in Webkit.
  STUDIO-53: Fixed a width issue with the show preferences button in IE7 and a ToC list button issue on single pages in the individual UIO colour themes.
  STUDIO-53: Fixed a sloppy oversight in header.php.
  STUDIO-53: The original issue I needed the !important for in that I removed in my last fix seems to have persisted so I resolved it though specificity rather than use an !important.
  STUDIO-53: Removed an !important from the login button that appeared to be doing nothing in the IE8 styles and resolved a slight shift in that same button on the archive pages also in IE8.
  STUDIO-53: Fixed a minor display issue with the loginout button in IE8 and below.
  STUDIO-53: Fixed some UI issues on the archive pages.
  • Loading branch information...
Cindy Qi Li
Cindy Qi Li committed Jun 28, 2012
2 parents 9822bf0 + 79243af commit 9e1a8e19ca8423fb8ecb9e3458e20639f03dc64e
@@ -34,7 +34,7 @@ button:active {
.fl-panelBar .fl-toggleButton{
font-size:1em;
margin-right:3%;
- width:14em;
+ width:15em;
}
.fl-toggleButton.focus{
border-right:2px solid #f00;
@@ -52,7 +52,7 @@ button:active {
}
.fl-grid li{
float:left;
- min-height:21em;
+ min-height:22em;
}
.fl-grid li .fls-index-summary{
overflow:visible;
@@ -49,11 +49,11 @@ body{
float:right;
padding:0 11.038961%; /* padding-right/left 34 / 308 */
}
-.fls-logo,.single .fls-logo{
+.fls-logo,.single .fls-logo,.archive .fls-logo{
display:block;
margin:6em auto 1.25em; /*marging-top: 96 / 16, margin-bottom: 20 / 16 */
}
-.fls-access ul,.single .fls-access ul{
+.fls-access ul,.single .fls-access ul,.archive .fls-access ul{
margin:0;
padding:0;
width:auto;
@@ -62,7 +62,7 @@ body{
float:left;
margin-left:0;
}
-.fls-loginout-link a{
+.fls-loginout-link a,.single .fls-loginout-link a{
background-position:0.5em center;
color:#fff !important;
display:inline-block;
@@ -77,7 +77,7 @@ body{
white-space:nowrap;
width:auto;
}
-.fls-access ul li.fls-loginout-link,.single .fls-access ul li.fls-loginout-link{
+.fls-access ul li.fls-loginout-link,.single .fls-access ul li.fls-loginout-link,.archive .fls-access ul li.fls-loginout-link{
float:none;
margin:0;
padding:0;
@@ -8,15 +8,7 @@
<link rel="profile" href="http://gmpg.org/xfn/11" />
-<?php if(is_home() && (!$paged || $paged == 1) || is_single() || is_page()) { ?>
-<meta name="googlebot" content="index,archive,follow,noodp" />
-<meta name="robots" content="all,index,follow" />
-<meta name="msnbot" content="all,index,follow" />
-<?php } else { ?>
-<meta name="googlebot" content="noindex,noarchive,follow,noodp" />
-<meta name="robots" content="noindex,follow" />
-<meta name="msnbot" content="noindex,follow" />
-<?php } ?>
+<title><?php if (function_exists('is_tag') && is_tag()) { single_tag_title("Entries tagged &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>
<meta name="viewport" content="initial-scale=1.0, width=device-width" />
<?php $template_url = get_bloginfo( 'template_url', 'display' ); ?>
@@ -45,8 +37,6 @@
<script type="text/javascript" src="<?php echo $template_url; ?>/js/fluid-studios.js"></script>
<script type="text/javascript" src="<?php echo $template_url; ?>/js/modernizr.js"></script>
-<title><?php if (function_exists('is_tag') && is_tag()) { single_tag_title("Entries tagged &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"/>
@@ -55,8 +45,7 @@
<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS 2.0 Feed" href="<?php bloginfo('rss2_url'); ?>">
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>">
-<?php if ( is_singular() && get_option( 'thread_comments' ) )
- wp_enqueue_script( 'comment-reply' );
+<?php
wp_head();
?>
@@ -112,12 +101,12 @@ classnameMap: {
<<?php echo $heading_tag; ?> class="fls-logo">
<a href="<?php echo esc_url(get_home_url()); ?>" title="Fluid Studios Home" class="fl-hidden-replace" rel="home">Fluid Studios</a>
</<?php echo $heading_tag; ?>>
- <nav class="fls-access">
- <ul class="fl-clearfix">
- <li id="uioProxyButton" class="fl-toggleButton"><a href="#">Show display preferences</a></li>
+ <nav class="fls-access" role="navigation" aria-labelledby="main-menu-navigation">
+ <ul id="main-menu-navigation" class="fl-clearfix">
+ <li id="uioProxyButton" class="fl-toggleButton"><a href="#nav:page-top" title="Show display preferences">Show display preferences</a></li>
<li class="fls-loginout-link"><?php wp_loginout(); ?></li>
- <?php if(is_single()) echo('<li class="fls-back-link"><!-- Note: The id "flsc-go-back-link" is used @ js/fluid-studios.js. Synchronizing both is the key to have "back" link work. -->
- <a href="#" id="flsc-go-back-link" title="Go Back">Back<span class="fls-back-link-text"> to <span class="fls-back-link-text fluid">fluid</span><span class="fls-back-link-text studios">STUDIOS</span></span></a></li>'); ?>
+ <?php if(is_single() || is_archive()) echo('<li class="fls-back-link"><!-- Note: The id "flsc-go-back-link" is used @ js/fluid-studios.js. Synchronizing both is the key to have "back" link work. -->
+ <a href="#nav:page-top" id="flsc-go-back-link" title="Go Back">Back<span class="fls-back-link-text"> to <span class="fls-back-link-text fluid">fluid</span><span class="fls-back-link-text studios">STUDIOS</span></span></a></li>'); ?>
</ul>
<script type="text/javascript">
@@ -286,6 +286,9 @@ h1,h2,h3,h4,h5,h6,ul,ol,dl,p,table,form,pre,figure{
.toc{
font-size:1.2em;
}
+.single .entry-content a{
+ display:inline-block;
+}
.home,.archive{
color: #666666;
}
@@ -360,26 +363,34 @@ ul.fl-grid{
/* Single page styles for the base mobile theme
----------------------------------------- */
-.single .fls-logo{
+.single .fls-logo,
+.archive .fls-logo{
display:none;
}
-.single .fls-access ul{
+.single .fls-access ul,
+.archive .fls-access ul{
padding-right:4%;
width:auto;
}
.single .fls-access ul li.fls-loginout-link,
-.single .fls-access ul li.fl-toggleButton{
+.single .fls-access ul li.fl-toggleButton,
+.archive .fls-access ul li.fls-loginout-link,
+.archive .fls-access ul li.fl-toggleButton{
float:right;
margin-left:0.5em;
}
-.single .fls-access ul li.fls-back-link{
+.single .fls-access ul li.fls-back-link,
+.archive .fls-access ul li.fls-back-link{
float:left;
}
.single .fls-access ul li.fls-loginout-link a,
-.single .fls-access ul li.fl-toggleButton a{
+.single .fls-access ul li.fl-toggleButton a,
+.archive .fls-access ul li.fls-loginout-link a,
+.archive .fls-access ul li.fl-toggleButton a{
margin-bottom:0;
}
-.single .fls-access ul li.fls-back-link a{
+.single .fls-access ul li.fls-back-link a,
+.archive .fls-access ul li.fls-back-link a{
margin:0.37em 0;
}
.single .fls-main{
@@ -425,7 +436,6 @@ ul.fl-grid{
----------------------------------------- */
.fl-theme-uio-bw button:hover,.fl-theme-uio-bw a:hover {text-decoration:underline;}
.fl-theme-uio-bw a:focus {outline:2px solid #000;}
-.single.fl-theme-uio-bw a{display:inline-block;}
.fl-theme-uio-bw .fls-loginout-link, .fl-theme-uio-bw .fls-loginout-link a, .fl-theme-uio-bw .fls-back-link, .fl-theme-uio-bw .fls-back-link a, .fl-theme-uio-bw .fl-toggleButton {background-color: #000000 !important;}
.fl-theme-uio-bw .fls-loginout-link a, .fl-theme-uio-bw .fls-back-link a, .fl-theme-uio-bw .fl-toggleButton {color: #FFFFFF !important;}
.fl-theme-uio-bw button.fl-toggleButton:focus{ background-color:#fff !important; background-image:url("images/icon-uio-black.png"); color:#000 !important; outline:2px solid #000;}
@@ -449,7 +459,6 @@ ul.fl-grid{
----------------------------------------- */
.fl-theme-uio-wb button:hover,.fl-theme-uio-wb a:hover {text-decoration:underline;}
.fl-theme-uio-wb a:focus {outline:2px solid #fff;}
-.single.fl-theme-uio-wb a{display:inline-block;}
.fl-theme-uio-wb .fls-loginout-link, .fl-theme-uio-wb .fls-loginout-link a, .fl-theme-uio-wb .fls-back-link, .fl-theme-uio-wb .fls-back-link a, .fl-theme-uio-wb .fl-toggleButton { background-color: #FFFFFF !important;}
.fl-theme-uio-wb .fls-loginout-link a, .fl-theme-uio-wb .fls-back-link a, .fl-theme-uio-wb .fl-toggleButton { color: #000 !important;}
.fl-theme-uio-wb button.fl-toggleButton{ background-image:url("images/icon-uio-black.png"); }
@@ -474,7 +483,6 @@ ul.fl-grid{
----------------------------------------- */
.fl-theme-uio-by button:hover,.fl-theme-uio-by a:hover {text-decoration:underline;}
.fl-theme-uio-by a:focus {outline:2px solid #000;}
-.single.fl-theme-uio-by a{display:inline-block;}
.fl-theme-uio-by .fls-loginout-link, .fl-theme-uio-by .fls-loginout-link a, .fl-theme-uio-by .fls-back-link, .fl-theme-uio-by .fls-back-link a, .fl-theme-uio-by .fl-toggleButton { background-color: #000000 !important;}
.fl-theme-uio-by .fls-loginout-link a, .fl-theme-uio-by .fls-back-link a, .fl-theme-uio-by .fl-toggleButton { color: #FFFF00 !important;}
.fl-theme-uio-by button.fl-toggleButton{ background-image:url("images/icon-uio-yellow.png"); }
@@ -499,7 +507,6 @@ ul.fl-grid{
----------------------------------------- */
.fl-theme-uio-yb button:hover,.fl-theme-uio-yb a:hover {text-decoration:underline;}
.fl-theme-uio-yb a:focus {outline:2px solid #ff0;}
-.single.fl-theme-uio-yb a{display:inline-block;}
.fl-theme-uio-yb .fls-loginout-link, .fl-theme-uio-yb .fls-loginout-link a, .fl-theme-uio-yb .fls-back-link, .fl-theme-uio-yb .fls-back-link a, .fl-theme-uio-yb .fl-toggleButton { background-color: #FFFF00 !important;}
.fl-theme-uio-yb .fls-loginout-link a, .fl-theme-uio-yb .fls-back-link a, .fl-theme-uio-yb .fl-toggleButton { color: #000000 !important;}
.fl-theme-uio-yb button.fl-toggleButton{ background-image:url("images/icon-uio-black.png"); }
@@ -524,10 +531,9 @@ ul.fl-grid{
--------------------------------------------------------------------------- */
@media screen and (min-width:480px){
body,body.home{
- max-width:70.625em; /* 1130 / 16 */
position:relative;
}
- .home .fls-banner,.archive .fls-banner{
+ .home .fls-banner{
border-bottom:0 !important;
border-right:2px solid #fff;
margin:0;
@@ -539,31 +545,34 @@ ul.fl-grid{
padding-right:0;
width:35%; /* 168 / 480 */
}
- .home .fls-masthead,.archive .fls-masthead{
+ .home .fls-masthead{
padding:0 20%; /* padding-right/left 34 / 170 */
float:right;
}
- .home .fls-logo,.archive .fls-logo{
+ .home .fls-logo{
margin:6em auto 1.25em; /*marging-top: 96 / 16, margin-bottom: 20 / 16 */
}
.fls-access ul li.fls-loginout-link{
float:left;
margin-left:0;
}
- .home .fls-main,.archive .fls-main{
+ .home .fls-main{
padding:1.625em 0 0 40.666667%; /* margin-top: 26 / 16, margin-left: 200 / 480 */
}
- .fl-grid li .fls-index-summary{
+ .home .fl-grid li .fls-index-summary{
margin:0;
padding:0 1.5% 1.25em;
}
- .home .fls-contentinfo,.archive .fls-contentinfo{
+ .home .fls-contentinfo{
padding-left:41.666667%; /* 190 / 480 */
text-align:left;
}
}
@media screen and (min-width:620px){
+ body,body.home{
+ max-width:70.625em; /* 1130 / 16 */
+ }
.fl-panelBar .fl-toggleButton{
background-color:#09c;
background-image:url("images/icon-uio.png");
@@ -611,7 +620,7 @@ ul.fl-grid{
padding:0 11.038961%; /* padding-right/left 34 / 308 */
float:right;
}
- .fls-logo,.single .fls-logo{
+ .fls-logo,.single .fls-logo,.archive .fls-logo{
display:block;
margin:6em auto 1.25em; /*marging-top: 96 / 16, margin-bottom: 20 / 16 */
}
@@ -622,7 +631,7 @@ ul.fl-grid{
.fls-loginout-link a{
background-position:0.5em center;
color:#fff !important;
- display:inline-block;
+ display:inline-block !important;
float:none;
font-family:Arial,sans-serif;
line-height:150%;
@@ -634,7 +643,7 @@ ul.fl-grid{
white-space:nowrap;
width:auto;
}
- .fls-access ul li.fls-loginout-link,.single .fls-access ul li.fls-loginout-link{
+ .fls-access ul li.fls-loginout-link,.single .fls-access ul li.fls-loginout-link,.archive .fls-access ul li.fls-loginout-link{
float:none;
margin:0;
padding:0;

0 comments on commit 9e1a8e1

Please sign in to comment.