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

753 inconsistet fonts and spacing on loop #761

Merged
merged 6 commits into from
May 2, 2024
Merged

753 inconsistet fonts and spacing on loop #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41de5ac
consistency of content blocks
vitorgomateus Apr 26, 2024
f97b683
fix sidebar mixing with footer
vitorgomateus Apr 26, 2024
13ec429
update logo on Loop
vitorgomateus Apr 26, 2024
83c0ddf
compress scss changes
vitorgomateus May 1, 2024
447840d
propagate to other page types
vitorgomateus May 1, 2024
ccd8664
Update loop.css
vitorgomateus May 1, 2024
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
19 changes: 17 additions & 2 deletions base/static/base/css/loop.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@ h1 + h2, h2 + h3, h3 + h4, h4 + h5, h5 + h6 {
*/
p {
font-size: 1.1em;
line-height: 1.7em;
max-width: 46em;
line-height: 1.7em;
margin-bottom: 0.5em; }

.template-news-page .rich-text {
Expand Down Expand Up @@ -268,6 +267,22 @@ figure.center-block {
* Content
* --------------------------------------------------
*/

.block-paragraph,
.media-body{
max-width: 46em;
}
.block-paragraph p,
.block-paragraph li,
.media-body p,
.media-body li{
font-size: 15px;
line-height: 22px;
}
[data-block-key] a{
overflow-wrap: break-word;
}

.sw-toc {
display: flex;
flex-wrap: wrap;
Expand Down
15 changes: 14 additions & 1 deletion base/static/base/css/loop/loop.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ h1+h2, h2+h3, h3+h4, h4+h5, h5+h6 {
p {
font-size: 1.1em;
line-height: 1.7em;
max-width: 46em;
margin-bottom: 0.5em;
}

Expand Down Expand Up @@ -316,6 +315,20 @@ figure {
* --------------------------------------------------
*/


.block-paragraph {
max-width: 46em;
p,
a,
li {
font-size: 16px;
line-height: 22px;
}
a{
overflow-wrap: break-word;
}
}

.sw-toc {
display: flex;
flex-wrap: wrap;
Expand Down
2 changes: 1 addition & 1 deletion base/static/base/css/sidebars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ Right Sidebar: Widget Items
* Off Canvas (Sidebar Mobile Toggle)
* --------------------------------------------------
*/

@media screen and (max-width: 986px) { // Keep as @media (instead of @include) for stability
.row-offcanvas {
position: relative;
Expand All @@ -44,6 +43,7 @@ Right Sidebar: Widget Items
min-height: 900px; // fix to sidebar overlapping footer in mobile.
.sidebar-offcanvas {
left: -50%; /* 6 columns */
z-index: 1;
}
&.active {
left: 50%; /* 6 columns */
Expand Down
3 changes: 1 addition & 2 deletions base/templates/base/intranet_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,9 @@ <h3>{{ sidebartitle }}</h3>
{% endif %}
</div><!-- /.row-fluid -->
</div> <!-- /main container -->

<!-- Footer Section -->
<footer class="container-fluid footer" role="contentinfo">
<span class="footer-brand"><a href="https://www.lib.uchicago.edu/"><img src="/static/base/images/color-logo.png" alt="Loop logo"></a></span>
<span class="footer-brand"><a href="https://www.lib.uchicago.edu/"><img src="https://www.lib.uchicago.edu/web-resources/img/white-logo.png" alt="Loop logo"></a></span>
<ul>
<li><a href="/mailaliases/"><span class="hidden-xs">Library </span>Email Aliases</a></li>
<li><a href="/staff/"><span class="hidden-xs">Library Staff</span> Directory</a></li>
Expand Down
Loading