Skip to content

Commit

Permalink
Merge pull request #154 from scientist-softserv/FixRecentUploadsLayout
Browse files Browse the repository at this point in the history
fixed recent uploads wonky layout
  • Loading branch information
ckarpinski authored Sep 20, 2023
2 parents 671873b + cf47b67 commit 79493be
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 5 deletions.
Binary file added app/assets/images/home-logos/meadville.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions app/assets/stylesheets/themes/cultural_repository.scss
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@

.featured-works-container h4{margin-bottom:20px;}

ol.list-group.list-group-striped.recent_uploads {margin-bottom:10px}



////// Facets //////
Expand Down
13 changes: 9 additions & 4 deletions app/assets/stylesheets/themes/institutional_repository.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,20 @@

.section-border {
border: 1px solid #ddd;
padding: 30px;
padding: 20px;
}

.recent-uploads-div-height {
display: flex;
flex-direction: column;
}

.institutional-repository-recent-uploads {
h3 {
.institutional-repository-recent-uploads h3 {
margin-top: 0 !important;
margin-bottom: 0.75em;
flex-basis: 100%;
}
}


div.recently-uploaded:nth-child(2n+3) {
clear: left;
Expand All @@ -104,6 +104,11 @@
padding: 0 15px 30px 15px;
}

.institutional-repository-recent-uploads > div {
display: flex;
flex-wrap: wrap;
}

.collections-container,
.recently-uploaded {
a {
Expand Down
10 changes: 10 additions & 0 deletions app/assets/stylesheets/themes/neutral_repository.scss
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,16 @@
-webkit-box-orient: vertical;
}

div.neutral_repository.recently-uploaded > div {
display: flex;
flex-wrap: wrap;
}

div.neutral_repository.recently-uploaded h3 {
flex-basis:100%;
margin-top:0;
}

////// Home Page text Section //////

div.home_page_text.homepage-text-container {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/themes/shared_repository.scss
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
color:#4d4e4e;
font-size:1.5em;
}
&.hyrax-homepage .splash-browse h2 {margin:2em 0 1em 0;}
&.hyrax-homepage .splash-browse h2 {margin:1em 0 1em 0;}
&.hyrax-homepage #search-form-header {margin-top:1em;}
&.hyrax-homepage .text-right p{color:#258FCE;}

Expand Down
7 changes: 7 additions & 0 deletions app/views/splash/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@
<%= image_tag("home-logos/ctschicago.png", class: "tenant-logo", alt: "CTS") %>
<% end %>
</div>
<div class="col-xs-6 col-sm-4">
<%= link_to "//#{host_for('meadville')}" do %>
<%= image_tag("home-logos/meadville.jpg", class: "tenant-logo", alt: "MLTS") %>
<% end %>
</div>
</div>
<div class="row home-logo-grid">
<div class="col-xs-6 col-sm-4">
<%= link_to "//#{host_for('ost')}" do %>
<%= image_tag("home-logos/ost.png", class: "tenant-logo", alt: "OST") %>
Expand Down
7 changes: 7 additions & 0 deletions app/views/themes/shared_repository/splash/_index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@
<%= image_tag("home-logos/ctschicago.png", class: "tenant-logo", alt: "CTS") %>
<% end %>
</div>
<div class="col-xs-6 col-sm-4">
<%= link_to "//#{host_for('meadville')}" do %>
<%= image_tag("home-logos/meadville.jpg", class: "tenant-logo", alt: "MLTS") %>
<% end %>
</div>
</div>
<div class="row home-logo-grid">
<div class="col-xs-6 col-sm-4">
<%= link_to "//#{host_for('ost')}" do %>
<%= image_tag("home-logos/ost.png", class: "tenant-logo", alt: "OST") %>
Expand Down

0 comments on commit 79493be

Please sign in to comment.