summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Quinn2012-12-10 21:41:57 (GMT)
committer John Quinn2012-12-10 21:41:57 (GMT)
commit098adbca581a111d2ac3cddfb23800362090889a (patch)
tree6745ac7d7af36f484221e1312d03ea8853f3215d
parent7853feecb4d6c1a89f01adde8cf0515863b2c85f (diff)
Clean-up for beta release. Added changes from Issues #1835960 and #1838602. Slightly revised HTML5 tags. Changed IE scrips to load after Drupal scripts ($scripts).7.x-1.0-beta1
-rw-r--r--css/layout.css15
-rw-r--r--css/style.css1
-rw-r--r--templates/comment.tpl.php4
-rw-r--r--templates/html.tpl.php2
-rw-r--r--templates/page.tpl.php21
5 files changed, 19 insertions, 24 deletions
diff --git a/css/layout.css b/css/layout.css
index 82956e2..f3bd937 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -30,15 +30,9 @@ body,
border: 1px solid #ccc;
}
#secondary-menu {
+ margin-bottom: 5px;
+ overflow: hidden;
width: 100%;
- margin: auto;
- padding-bottom: 10px;
-}
-.with-secondary-menu .region-header {
- margin-top: 3em;
-}
-.without-secondary-menu .region-header {
- margin-top: 15px;
}
#main-wrapper {
min-height: 300px;
@@ -78,7 +72,7 @@ body,
padding: 0 10px;
}
-@media all and (min-width: 560px) and (max-width:850px) {
+@media all and (min-width: 560px) and (max-width: 850px) {
#sidebar-first,
.region-triptych-first,
@@ -160,6 +154,9 @@ body,
float: left; /* LTR */
position: relative;
}
+ .no-sidebars #content {
+ width: 100%;
+ }
.two-sidebars #content {
margin-left: 25%;
margin-right: 25%;
diff --git a/css/style.css b/css/style.css
index 9c06d32..2bf80ed 100644
--- a/css/style.css
+++ b/css/style.css
@@ -175,6 +175,7 @@ a.feed-icon {
img {
max-width: 100%;
height: auto;
+ width: auto;
border: 0;
}
diff --git a/templates/comment.tpl.php b/templates/comment.tpl.php
index d5c14ab..fb96e57 100644
--- a/templates/comment.tpl.php
+++ b/templates/comment.tpl.php
@@ -59,7 +59,7 @@
?>
<article class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
- <header class="attribution">
+ <footer class="attribution">
<?php print $picture; ?>
@@ -74,7 +74,7 @@
<?php print $permalink; ?>
</p>
</div>
- </header>
+ </footer>
<div class="comment-text">
<div class="comment-arrow"></div>
diff --git a/templates/html.tpl.php b/templates/html.tpl.php
index f365b3d..a77df29 100644
--- a/templates/html.tpl.php
+++ b/templates/html.tpl.php
@@ -53,13 +53,13 @@
<meta http-equiv="cleartype" content="on" />
<title><?php print $head_title; ?></title>
<?php print $styles; ?>
+ <?php print $scripts; ?>
<!--[if (gte IE 6)&(lte IE 8)]>
<script src="<?php print $base_path . $path_to_resbartik; ?>/js/selectivizr-min.js"></script>
<![endif]-->
<!--[if lt IE 9]>
<script src="<?php print $base_path . $path_to_resbartik; ?>/js/html5-respond.js"></script>
<![endif]-->
- <?php print $scripts; ?>
</head>
<body class="<?php print $classes; ?>" <?php print $attributes;?>>
<div id="skip-link">
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index 3464731..770f735 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -89,9 +89,9 @@
?>
<div id="page-wrapper"><div id="page">
- <div id="header" class="<?php print $secondary_menu ? 'with-secondary-menu': 'without-secondary-menu'; ?>"><div class="section clearfix">
+ <header id="header" role="banner" class="<?php print $secondary_menu ? 'with-secondary-menu': 'without-secondary-menu'; ?>"><div class="section clearfix">
<?php if ($secondary_menu): ?>
- <div id="secondary-menu" class="navigation">
+ <nav id="secondary-menu" role="navigation" class="navigation">
<?php print theme('links__system_secondary_menu', array(
'links' => $secondary_menu,
'attributes' => array(
@@ -104,7 +104,7 @@
'class' => array('element-invisible'),
),
)); ?>
- </div> <!-- /#secondary-menu -->
+ </nav> <!-- /#secondary-menu -->
<?php endif; ?>
@@ -143,7 +143,7 @@
<?php print render($page['header']); ?>
<?php if ($main_menu): ?>
- <div id="main-menu" class="navigation">
+ <nav id="main-menu" role="navigation" class="navigation">
<?php print theme('links__system_main_menu', array(
'links' => $main_menu,
'attributes' => array(
@@ -156,12 +156,9 @@
'class' => array('element-invisible'),
),
)); ?>
- </div> <!-- /#main-menu -->
+ </nav> <!-- /#main-menu -->
<?php endif; ?>
-
-
-
- </div></div> <!-- /.section, /#header -->
+ </div></header> <!-- /.section, /#header -->
<?php if ($messages): ?>
<div id="messages"><div class="section clearfix">
@@ -175,7 +172,7 @@
</div></div> <!-- /.section, /#featured -->
<?php endif; ?>
- <div id="main-wrapper" class="clearfix"><div id="main" class="clearfix">
+ <div id="main-wrapper" class="clearfix"><div id="main" role="main" class="clearfix">
<?php print $breadcrumb; ?>
@@ -239,9 +236,9 @@
<?php endif; ?>
<?php if ($page['footer']): ?>
- <div id="footer" class="clearfix">
+ <footer id="footer" role="contentinfo" class="clearfix">
<?php print render($page['footer']); ?>
- </div> <!-- /#footer -->
+ </footer> <!-- /#footer -->
<?php endif; ?>
</div></div> <!-- /.section, /#footer-wrapper -->