Permalink
Browse files

kind of got ie rendering, some other changes

  • Loading branch information...
1 parent 9149608 commit bb15449c6030bcb9b5fe3fa64a51bbd0ff44cfe4 @jywarren committed Dec 10, 2011
@@ -1,9 +1,11 @@
-#header {
- display:none;
+#header,#content {
+ clear:both;
}
#iewarning {
display:block;
background:#fcc;
border:2px solid red;
padding:10px;
+ margin-bottom:10px;
}
+
@@ -0,0 +1,30 @@
+jQuery.fn.absolutize = function()
+{
+ return this.each(function()
+ {
+ var element = jQuery(this);
+ if (element.css('position') == 'absolute')
+ {
+ return element;
+ }
+
+ var offsets = element.offset();
+ var top = offsets.top;
+ var left = offsets.left;
+ var width = element[0].clientWidth;
+ var height = element[0].clientHeight;
+
+ element._originalLeft = left - parseFloat(element.css("left") || 0);
+ element._originalTop = top - parseFloat(element.css("top") || 0);
+ element._originalWidth = element.css("width");
+ element._originalHeight = element.css("height");
+
+ element.css("position", "absolute");
+ element.css("top", top + 'px');
+ element.css("left", left + 'px');
+ element.css("width", width + 'px');
+ element.css("height", height + 'px');
+ return element;
+
+ });
+}
@@ -0,0 +1,44 @@
+@font-face {
+ font-family: Prociono;
+ src: url("/fonts/prociono.ttf");
+ src: url("/fonts/prociono.eot");
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: Junction;
+ src: url("/fonts/junction.ttf");
+ src: url("/fonts/junction.eot");
+ font-weight: normal;
+ font-style: normal;
+}
+
+hr {
+ background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x bottom;
+}
+.sidebar {
+ background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAECAYAAABLLYUHAAAABHNCSVQICAgIfAhkiAAAABFJREFUCJljYICA/wzoDNwCAGHSA/39bYdFAAAAAElFTkSuQmCC") repeat-y right;
+}
+.sidebar .views-row {
+ background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x bottom;
+}
+
+.region-sidebar-second {
+ background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAECAYAAABLLYUHAAAABHNCSVQICAgIfAhkiAAAABFJREFUCJljYICA/wzoDNwCAGHSA/39bYdFAAAAAElFTkSuQmCC") repeat-y left;
+}
+.section, .region-sidebar-first .section {
+ background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x bottom;
+}
+#content-area ul.links {
+ background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x top;
+}
+#content .views-row {
+ background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x bottom;
+}
+#content-area .places-grid .views-row {
+ background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x top;
+}
+#attachments th {
+ background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x top;
+}
@@ -5,22 +5,6 @@ html {
#iewarning {display:none;}
-@font-face {
- font-family: Prociono;
- src: url("/fonts/prociono.ttf");
- src: url("/fonts/prociono.eot");
- font-weight: normal;
- font-style: normal;
-}
-
-@font-face {
- font-family: Junction;
- src: url("/fonts/junction.ttf");
- src: url("/fonts/junction.eot");
- font-weight: normal;
- font-style: normal;
-}
-
body {
font-family: lucida grande,lucida sans console,sans-serif;
margin:10px auto;
@@ -30,7 +14,6 @@ hr {
height:5px;
border:none;
margin:10px 0;
- background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x bottom;
}
p {
@@ -49,6 +32,9 @@ fieldset table, fieldset{
font-size:10px;
}
+.floatright { float:right; }
+.box { padding:6px 14px; border:1px solid #bbb; margin:10px; }
+
#content form fieldset {
width:auto;
}
@@ -139,6 +125,21 @@ h2 a {
font-weight:bold;
}
+#footer, #content {
+ clear:both;
+}
+
+.clearfix:after {
+content: ".";
+display: block;
+height: 0;
+clear: both;
+visibility: hidden;
+}
+.clearfix {
+min-height: 1%;
+}
+
.block-search h2 {
margin-bottom:8px;
}
@@ -217,6 +218,17 @@ ul.large {
margin-right:0;
margin-left:8px;
}
+#links .sublinkContainer {
+ position:relative;
+}
+#links .sublink {
+ position:absolute;
+}
+#links .sublink a {
+ margin:0;
+ display:block;
+ clear:left;
+}
#header {
clear:both;
@@ -281,7 +293,6 @@ div.widget {
.sidebar {
padding-left:0;
- background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAECAYAAABLLYUHAAAABHNCSVQICAgIfAhkiAAAABFJREFUCJljYICA/wzoDNwCAGHSA/39bYdFAAAAAElFTkSuQmCC") repeat-y right;
}
.sidebar h2 {
@@ -300,7 +311,6 @@ div.widget {
font-size:10px;
}
.sidebar .views-row {
- background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x bottom;
padding-bottom:10px;
}
.sidebar .view-content .views-row-last {
@@ -321,9 +331,6 @@ div.widget {
padding-bottom:20px;
}
-.region-sidebar-second {
- background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAECAYAAABLLYUHAAAABHNCSVQICAgIfAhkiAAAABFJREFUCJljYICA/wzoDNwCAGHSA/39bYdFAAAAAElFTkSuQmCC") repeat-y left;
-}
.block .content {
padding:0;
}
@@ -334,7 +341,6 @@ div.widget {
.section, .region-sidebar-first .section {
padding:0 10px 10px 0;
- background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x bottom;
}
#content .section {
@@ -459,7 +465,6 @@ div.widget {
padding:8px 0;
margin-top:8px;
margin-right:8px;
- background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x top;
}
#content-area ul.links li {
display:block;
@@ -483,7 +488,6 @@ div.widget {
#content .views-row {
padding-bottom:8px;
- background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x bottom;
margin-bottom:8px;
}
@@ -683,10 +687,12 @@ div.messages {
#content .view-Notes .views-row .views-field-body,
#content .view-Notes .views-row .views-field-view-node,
#content .view-Notes .views-row .views-field-tid,
-#content .view-Notes .views-row .views-label-name {
+#content .view-Notes .views-row .views-label-name,
+#content .view-Notes .views-row .views-field-created {
font-size:11px;
}
-#content .view-Notes .views-row .views-field-timestamp {
+#content .view-Notes .views-row .views-field-timestamp,
+#content .view-Notes .views-row .views-field-created {
color:#555;
}
#content .view-Notes .views-row .views-field-body {
@@ -858,7 +864,6 @@ div.messages {
font-size:10px;
float:left;
padding-right:10px;
- background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x top;
padding-top:12px;
}
@@ -882,7 +887,6 @@ div.messages {
#attachments th {
width:100%;
padding-top:12px;
- background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAABHNCSVQICAgIfAhkiAAAABJJREFUCJljYECA/wxYOP8xZABf0wP96WTlbgAAAABJRU5ErkJggg==") repeat-x top;
font-family:Junction, lucida grande,lucida sans console,sans-serif;
font-size:14px;
font-weight:normal;
@@ -902,6 +906,10 @@ div.messages {
top: 0;
left: 0
}
+.page-home #slider h2 {
+ font-size:1.6em;
+}
+
.slider_text {
position:absolute;
left:20px;
@@ -934,3 +942,4 @@ div.messages {
}
.page-dashboard div {
}
+
@@ -52,6 +52,7 @@ conditional-stylesheets[if lte IE 6][all][] = css/ie6.css
; Optionally add some JavaScripts to your theme.
; scripts[] = js/script.js
+scripts[] = js/absolutize.js
; The regions defined in Zen's default page.tpl.php file. The name in
; brackets is the name of the variable in the page.tpl.php file, (e.g.
@@ -117,29 +117,44 @@
<META NAME="description" CONTENT="The Public Laboratory for Open Technology and Science (PLOTS) collaboratively develops and publicizes accessible technologies for investigating and reporting on local environmental health and justice issues. PLOTS provides an online research space for citizens, linking them to scientists, social scientists, and technologists. PLOTS is an expansion of Grassroots Mapping, where citizens use helium-filled balloons and digital cameras to generate high resolution “satellite” maps.">
<meta name="viewport" content=""/>
<?php print $head; ?>
+ <link rel="stylesheet" href="/sites/all/themes/plots/plots.css" type="text/css" media="screen" />
+ <!--[if !IE]><!--><link rel="stylesheet" href="/sites/all/themes/plots/not-ie.css" type="text/css" media="screen" /><!--<![endif]-->
+ <!--[if IE]>
+ <link rel="stylesheet" href="/sites/all/themes/plots/ie.css" type="text/css" media="screen" />
+ <![endif]-->
+ <!--[if IE 6]><link rel="stylesheet" href="/sites/all/themes/plots/ie.css" type="text/css" media="screen" /><![endif]-->
<?php print $styles; ?>
<?php print $scripts; ?>
<script src="/scripts/jquery-nivo-slider-pack.js" type="text/javascript"></script>
<link rel="stylesheet" href="/scripts/nivo-slider.css" type="text/css" media="screen" />
<link href="http://publiclaboratory.org/rss.xml" rel="alternate" type="application/rss+xml" title="The Public Laboratory" />
- <!--[if IE]><link rel="stylesheet" href="/sites/all/themes/plots/ie.css" type="text/css" media="screen" /><![endif]-->
- <!--[if IE 6]><link rel="stylesheet" href="/sites/all/themes/plots/ie.css" type="text/css" media="screen" /><![endif]-->
</head>
<body class="<?php print $classes; ?>">
- <div style="border:2px solid red;background:#fcc;padding:10px;" id="iewarning"><h2>Incompatible browser</h2><p>The Public Laboratory website is designed for use in any browser except Internet Explorer. To view it properly, please use <a href="http://firefox.com">Firefox</a>, <a href="http://google.com/chrome">Chrome</a>, or another standards-compliant browser. Support for Internet Explorer is planned, but it's a good idea for you to get another browser anyways -- IE poses a security risk for your computer.</p></div>
+ <div style="border:2px solid red;background:#fcc;padding:10px;" id="iewarning"><p><h2>Incompatible browser</h2>
+The Public Laboratory website is designed for use in any browser except Internet Explorer. To view it properly, please use <a href="http://firefox.com">Firefox</a>, <a href="http://google.com/chrome">Chrome</a>, or another standards-compliant browser. Support for Internet Explorer is planned, but it's a good idea for you to get another browser anyways -- IE poses a security risk for your computer.</p></div>
<div id="page-wrapper"><div id="page">
+ <script>$('placeHeader').absolutize();</script>
+
<div id='links'>
<a href="/">PLOTS</a>
<a href="/about">About</a>
- <a href="/places">Places</a>
- <a href="/notes">Updates</a>
+ <a href="/places" onMouseOver="$('#placeHeader').show()" onMouseOut="$('#placeHeader').hide()">Places</a>
+ <div class="sublink" style="display:none;" id="placeHeader">
+ <div class="sublinkContainer">
+ <a href="/place/new-york-city">New York</a>
+ <a href="/place/gulf-coast">Gulf Coast</a>
+ <a href="/place/somerville">Somerville</a>
+ <a href="/place/providence">Providence</a>
+ <a href="/place/butte">Butte</a>
+ </div>
+ </div>
+ <a href="/notes">Research notes</a>
<a href="/archive">Archive</a>
<a href="/tools">Tools</a>
<a href="/events">Events</a>
- <a href="/explore">Explore</a>
<div class="right">
<a href="/note/add">Note [+]</a>
</div>
@@ -215,8 +230,10 @@
</div></div> <!-- /#main, /#main-wrapper -->
+ <p class="clearfix"></p>
+
<?php if ($footer || $footer_message || $secondary_links): ?>
- <div id="footer"><div class="section">
+ <div id="footer" class="clearfix"><div class="section">
<?php print theme(array('links__system_secondary_menu', 'links'), $secondary_links,
array(

0 comments on commit bb15449

Please sign in to comment.