Skip to content

Commit ffef487

Browse files
Dhruvi16Dhruvi16
committed
Resolve conflicts
2 parents 33a9823 + a3fe548 commit ffef487

File tree

5 files changed

+79
-54
lines changed

5 files changed

+79
-54
lines changed

‎themes/vocabulary_theme/templates/community_team_list.html

+48-40
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,52 @@
11
{% extends "layout.html" %}
2-
{% block title %}{{ this.title }}{% endblock %}
2+
33
{% block body %}
4-
<p>This is a list of all CC Community Team members, and their roles and privileges.</p>
5-
<p>For more information about CC Community Team, please see <a href="/community/community-team/">the Community Team Page</a>.</p>
6-
<h2>Project Teams</h2>
7-
{% for project in bag('community_team_members.projects') %}
8-
<h3>{{ project.name }}</h3>
9-
<p>These team members have permissions in the <code>{{ project.repos }}</code> repo(s).</p>
10-
<table class="table table-striped" style="width: 75%;">
11-
<thead class="thead-dark">
12-
<tr>
13-
<th scope="col">Role</th>
14-
<th scope="col">Member Name</th>
15-
</tr>
16-
</thead>
17-
<tbody>
18-
{% for member in project.members %}
19-
<tr>
20-
<td scope="row">{{ member.role }}</td>
21-
<td scope="row">{{ member.name }}</td>
22-
</tr>
23-
{% endfor %}
24-
</tbody>
25-
</table>
26-
{% endfor %}
27-
<h2>Community Building Teams</h2>
28-
<table class="table table-striped" style="width: 75%;">
29-
<thead class="thead-dark">
30-
<tr>
31-
<th scope="col">Role</th>
32-
<th scope="col">Member Name</th>
33-
</tr>
34-
</thead>
35-
<tbody>
36-
{% for member in bag('community_team_members.community_builders') %}
37-
<tr>
38-
<td scope="row">{{ member.role }}</td>
39-
<td scope="row">{{ member.name }}</td>
40-
</tr>
4+
<div class="community-team-members">
5+
<div class="title">
6+
<div class="container">
7+
<h1>{{ this.title }}</h1>
8+
<p class="description column is-9">This is a list of all CC Community Team members, and their roles and privileges. For more information about CC Community Team, please see <a href="/community/community-team/">the Community Team Page</a>.</p>
9+
</div>
10+
</div>
11+
<div class="body container">
12+
<h2 class="padding-top-bigger">Project Teams</h2>
13+
{% for project in bag('community_team_members.projects') %}
14+
<h3 class="b-header padding-vertical-normal">{{ project.name }}</h3>
15+
<p class="padding-bottom-normal">These team members have permissions in the <code>{{ project.repos }}</code> repo(s).</p>
16+
<div class="table-container">
17+
<table class="table is-bordered is-striped">
18+
<thead>
19+
<tr>
20+
<th>Role</th>
21+
<th>Member Name</th>
22+
</tr>
23+
</thead>
24+
{% for member in project.members %}
25+
<tr>
26+
<td>{{ member.role }}</td>
27+
<td>{{ member.name }}</td>
28+
</tr>
29+
{% endfor %}
30+
</table>
31+
</div>
4132
{% endfor %}
42-
</tbody>
43-
</table>
33+
<h2 class="padding-vertical-bigger">Community Building Teams</h2>
34+
<div class="table-container">
35+
<table class="table is-bordered is-striped">
36+
<thead>
37+
<tr>
38+
<th>Role</th>
39+
<th>Member Name</th>
40+
</tr>
41+
</thead>
42+
{% for member in bag('community_team_members.community_builders') %}
43+
<tr>
44+
<td>{{ member.role }}</td>
45+
<td>{{ member.name }}</td>
46+
</tr>
47+
{% endfor %}
48+
</table>
49+
</div>
50+
</div>
51+
</div>
4452
{% endblock %}

‎themes/vocabulary_theme/templates/macros/pagination.html

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{% macro render_pagination(pagination) %}
22
<nav class="pagination" role="navigation" aria-label="pagination">
33
<ul class="pagination-list">
4-
<!-- {% if pagination.has_prev %}
5-
<li class="page-item"><a class="page-link" href="{{ pagination.prev|url }}">Previous</a></li>
6-
{% else %}
7-
<li class="page-item disabled"><a class="page-link">Previous</a></li>
8-
{% endif %} -->
4+
{% if pagination.has_prev %}
5+
<li class="inactive">
6+
<a class="pagination-link inactive-link" href="{{ pagination.prev|url }}" aria-label="Goto previous"><i class="icon chevron-left"></i></a>
7+
</li>
8+
{% endif %}
99
{% for p in range(pagination.pages) %}
1010
{% if pagination.current|url == pagination.for_page(p+1)|url %}
1111
<li class="common">
@@ -17,11 +17,11 @@
1717
</li>
1818
{% endif %}
1919
{% endfor %}
20-
<!-- {% if pagination.has_next %}
21-
<li class="page-item"><a class="page-link" href="{{ pagination.next|url }}">Next</a></li>
22-
{% else %}
23-
<li class="page-item disabled"><a class="page-link">Next</a></li>
24-
{% endif %} -->
20+
{% if pagination.has_next %}
21+
<li class="inactive">
22+
<a class="pagination-link inactive-link" href="{{ pagination.next|url }}" aria-label="Goto next"><i class="icon chevron-right"></i></a>
23+
</li>
24+
{% endif %}
2525
</ul>
2626
</nav>
2727
{% endmacro %}

‎webpack/package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎webpack/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"license": "MIT",
1010
"devDependencies": {
1111
"@babel/core": "^7.9.0",
12-
"@creativecommons/vocabulary": "^1.0.0-beta.16",
12+
"@creativecommons/vocabulary": "^2020.7.1",
1313
"autoprefixer": "^9.7.5",
1414
"babel-loader": "^8.1.0",
1515
"css-loader": "^2.1.1",

‎webpack/sass/main.scss

+17
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,23 @@ code {
574574
}
575575
}
576576

577+
.community-team-members {
578+
.container {
579+
@extend .padding-horizontal-big;
580+
@extend .padding-bottom-xl;
581+
}
582+
583+
.title {
584+
background-color: $color-lighter-gray;
585+
overflow-wrap: break-word;
586+
587+
.description {
588+
@extend .body-bigger;
589+
@extend .padding-top-small;
590+
}
591+
}
592+
}
593+
577594
.cc-search-roadmap {
578595
.title {
579596
background-color: $color-lighter-gray;

0 commit comments

Comments
 (0)