Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into t474-improve-date-created
Browse files Browse the repository at this point in the history
  • Loading branch information
alepbloyd committed Apr 10, 2024
2 parents 65cc9dc + 06ab356 commit 860cf22
Show file tree
Hide file tree
Showing 23 changed files with 409 additions and 258 deletions.
Binary file added app/assets/images/audio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/collection.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/default.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/unauthorized.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/work.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 57 additions & 1 deletion app/assets/stylesheets/scholarspace/components/_collection.scss
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,60 @@
#select2-drop {
border: none;
}
}
}

// collections list page styles
.collections-description-wrapper {
padding: 1.5em 1em;
text-align: center;
}

.collections-list {
background-color: $gw-white;

&:nth-child(odd) {
background-color: $gw-white;
}

.search-result-wrapper {
display: flex;
flex-direction: row;
align-items: start;
padding-bottom: 0;

.img-container {
width: 10em;
height: 10em;

img {
width: 100%;
height: 100%;
object-fit: cover;
}
}

.h2-section-header a {
text-decoration: none;

&:hover {
text-decoration: underline;
}
}

.collections-title-wrapper p {
margin-top: 1em;
}

@media (max-width: 1199px) {
.img-container {
width: 9em;
height: 9em;
}
}

@media (max-width: $mobile-max) {
flex-direction: column;
align-items: center;
}
}
}
16 changes: 16 additions & 0 deletions app/assets/stylesheets/scholarspace/components/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,9 @@ header {
}

.navbar-nav {
display: flex;
align-items: center;

.open > .navbar-item:hover, .open > .navbar-item:focus {
color: $gw-white;
background-color: $gw-light-blue;
Expand All @@ -286,6 +289,19 @@ header {
}
}

.navbar-divider {
&::before {
content: "|";
color: #688a9c;
font-size: 1em;
width: 4px;
margin-left: -2px;
padding: 0;
text-align: center;
display: inline-block;
}
}

li.navbar-browse {
padding: 0 1em;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: baseline;
padding-top: 0.5em;

.recent-work {
Expand Down
Loading

0 comments on commit 860cf22

Please sign in to comment.