Permalink
Browse files

Merge branch 'master' of github.com:marklogic/RunDMC

  • Loading branch information...
2 parents 566e40d + fef0211 commit e27eb78235af8584e5a8761d3615de74d14ebe63 @evanlenz evanlenz committed Sep 24, 2012
Showing with 6 additions and 3 deletions.
  1. +2 −1 apidoc/config/template.xhtml
  2. +2 −1 config/template.xhtml
  3. +2 −1 css/screen_ie.css
@@ -13,8 +13,9 @@
<link href="/css/anythingslider.css" rel="stylesheet" type="text/css" media="screen" />
<link href="/css/theme-metallic.css" rel="stylesheet" type="text/css" media="screen" />
<!--[if lte IE 8]>
- <link href="css/screen_ie.css" rel="stylesheet" type="text/css" media="screen" />
+ <link href="/css/v-2/screen_ie.css" rel="stylesheet" type="text/css" media="screen" />
<![endif]-->
+ <ml:javascript-server-config/>
<script type="text/javascript" src="/js/modernizr.js"></script>
<!-- Un-minimize for debugging
View
@@ -14,7 +14,7 @@
<link href="/css/fancybox.css" rel="stylesheet" type="text/css" media="screen,projection" />
<link href="/css/overcast/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css" media="screen" />
<!--[if lte IE 8]>
- <link href="css/screen_ie.css" rel="stylesheet" type="text/css" media="screen" />
+ <link href="/css/v-2/screen_ie.css" rel="stylesheet" type="text/css" media="screen" />
<![endif]-->
<link type="text/css" href="/stackunderflow/v-1/stackoverflow.css" rel="stylesheet" /> <!-- return to min someday -->
<ml:if href-starts-with="/try/ /learn/java /learn/rest">
@@ -26,6 +26,7 @@
<link href="/css/custom.css" rel="stylesheet" type="text/css" media="screen" />
</ml:if>
+ <ml:javascript-server-config/>
<script type="text/javascript" src="/js/modernizr.js"></script>
<script type="text/javascript" src="/js/jquery-1.7.2.min.js"></script>
View
@@ -18,7 +18,8 @@ div.intro p + a,
.lists header,
.button,
.supernode
- {behavior: url(js/PIE.htc);}
+ {behavior: url(/js/PIE.htc);}
+.button.nopie { behavior: none; }
#breadcrumb + section > h2, #content, #comments {box-shadow: 0 0 3px black;}
#comments .action {box-shadow: -1px 1px 1px #BBB;}
.post .action {box-shadow: 1px 1px 1px #BBB;}

0 comments on commit e27eb78

Please sign in to comment.