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

Jump to bottom

Frontera: Core-CMS#255 Navigation Bar #47

Merged
merged 2 commits into from
May 18, 2021
Merged

Frontera: Core-CMS#255 Navigation Bar #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a64298
GH-101: Navigation Bar
wesleyboar May 13, 2021
64a5d03
GH-101: Navigation Bar (change logo width)
wesleyboar May 17, 2021
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
5 changes: 5 additions & 0 deletions frontera-cms/static/frontera-cms/css/src/_imports/trumps/s-header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.s-header .c-logo {
/* To mimic Core `min-width`, because automatic width is so close to it */
/* TODO: GH-223: Comment this out ONLY when Portal can load it */
/* --width: 190px; */
}
18 changes: 0 additions & 18 deletions frontera-cms/static/frontera-cms/css/src/_imports/trumps/s-search-bar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,6 @@

/* FAQ: Changed `rem` to `em` to bypass Frontera CMS Bootstrap `font-size:10px;`; sometimes this fails, so `px` is used instead */

.s-search-bar::part(button) {
/* Copied from `.btn` from `archive/bootstrap.3.3.7.css` */
/* FAQ: The `button-radius` instance of `rem` is not included because it is overwritten by TACC styles */
font-size: 1em;
}

.s-search-bar::part(form) {
/* Copied from `.container` from Portal */
/* SEE: https://github.com/TACC/Frontera-Portal/blob/master/client/src/components/DataFiles/DataFilesSearchbar/DataFilesSearchbar.module.css */
/* FAQ: See "FAQ: Changed `rem` […]" */
font-size: 0.75em;
}

.s-search-bar::part(button__icon) {
/* Copied from `.btn` from `src/_imports/trumps/shared/icon.css` */
font-size: 18px;
Expand All @@ -23,11 +10,6 @@
margin-right: 12px;
}

.s-search-bar::part(input) {
/* Copied from `.btn` from Bootstrap 4.0.0 */
/* SEE: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css */
font-size: 1em;
}
.s-search-bar::part(input):focus {
/* Copied from `.form-control:focus` from Bootstrap 4.0.0 */
/* SEE: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css */
Expand Down
3 changes: 3 additions & 0 deletions frontera-cms/static/frontera-cms/css/src/site.header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@

/* TRUMPS */

@import url("_imports/trumps/s-header.css");
@import url("_imports/trumps/s-search-bar.css");

/* WARNING: GH-223: This page is NOT loaded on Portal */