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

chore: pretty up grant tabs #5264

Merged
merged 2 commits into from
Sep 30, 2019
Merged

chore: pretty up grant tabs #5264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f15572
chore: pretty up grant tabs
thelostone-mc Sep 26, 2019
f355a3c
clr ui fix
thelostone-mc Sep 26, 2019
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
3 changes: 2 additions & 1 deletion app/assets/v2/css/grants/fund.css
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this static 0 ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's the default value :P it'll get overridden

</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