Skip to content

Commit

Permalink
Merge pull request #5264 from thelostone-mc/grant-fix
Browse files Browse the repository at this point in the history
chore: pretty up grant tabs
  • Loading branch information
thelostone-mc authored Sep 30, 2019
2 parents 4147ae0 + f355a3c commit 099e37b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 18 deletions.
3 changes: 2 additions & 1 deletion app/assets/v2/css/grants/fund.css
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
border-radius: 5px;
border: 2px solid #10cd7a;
text-align: left;
width: 250px;
width: 265px;
padding: 1rem 15px;
position: absolute;
top: 0px;
Expand Down Expand Up @@ -214,6 +214,7 @@
font-size: 12px;
text-transform: uppercase;
width: 150px;
font-weight: bold;
}

.clr_estimate h3 span {
Expand Down
17 changes: 3 additions & 14 deletions app/assets/v2/css/tabs.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
.section-tab.active {
color: var(--gc-blue);
border-bottom: 4px var(--gc-blue) solid;
font-weight: bold;
font-weight: 600;
}

.tab-sections {
Expand All @@ -54,21 +54,10 @@
display: block;
}

.nav-badge::after {
padding: 4px 11px;
background-color: rgba(62,0,255, 0.10);
content: '';
border-radius: 50%;
position: relative;
left: -1rem;
}

.nav-badge {
font-size: 10px;
font-size: 9px;
color: rgba(62,0,255);
line-height: 10px;
margin-left: 0.5rem;
top: -2px;
top: -8px;
position: relative;
font-weight: bold;
}
Expand Down
6 changes: 3 additions & 3 deletions app/grants/templates/grants/detail/tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@

<button type="button" id="nav-transactions" href="{{grant.url}}?tab=activity" class="section-tab {% if tab == "activity" %} active {% endif %}">
{% trans "ACTIVITY" %}
<span class="nav-badge">{{ activity_count }}</span>
<span class="nav-badge">({{ activity_count }})</span>
</button>

<button type="button" id="nav-summary" href="{{grant.url}}?tab=updates" class="section-tab {% if tab == "updates" %} active {% endif %}">
{% trans "UPDATES" %}
<span class="nav-badge">0</span>
<span class="nav-badge">(0)</span>
</button>

<button type="button" id="nav-contributors" href="{{grant.url}}?tab=contributors" class="section-tab {% if tab == "contributors" %} active {% endif %}">
{% trans "CONTRIBUTORS" %}
<span class="nav-badge">{{ contributors|length }}</span>
<span class="nav-badge">({{ contributors|length }})</span>
</button>

</div>
Expand Down

0 comments on commit 099e37b

Please sign in to comment.