diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss index ce4ec7953..b136a901e 100644 --- a/app/assets/stylesheets/application.sass.scss +++ b/app/assets/stylesheets/application.sass.scss @@ -72,6 +72,10 @@ @import "settings/teams"; @import "settings/users"; @import "settings/webhooks"; +@import "shared/content/attachments"; +@import "shared/content/checklist"; +@import "shared/content/table"; +@import "shared/content/text"; @import "shared/action_toolbar"; @import "shared/assets"; @import "shared/avatar"; diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss deleted file mode 100644 index 9381a6405..000000000 --- a/app/assets/stylesheets/application.scss +++ /dev/null @@ -1,100 +0,0 @@ -/* - *= require_self - *= require jquery-ui/draggable - *= require rails_bootstrap_forms - *= require bootstrap-select - *= require sn-icon-font - *= require sn-inter-font - *= stub reports_pdf - */ - -@import "shared_styles/constants/*"; - -@import "constants"; - -@import "bootstrap-sprockets"; -// Core variables and mixins -@import "bootstrap/variables"; -@import "bootstrap/mixins"; - -// Reset and dependencies -@import "bootstrap/normalize"; -@import "bootstrap/print"; -@import "bootstrap/glyphicons"; - -// Core CSS -@import "bootstrap/scaffolding"; -@import "bootstrap/type"; -@import "bootstrap/code"; -@import "bootstrap/grid"; -@import "bootstrap/tables"; -@import "bootstrap/forms"; - -// Components -@import "bootstrap/component-animations"; -@import "bootstrap/dropdowns"; -@import "bootstrap/button-groups"; -@import "bootstrap/input-groups"; -@import "bootstrap/navs"; -@import "bootstrap/navbar"; -@import "bootstrap/breadcrumbs"; -@import "bootstrap/pagination"; -@import "bootstrap/pager"; -@import "bootstrap/labels"; -@import "bootstrap/badges"; -@import "bootstrap/jumbotron"; -@import "bootstrap/thumbnails"; -@import "bootstrap/alerts"; -@import "bootstrap/progress-bars"; -@import "bootstrap/media"; -@import "bootstrap/list-group"; -@import "bootstrap/panels"; -@import "bootstrap/responsive-embed"; -@import "bootstrap/wells"; -@import "bootstrap/close"; - -// Components w/ JavaScript -@import "bootstrap/modals"; -@import "bootstrap/tooltip"; -@import "bootstrap/popovers"; -@import "bootstrap/carousel"; - -// Utility classes -@import "bootstrap/utilities"; -@import "bootstrap/responsive-utilities"; - -@import "bootstrap-datetimepicker"; -@import "bootstrap-colorselector"; -@import "bootstrap-tagsinput"; -@import "bootstrap-tagsinput-typeahead"; -@import "jstree_style.min"; - -@import "shared_styles/elements/*"; - -@import "handsontable.full"; -@import "emojionearea.min"; -@import "ajax-bootstrap-select.min"; -@import "extend/bootstrap"; -@import "access_permissions/*"; -@import "extend/*"; -@import "hooks/*"; -@import "partials/*"; -@import "my_modules/protocols/*"; -@import "my_modules/results/*"; -@import "my_modules/*"; -@import "protocols/*"; -@import "dashboard/*"; -@import "repository/*"; -@import "experiment/*"; -@import "repository_columns/*"; -@import "label_templates/*"; -@import "reports/*"; -@import "settings/*"; -@import "shared/*"; -@import "shared/content/*"; -@import "steps/*"; -@import "themes/*"; - -@import "navigation/*"; - -@import "*" diff --git a/app/assets/stylesheets/my_modules/protocol.scss b/app/assets/stylesheets/my_modules/protocol.scss index b2980f27c..e0b7ff9f9 100644 --- a/app/assets/stylesheets/my_modules/protocol.scss +++ b/app/assets/stylesheets/my_modules/protocol.scss @@ -7,9 +7,9 @@ } .protocol-buttons-group { - column-gap: .5rem; - display: grid; - grid-template-columns: auto auto auto; + align-items: center; + display: flex; + gap: .5rem; } .portocol-header-left-part { @@ -41,11 +41,11 @@ &::before, &::after { - background-color: var(--sn-light-grey); + border-bottom: 1px dotted var(--sn-light-grey); content: ""; display: inline-block; flex-grow: 1; - height: 1px; + height: 0; } .sn-icon-new-task { diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss index f977891b1..4d2961bd4 100644 --- a/app/assets/stylesheets/my_modules/protocols/index.scss +++ b/app/assets/stylesheets/my_modules/protocols/index.scss @@ -51,15 +51,6 @@ width: calc(100% + 2rem); } - .my-module-position-container { - background-color: $color-white; - box-shadow: $flyout-shadow; - margin: 1rem auto 0 0; - max-width: 900px; - padding: 0 0 1rem; - z-index: 2; - } - .dropdown { .dropdown-menu { z-index: 102; @@ -76,7 +67,9 @@ } .task-section { - margin: 16px 0; + background-color: var(--sn-white); + border-radius: .25rem; + margin: 1rem 0; padding: 0 1rem; .task-section-caret { @@ -115,6 +108,10 @@ } } + .task-section-body { + padding-bottom: 1rem; + } + .task-section-header { align-items: center; display: flex; diff --git a/app/assets/stylesheets/my_modules/shared/layout_overrides.css b/app/assets/stylesheets/my_modules/shared/layout_overrides.css deleted file mode 100644 index df5307e38..000000000 --- a/app/assets/stylesheets/my_modules/shared/layout_overrides.css +++ /dev/null @@ -1,25 +0,0 @@ -.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/breadcrumbs.scss b/app/assets/stylesheets/navigation/breadcrumbs.scss index a8fa36e79..5e74b8811 100644 --- a/app/assets/stylesheets/navigation/breadcrumbs.scss +++ b/app/assets/stylesheets/navigation/breadcrumbs.scss @@ -1,7 +1,6 @@ .sci--layout-navigation-breadcrumbs { --max-breadcrumbs-link-width: 11.25rem; align-items: center; - background-color: var(--sn-white); display: flex; flex-wrap: nowrap; padding-left: 1.5rem; diff --git a/app/assets/stylesheets/navigation/general.scss b/app/assets/stylesheets/navigation/general.scss index 38ee9023e..97d6518f4 100644 --- a/app/assets/stylesheets/navigation/general.scss +++ b/app/assets/stylesheets/navigation/general.scss @@ -69,6 +69,7 @@ body.navigator-collapsed { } .sci--layout-navigation-navigator { + background-color: var(--sn-white); grid-area: navigator; height: calc(100vh - var(--top-navigation-height) - var(--breadcrumbs-navigation-height) - 1rem); position: sticky; @@ -80,6 +81,7 @@ body.navigator-collapsed { } .sci--layout-navigation-breadcrumbs { + background-color: var(--sn-white); grid-area: breadcrumbs; height: var(--breadcrumbs-navigation-height); position: sticky; @@ -91,6 +93,7 @@ body.navigator-collapsed { } .sci--layout-content { + background-color: var(--sn-white); grid-area: content; padding: 0 1.5rem; width: 100%; @@ -99,6 +102,15 @@ body.navigator-collapsed { padding: 1em; // override bootstrap and old pages support } } + + &[data-grey-background="true"] { + .sci--layout-content, + .sci--layout-navigation-breadcrumbs, + .sci--layout-navigation-navigator { + background-color: var(--sn-super-light-grey); + + } + } } .w-98 { diff --git a/app/assets/stylesheets/shared/content/step_attachments.scss b/app/assets/stylesheets/shared/content/attachments.scss similarity index 100% rename from app/assets/stylesheets/shared/content/step_attachments.scss rename to app/assets/stylesheets/shared/content/attachments.scss diff --git a/app/assets/stylesheets/shared/content_pane.scss b/app/assets/stylesheets/shared/content_pane.scss index a88bd21ad..663b8159d 100644 --- a/app/assets/stylesheets/shared/content_pane.scss +++ b/app/assets/stylesheets/shared/content_pane.scss @@ -3,16 +3,20 @@ .content-pane { --content-header-size: 9.5em; - background-color: $color-white; + background-color: var(--sn-white); margin: 20px 0; + &.with-grey-background { + background: var(--sn-super-light-grey); + } + &.flexible { margin: 0; } .content-header { &.sticky-header { - background: $color-white; + background-color: inherit; position: sticky; position: -webkit-sticky; top: var(--navbar-height); @@ -21,7 +25,7 @@ .title-row { align-items: center; - background: $color-white; + background-color: inherit; display: flex; height: 4em; margin-left: -1.5rem; diff --git a/app/assets/stylesheets/steps/step.scss b/app/assets/stylesheets/steps/step.scss index 48ee0549d..e4d813b48 100644 --- a/app/assets/stylesheets/steps/step.scss +++ b/app/assets/stylesheets/steps/step.scss @@ -76,27 +76,32 @@ .step-state { align-self: center; - border: 1px solid $color-alto; + background-color: var(--sn-light-grey); + border: 1px solid transparent; border-radius: 50%; cursor: pointer; height: 24px; + position: relative; text-align: center; width: 24px; - margin-bottom: -.5em; + + &::after { + @include font-sn-icon; + color: $color-white; + content: $sn-icon-check; + height: 24px; + left: -1px; + position: absolute; + top: -6px; + } &:hover { - border-color: $brand-success; + border-color: var(--sn-science-blue); } &.completed { - background: $brand-success; - border: 2px solid $brand-success; - - &::after { - @include font-awesome; - color: $color-white; - content: $font-fas-check; - } + background: var(--sn-science-blue); + border: 1px solid var(--sn-science-blue); } } @@ -279,7 +284,7 @@ .step-controls { display: flex; - align-items: baseline; + align-items: center; min-height: 35px; } diff --git a/app/javascript/vue/protocol/container.vue b/app/javascript/vue/protocol/container.vue index e9686307f..99a6278eb 100644 --- a/app/javascript/vue/protocol/container.vue +++ b/app/javascript/vue/protocol/container.vue @@ -15,28 +15,44 @@