Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jdsimcoe committed Jul 26, 2012
1 parent 9896044 commit 54a29e5
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 12 deletions.
8 changes: 8 additions & 0 deletions www/httpdocs/workspace/themes/active/css/common.css
Expand Up @@ -7265,6 +7265,14 @@ h3 {
top: -5px;
float: left;
z-index: 1000;
height: 120px;
width: 120px;
}
.mast .container .row .span12 .logo img {
background: transparent;
-ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
zoom: 1;
}
.mast .container .row .span12 .main {
font-family: "proxima-nova-regular", "Helvetica Neue", Arial, Helvetica, sans-serif;
Expand Down
9 changes: 9 additions & 0 deletions www/httpdocs/workspace/themes/active/less/common.less
Expand Up @@ -394,6 +394,15 @@ h3 {
top: -5px;
float: left;
z-index: 1000;
height: 120px;
width: 120px;

img {
background: transparent;
-ms-filter: ~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF)";
filter: ~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF)";
zoom: 1;
}
}

.main {
Expand Down
3 changes: 2 additions & 1 deletion www/httpdocs/workspace/themes/active/xsl/template.xsl
Expand Up @@ -125,7 +125,8 @@
<div class="row">
<div class="span12">
<a href="{$root}" class="logo">
<img src="/workspace/themes/active/img/logo-big.png" width="120" height="120" />
<!-- <img src="/image/2/240/240/5/0/uploads/images/leaderboards/logo-big-new-5011bffad01b1.png" /> -->
<img data-responsimage="logo-big-new-5011bffad01b1.png" style="width: 120px; height: 120px;" class="inline" data-responsimage-anchor="5" />
</a>
<ul class="main nav nav-pills">
<xsl:for-each select="//tags-all-entries/entry[ not(parent/item) and not(hide-from-header = 'Yes') ]">
Expand Down
Empty file.
Empty file.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions www/httpdocs/workspace/utilities/alerts.xsl
Expand Up @@ -4,13 +4,13 @@
<xsl:template name="alerts">

<xsl:if test="//status-all-entries/entry[name = 'ustream-status']/content = 'live'">
<div class="alert alert-success alertLive hidden">
<a class="close" data-dismiss="alert">×</a>
<strong>We're broadcasting live right now!</strong>
<a class="btn btn-success modalLiveLink">
<xsl:text> Watch the broadcast »</xsl:text>
</a>
</div>
<div class="alert alert-success alertLive hidden">
<a class="close" data-dismiss="alert" href="#">×</a>
<a class="btn btn-success modalLiveLink pull-right" href="http://apple.com">Watch Live »</a>
<p>
<strong>Live Broadcast!</strong> Click the button to watch our services live.
</p>
</div>
</xsl:if>

<xsl:if test="//alerts-global">
Expand Down Expand Up @@ -46,7 +46,7 @@
</xsl:otherwise>
</xsl:choose>
<!-- <xsl:if test="can-be-closed = 'Yes'">
<a class="close" data-dismiss="alert">×</a>
<a class="close" data-dismiss="alert" href="#">×</a>
</xsl:if> -->

<xsl:if test="url">
Expand Down Expand Up @@ -95,7 +95,7 @@
<xsl:attribute name="target">
<xsl:text>_blank</xsl:text>
</xsl:attribute>
<xsl:text>More Info</xsl:text>
<xsl:text>More Info »</xsl:text>
</a>

</xsl:if>
Expand Down Expand Up @@ -141,7 +141,7 @@
</xsl:otherwise>
</xsl:choose>
<!-- <xsl:if test="can-be-closed = 'Yes'">
<a class="close" data-dismiss="alert">×</a>
<a class="close" data-dismiss="alert" href="#">×</a>
</xsl:if> -->

<xsl:if test="url">
Expand Down Expand Up @@ -190,7 +190,7 @@
<xsl:attribute name="target">
<xsl:text>_blank</xsl:text>
</xsl:attribute>
<xsl:text>More Info</xsl:text>
<xsl:text>More Info »</xsl:text>
</a>

</xsl:if>
Expand Down

0 comments on commit 54a29e5

Please sign in to comment.