diff --git a/app/assets/stylesheets/global_activities.scss b/app/assets/stylesheets/global_activities.scss index 189e4f45e..83b4e66a2 100644 --- a/app/assets/stylesheets/global_activities.scss +++ b/app/assets/stylesheets/global_activities.scss @@ -12,7 +12,7 @@ padding: 0 15px; &.task-activities { - height: calc(100vh - 136px); + height: calc(100vh - var(--navbar-height) - var(--title-row-height) - 3rem); padding-top: 20px; } diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss index 312d5bc46..342f9cd5c 100644 --- a/app/assets/stylesheets/my_modules/protocols/index.scss +++ b/app/assets/stylesheets/my_modules/protocols/index.scss @@ -22,6 +22,12 @@ min-width: 5rem; width: 100%; + .view-mode { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .fas { margin-right: .5em; } @@ -48,9 +54,9 @@ .my-module-position-container { background-color: $color-white; box-shadow: $flyout-shadow; - margin: 1rem auto; + margin: 1rem auto 0 0; max-width: 900px; - padding: 1rem 0; + padding: 0 0 1rem; z-index: 2; } diff --git a/app/assets/stylesheets/my_modules/shared/layout_overrides.css b/app/assets/stylesheets/my_modules/shared/layout_overrides.css new file mode 100644 index 000000000..df5307e38 --- /dev/null +++ b/app/assets/stylesheets/my_modules/shared/layout_overrides.css @@ -0,0 +1,25 @@ +.sci--layout-navigation-breadcrumbs { + background-color: var(--sn-white); +} + +.sci--layout-content { + background-color: var(--sn-white); + + .content-pane { + .title-row { + background-color: var(--sn-white); + } + + .header-actions { + background-color: var(--sn-white); + display: flex; + height: 3rem; + padding: 0rem 1rem; + align-items: center; + gap: 0.5rem; + align-self: stretch; + z-index: 205; + border-bottom: 1px solid var(--sn-light-grey); + } + } +} diff --git a/app/assets/stylesheets/navigation/general.scss b/app/assets/stylesheets/navigation/general.scss index fa5e31ddb..e81a8b005 100644 --- a/app/assets/stylesheets/navigation/general.scss +++ b/app/assets/stylesheets/navigation/general.scss @@ -11,6 +11,7 @@ body.navigator-collapsed { --left-navigation-width: 192px; --navbar-height: calc(var(--top-navigation-height) + var(--breadcrumbs-navigation-height)); --navigator-navigation-width: 240px; + --title-row-height: 4em; --top-navigation-height: 72px; display: grid; grid-template-areas: "left top top" diff --git a/app/views/my_modules/_header.html.erb b/app/views/my_modules/_header.html.erb index 3d349533e..a1e7cfadd 100644 --- a/app/views/my_modules/_header.html.erb +++ b/app/views/my_modules/_header.html.erb @@ -17,47 +17,6 @@ <% end %> -