Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

html: replaced slack image with font-awesome icon #333

Merged
merged 3 commits into from
Jan 31, 2018
Merged

html: replaced slack image with font-awesome icon #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acbc4ba
html: replaced slack image with font-awesome icon
Jan 30, 2018
d1a1365
html: reindent nav.html
Jan 30, 2018
259dbe3
nav: updated nav to match the size of internal_nav
Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions app/assets/v2/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,8 @@ div, p, a, span {
color: #4aeaa7 !important;
}

.navbar a.slack img {
max-width: 15px;
max-height: 15px;
margin-top:-3px;
.navbar a.slack i {
margin-right: 3px;
filter: invert(100%);
}

.footer .nav-link:hover {
Expand Down
7 changes: 2 additions & 5 deletions app/assets/v2/css/gitcoin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,13 @@ h4, .h4 {
text-decoration: none;
padding-right: 1rem !important;
padding-left: 1rem !important;
font-size: 0.9rem !important;
}

.footer .nav-link {
font-size: 0.8rem !important;
}

.dash .nav-link {
font-size: 0.9rem !important;
}

.nav-link:visited {
color: #eff4ee;
}
Expand Down Expand Up @@ -331,4 +328,4 @@ div.button-pink {
*:-ms-input-placeholder {
/* IE 10+ */
color: lightgray;
}
}
2 changes: 1 addition & 1 deletion app/dashboard/templates/shared/nav_internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<a class="nav-link {% if active == 'tools' %}selected{%endif%}" href="{% url 'tools' %}">Tools</a>
<a class="nav-link {% if active == 'dashboard' %}selected{%endif%}" href="{% url 'explorer' %}">Issue Explorer</a>
<a class="nav-link slack" href="{% url 'slack' %}">
<img src="/static/v2/images/social/slack2.png">Slack({{num_slack}})
<i class="fa fa-slack" aria-hidden="true"></i>Slack({{num_slack}})
</a>
<a class="nav-link" href="{% url 'help' %}">Help</a>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion app/retail/templates/help.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h4 >Got another question?</h4>
<div class="row mt-2 mb-2 pb-3 animatedParent">
<div class="col animated pulse fast">
<a class="btn btn-lg btn-warning " role="button" href="https://github.com/gitcoinco/gitcoinco/issues?q=is%3Aissue+is%3Aopen+label%3Ahelp">View Github Repo</a>
<a class="btn btn-lg btn-warning " role="button" href="/slack"> <img src="/static/v2/images/social/slack2.png" style="max-width: 37px; margin: 5px 10px ; display: inline;">Ask on slack</a>
<a class="btn btn-lg btn-warning " role="button" href="/slack"> <i class="fa fa-slack" style="margin-right: 5px; position: relative; top: 2px;" aria-hidden="true"></i>Ask on slack</a>
<a class="btn btn-lg btn-warning " role="button" href="mailto:[email protected]">Contact Gitcoin Core</a>
</div>
</div>
Expand Down
46 changes: 23 additions & 23 deletions app/retail/templates/shared/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@

{% endcomment %}

<nav class="navbar navbar-expand-md navbar-dark">
<a class="navbar-brand pt-0 pb-0" href="/">
<img id="logo" src="/static/v2/images/logo_large.png" data-hover="/static/v2/images/logo_med_hover.gif" width="201" height="66" />
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<nav class="navbar navbar-expand-md navbar-dark">
<a class="navbar-brand pt-0 pb-0" href="/">
<img id="logo" src="/static/v2/images/logo_large.png" data-hover="/static/v2/images/logo_med_hover.gif" width="150" height="50" />
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarSupportedContent">
<nav class="navbar-nav ml-auto mr-3">
<a class="nav-link {% if active == 'home' %}selected{%endif%}" href="/">Home</a>
<a class="nav-link {% if active == 'about' %}selected{%endif%}" href="/about">About</a>
<a class="nav-link" href="/tools">Tools</a>
<a class="nav-link" href="/explorer">Issue Explorer</a>
<a class="nav-link slack" href="/slack">
<img src="/static/v2/images/social/slack2.png">Slack({{num_slack}})
</a>
<a class="nav-link" href="/help">Help</a>
</nav>
<img class="mr-5" src="/static/v2/images/spaceship.png" width="93" height="81" />
<a class="btn btn-outline-info pl-4 pr-4 pulseClick" role="button" href="/get">Get Started ⚡️</a>
</div>
</nav>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<nav class="navbar-nav ml-auto mr-3">
<a class="nav-link {% if active == 'home' %}selected{%endif%}" href="/">Home</a>
<a class="nav-link {% if active == 'about' %}selected{%endif%}" href="/about">About</a>
<a class="nav-link" href="/tools">Tools</a>
<a class="nav-link" href="/explorer">Issue Explorer</a>
<a class="nav-link slack" href="/slack">
<i class="fa fa-slack" aria-hidden="true"></i>Slack({{num_slack}})
</a>
<a class="nav-link" href="/help">Help</a>
</nav>
<img class="mr-5" src="/static/v2/images/spaceship.png" width="52" height="45" />
<a class="btn btn-outline-info pl-4 pr-4 pulseClick" role="button" href="/get">Get Started ⚡️</a>
</div>
</nav>
2 changes: 1 addition & 1 deletion app/retail/templates/slack.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="col-6 pr-2 pl-2 pb-4 form_container">
<div class="">
<div style="max-width: 500px; margin: 0px auto;">
<h4><img src='/static/v2/images/social/slack2.png' style="max-height: 40px;" alt='Slack'> Gitcoin Slack Community</h4>
<h4><i class="fa fa-slack" aria-hidden="true" style="position:relative; top: 2px; margin-right: 5px;"></i>Gitcoin Slack Community</h4>
<h4 class="font-smaller-1 pt-0">({{num_slack}} online)</h4>
{% if msg %}
<p style="background-color: #fee856; padding: 5px 10px;">
Expand Down