Skip to content

Commit fc1006d

Browse files
committed
Resolve merge conflicts from main branch
2 parents a1adb91 + cc4ac8c commit fc1006d

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

src/assets/css/style.css

+11
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,17 @@
4747
outline: 2px solid #686666;
4848
}
4949

50+
.body-search-description {
51+
margin-top: 20px;
52+
margin: 0 auto;
53+
max-width: 943px;
54+
}
55+
56+
.body-search-description p {
57+
font-size: 13px;
58+
margin-bottom: 8px;
59+
}
60+
5061
.search-button {
5162
padding: 14px;
5263
width: 100%; /* Full width on small screens */

src/index.html

+5
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,11 @@ <h3>Find content you can share, use, and remix.</h3>
154154
<button class="search-button">Search</button>
155155
</div>
156156
<div id="error-message" class="error-message error-message-display"></div>
157+
<div class="body-search-description" role="contentinfo">
158+
<p>
159+
The Search Portal helps you search CC licensed works across multiple platforms.
160+
</p>
161+
</div>
157162
<div
158163
class="search-checkbox"
159164
style="display: none">

0 commit comments

Comments
 (0)