Skip to content

Commit a3773a3

Browse files
authored
Merge pull request creativecommons#379 from creativecommons/refactor
Updating spacing on project ideas and CC search pages.
2 parents 3d0e96e + 7ae9aa7 commit a3773a3

File tree

3 files changed

+26
-59
lines changed

3 files changed

+26
-59
lines changed

themes/vocabulary_theme/templates/project-ideas.html

+19-19
Original file line numberDiff line numberDiff line change
@@ -53,39 +53,39 @@ <h5 class="card-title"><a href="#original-ideas">Original Ideas</a></h5>
5353
</div>
5454
</div>
5555
</div>
56-
<div class="body container">
56+
<div class="body container content">
5757
{% for idea in ideas %}
5858
<div class="project-idea">
5959
<h2><a class="has-color-dark-slate-gray" name="{{ idea._slug }}">{{ idea.title }}</a></h2>
6060
<div class="columns">
6161
<div class="column is-one-quarter">
62-
<h5 class="label">Difficulty</h5>
63-
<p class="content">{{ idea.difficulty }}</p>
64-
<h5 class="label">Skills recommended</h5>
65-
<p class="content">{{ idea.skills_recommended }}</p>
66-
<h5 class="label">Mentors</h5>
67-
<p class="content">{{ idea.mentors }}</p>
62+
<h5>Difficulty</h5>
63+
<p>{{ idea.difficulty }}</p>
64+
<h5>Skills recommended</h5>
65+
<p>{{ idea.skills_recommended }}</p>
66+
<h5>Mentors</h5>
67+
<p>{{ idea.mentors }}</p>
6868
</div>
6969
<div class="column is-three-quarters">
70-
<h5 class="label">The Problem</h5>
71-
<p class="content">{{ idea.problem }}</p>
72-
<h5 class="label">Expected Outcome</h5>
73-
<p class="content">{{ idea.expected_outcome }}</p>
74-
<h5 class="label">Internship Tasks</h5>
75-
<p class="content">{{ idea.internship_tasks }}</p>
76-
<h5 class="label">Application Tips</h5>
77-
<p class="content">{{ idea.application_tips }}</p>
78-
<h5 class="label">Resources</h5>
79-
<p class="content">{{ idea.resources }}</p>
70+
<h5>The Problem</h5>
71+
<p>{{ idea.problem }}</p>
72+
<h5>Expected Outcome</h5>
73+
<p>{{ idea.expected_outcome }}</p>
74+
<h5>Internship Tasks</h5>
75+
<p>{{ idea.internship_tasks }}</p>
76+
<h5>Application Tips</h5>
77+
<p>{{ idea.application_tips }}</p>
78+
<h5>Resources</h5>
79+
<p>{{ idea.resources }}</p>
8080
</div>
8181
</div>
8282
<a href="#project-list" class="back-to-list"><i class="icon angle-up"></i> Back to the Project list</a>
8383
</div>
8484
{% endfor %}
8585
<div>
8686
<h2 class="b-header"><a name="original-ideas" class="has-color-dark-slate-gray">Original Ideas</a></h2>
87-
<p class="content padding-vertical-smaller">We are open to original ideas for documentation improvements.</p>
88-
<p class="content padding-vertical-smaller">Please talk to us on the <code>#cc-gsoc-outreachy</code> channel on Slack or via the mailing list to find a mentor for the project before submitting your proposal.</p>
87+
<p>We are open to original ideas for documentation improvements.</p>
88+
<p>Please talk to us on the <code>#cc-gsoc-outreachy</code> channel on Slack or via the mailing list to find a mentor for the project before submitting your proposal.</p>
8989
<a href="#project-list" class="back-to-list"><i class="icon angle-up"></i> Back to the Project list</a>
9090
</div>
9191
</div>

themes/vocabulary_theme/templates/search_roadmap.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h1>{{ this.title }}</h1>
88
<p class="description column is-9 is-paddingless">The largest open source product in CC’s portfolio is CC Search: a search engine for CC licensed and public domain creative works.</p>
99
</div>
1010
</div>
11-
<div class="body container">
11+
<div class="body container content">
1212
<p>The product involves the following components:</p>
1313
<ul>
1414
<li><b>CC Catalog</b>, where CC licensed and public domain works are ingested. [<a href="https://github.com/creativecommons/cccatalog">GitHub Repo</a>]</li>
@@ -17,10 +17,10 @@ <h1>{{ this.title }}</h1>
1717
</ul>
1818
<p>CC Catalog ingests and processes CC licensed and public domain works, then makes that data available to CC Catalog API. CC Catalog API is publicly accessible, and is used to serve the data from the catalog to CC Search.</p>
1919

20-
<h3 class="padding-vertical-normal">What Are We Up To?</h3>
20+
<h3>What Are We Up To?</h3>
2121
<p>The highlights on our roadmap for the current and upcoming quarters are as follows:</p>
2222
{% for quarter in bag('search_roadmap.quarters') %}
23-
<h4 class="padding-vertical-normal">{{ quarter.name }}</h4>
23+
<h4>{{ quarter.name }}</h4>
2424
<div class="table-container">
2525
<table class="table is-bordered is-striped">
2626
<thead>
@@ -41,8 +41,8 @@ <h4 class="padding-vertical-normal">{{ quarter.name }}</h4>
4141
</div>
4242
{% endfor %}
4343
<p>Review our Pipeline of Future Ideas <a href="https://docs.google.com/document/d/1qAZu1_ZltfdVylH6WkWcp5_mBAPa5ilflHWUc7zbIgk/edit#">here</a> if you want to see what else has been suggested for CC Search.</p>
44-
<h3 class="padding-vertical-normal">How Can I Help?</h3>
45-
<h4 class="padding-vertical-normal">Contribute Code</h4>
44+
<h3>How Can I Help?</h3>
45+
<h4>Contribute Code</h4>
4646
<p>To contribute code, take the following steps:</p>
4747
<ul>
4848
<li>
@@ -70,7 +70,7 @@ <h4 class="padding-vertical-normal">Contribute Code</h4>
7070
<dd>&bull; There are two columns with “Ready for Work” tickets. If they’re not blocked or marked as CC Staff only, we welcome your contribution.</dd>
7171
</dl>
7272

73-
<h4 class="padding-vertical-normal">Contribute Design</h4>
73+
<h4>Contribute Design</h4>
7474
<p>There are two ways you can show your interest in contributing to the design of CC Search:</p>
7575
<ul>
7676
<li>Follow <a href="https://opensource.creativecommons.org/contributing-code/cc-search/">the steps for suggesting a new feature for CC Search</a></li>
@@ -79,7 +79,7 @@ <h4 class="padding-vertical-normal">Contribute Design</h4>
7979

8080
<p>Before you start work on any design project, get familiar with <a href="https://www.figma.com/file/l4Mt3dn3Ndtrvrb4aLcwXI/Design-Library?node-id=1433%3A0">our design library in Figma</a>. All CC Search designs use this design library.</p>
8181

82-
<h4 class="padding-vertical-normal">Participate in Usability Tests and User Interviews</h4>
82+
<h4>Participate in Usability Tests and User Interviews</h4>
8383
<p>When we’re rolling out a specific feature, we do usability tests to test the proposed experience.</p>
8484
<p>At any point in time, we’re engaging with our users through user interviews, where we learn more about attitudes towards the product as it stands, and dig into expansion areas we’re considering.</p>
8585
<p>If you’re interested, we invite you to sign up for a time <a href="https://calendly.com/cc-product-design/usability-test-30">via this Calendly link</a>.</p>

webpack/sass/main.scss

-33
Original file line numberDiff line numberDiff line change
@@ -553,26 +553,6 @@ code {
553553

554554
.column {
555555
@extend .padding-top-normal;
556-
557-
.label {
558-
@extend .b-header;
559-
@extend .padding-top-big;
560-
}
561-
562-
.content {
563-
@extend .body-normal;
564-
@extend .padding-top-small;
565-
}
566-
567-
li:before {
568-
content: "\ea02";
569-
font-family: "Vocabulary Icons";
570-
display: inline-block;
571-
font-size: 0.375rem;
572-
color: $color-gray;
573-
574-
@extend .padding-right-small;
575-
}
576556
}
577557

578558
&::after {
@@ -611,18 +591,5 @@ code {
611591
@extend .padding-horizontal-big;
612592
@extend .padding-top-xl;
613593
@extend .padding-bottom-xxl;
614-
@extend .body-bigger;
615-
616-
line-height: 1.8125;
617-
618-
li:before {
619-
content: "\ea02";
620-
font-family: "Vocabulary Icons";
621-
display: inline-block;
622-
font-size: 0.375rem;
623-
color: $color-gray;
624-
625-
@extend .padding-right-small;
626-
}
627594
}
628595
}

0 commit comments

Comments
 (0)