Skip to content

Commit

Permalink
Add announcement of open sourcing to certain zulip.com pages.
Browse files Browse the repository at this point in the history
  • Loading branch information
Allen Rabinovich authored and lfranchi committed Sep 25, 2015
1 parent 5bf6f05 commit d6a41b4
Show file tree
Hide file tree
Showing 6 changed files with 98 additions and 3 deletions.
Binary file added static/images/logo/zballoon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 45 additions & 2 deletions static/styles/portico.css
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,11 @@ input.text-error {
padding: 6px 0px 6px 0px;
}

.header-main .portico-simple-logo {
height: 40px;
width: auto;
}

.app {
width: 100%;
z-index: 99;
Expand Down Expand Up @@ -697,12 +702,50 @@ a.bottom-signup-button {
margin-left: 10px;
}

.main-headline-container {
.main-headline-container,
.os-headline-container {
position: relative;
height: 100%;
padding-top: 40px !important;
}

.os-headline-container {
padding: 20px;
background: #1e5799;
background: linear-gradient(to bottom, #1e5799 0%,#2989d8 52%,#7db9e8 100%);
padding-bottom: 40px !important;
text-align: center;
}

.os-tagline,
.os-footnote {
color: #eeeeee !important;
}

.os-footnote a:link,
.os-footnote a:visited,
.os-footnote a:active {
color: #eeeeee;
text-decoration: none;
border-bottom: 1px solid #dddddd;
}

.os-footnote a:hover {
color: #ffffff;
text-decoration: none;
border-bottom: 1px solid #ffffff;
}

.os-illustration {
height: 200px;
width: auto;
margin-bottom: 15px;
}

.portico-os-announcement {
padding-top: 40px;
}

.main-headline-logo {
display: block;
width: 200px;
Expand Down Expand Up @@ -759,7 +802,7 @@ a.bottom-signup-button {
.hello-main {
max-width: none;
min-width: 0;
padding: 0;
padding: 0 !important;
}

.footer-padder {
Expand Down
16 changes: 16 additions & 0 deletions templates/zerver/hello.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
{% extends "zerver/portico.html" %}
{% block hello_page_container %} hello-main{% endblock %}
{% block hello_page_footer %} hello-footer{% endblock %}
{% block os_announcement %}
{% if zulip_com %}
<div class="os-headline-container">
<img src="/static/images/logo/zballoon.png" class="os-illustration" alt="Zulip balloon" />
<div class="main-headline-text">
<span class="tagline os-tagline">
Zulip has been released as open source software!
</span>
<span class="footnote os-footnote">
Read the <a href="https://blogs.dropbox.com/tech/2015/09/open-sourcing-zulip-a-dropbox-hack-week-project" target="_blank">announcement</a> or go to <a href="https://www.zulip.org" target="_blank">the Zulip open source project website</a>.
</span>
</div>
</div>
{% endif %}
{% endblock %}

{% block portico_content %}
<div class="app main-headline">
<div class="app-main main-headline-container">
Expand Down
16 changes: 16 additions & 0 deletions templates/zerver/integrations.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

{# API information page #}

{% block os_announcement %}
{% if zulip_com %}
<div class="os-headline-container">
<img src="/static/images/logo/zballoon.png" class="os-illustration" alt="Zulip balloon" />
<div class="main-headline-text">
<span class="tagline os-tagline">
Zulip has been released as open source software!
</span>
<span class="footnote os-footnote">
Read the <a href="https://blogs.dropbox.com/tech/2015/09/open-sourcing-zulip-a-dropbox-hack-week-project" target="_blank">announcement</a> or go to <a href="https://www.zulip.org" target="_blank">the Zulip open source project website</a>.
</span>
</div>
</div>
{% endif %}
{% endblock %}

{% block portico_content %}

<div class="portico-page-header"><a href="#"><i class="icon-vector-gears portico-page-header-icon"></i>Integrations</a></div>
Expand Down
16 changes: 16 additions & 0 deletions templates/zerver/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,22 @@
{% minified_js 'signup' %}
{% endblock %}

{% block os_announcement %}
{% if zulip_com %}
<div class="os-headline-container">
<img src="/static/images/logo/zballoon.png" class="os-illustration" alt="Zulip balloon" />
<div class="main-headline-text">
<span class="tagline os-tagline">
Zulip has been released as open source software!
</span>
<span class="footnote os-footnote">
Read the <a href="https://blogs.dropbox.com/tech/2015/09/open-sourcing-zulip-a-dropbox-hack-week-project" target="_blank">announcement</a> or go to <a href="https://www.zulip.org" target="_blank">the Zulip open source project website</a>.
</span>
</div>
</div>
{% endif %}
{% endblock %}

{% block portico_content %}

{% if password_auth_enabled %}
Expand Down
6 changes: 5 additions & 1 deletion templates/zerver/portico.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{% if zulip_com %}
<a class="brand logo" href="/"><img src="/static/images/logo/zulip-dropbox.png" class="portico-logo" alt="Zulip" content="Zulip" /></a>
{% else %}
<a class="brand logo" href="/"><img src="/static/images/logo/zulipwlogo@2x.png" class="portico-logo" alt="Zulip" content="Zulip" /></a>
<a class="brand logo" href="/"><img src="/static/images/logo/zulipcornerlogo@2x.png" class="portico-simple-logo" alt="Zulip" content="Zulip" /></a>
{% endif %}
</div>
</div>
Expand All @@ -41,6 +41,10 @@
</div>

<div class="app portico-page">
<div class="portico-os-announcement">
{% block os_announcement %}
{% endblock %}
</div>
<div class="app-main portico-page-container{% block hello_page_container %}{% endblock %}">
{% block portico_content %}
{% endblock %}
Expand Down

0 comments on commit d6a41b4

Please sign in to comment.