diff --git a/app/assets/stylesheets/global_activities.scss b/app/assets/stylesheets/global_activities.scss index 01c7fb989..1491cadc4 100644 --- a/app/assets/stylesheets/global_activities.scss +++ b/app/assets/stylesheets/global_activities.scss @@ -9,7 +9,6 @@ display: flex; flex-direction: column; height: calc(100vh - 89px); - margin-top: 2em; padding: 0 15px; &.task-activities { @@ -19,9 +18,8 @@ .ga-top { .ga-title { border-bottom: 1px solid $color-gainsboro; - height: 35px; - margin: 20px -15px 0; - padding: 0 0 10px 15px; + margin-top: 14px; + padding: 15px 0; position: relative; width: calc(100% + 30px); } diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss index c25da1795..8a0782a75 100644 --- a/app/assets/stylesheets/my_modules/protocols/index.scss +++ b/app/assets/stylesheets/my_modules/protocols/index.scss @@ -10,6 +10,10 @@ padding: 10px; } +.content-pane.protocols-repository-edit-view { + margin: 0; +} + .task-section { border-left: 3px solid $color-concrete; margin: 16px 0; diff --git a/app/assets/stylesheets/settings/addons.scss b/app/assets/stylesheets/settings/addons.scss new file mode 100644 index 000000000..b7ea05cd7 --- /dev/null +++ b/app/assets/stylesheets/settings/addons.scss @@ -0,0 +1,11 @@ +.user-account-addons { + .content-pane { + margin: 0; + padding-top: 0; + } + + .addons-title { + border-bottom: $border-tertiary; + padding-bottom: 15px; + } +} diff --git a/app/assets/stylesheets/settings/connected_accounts.scss b/app/assets/stylesheets/settings/connected_accounts.scss index ce7cd19ae..b3b501d9c 100644 --- a/app/assets/stylesheets/settings/connected_accounts.scss +++ b/app/assets/stylesheets/settings/connected_accounts.scss @@ -1,3 +1,14 @@ +.user-account-connected-accounts { + .tab-pane-settings { + padding-top: 0; + } + + .connected-accounts-title { + border-bottom: $border-tertiary; + padding-bottom: 15px; + } +} + .connected-account { border: $border-default; border-radius: $border-radius-default; diff --git a/app/assets/stylesheets/settings/preferences.scss b/app/assets/stylesheets/settings/preferences.scss index f59272d5d..1e48719a3 100644 --- a/app/assets/stylesheets/settings/preferences.scss +++ b/app/assets/stylesheets/settings/preferences.scss @@ -5,6 +5,16 @@ @import "mixins"; .user-account-preferences { + .content-pane { + margin: 0; + padding-top: 0; + } + + .preferences-title { + border-bottom: $border-tertiary; + padding-bottom: 15px; + } + .time-zone-container { margin-bottom: 10px; max-width: 450px; diff --git a/app/assets/stylesheets/shared/content_pane.scss b/app/assets/stylesheets/shared/content_pane.scss index a5b339c70..c22542c88 100644 --- a/app/assets/stylesheets/shared/content_pane.scss +++ b/app/assets/stylesheets/shared/content_pane.scss @@ -10,7 +10,7 @@ .content-header { align-items: center; - border-bottom: $border-default; + border-bottom: $border-tertiary; display: flex; height: 5em; diff --git a/app/assets/stylesheets/steps.scss b/app/assets/stylesheets/steps.scss index e085f2459..df9d1872f 100644 --- a/app/assets/stylesheets/steps.scss +++ b/app/assets/stylesheets/steps.scss @@ -61,9 +61,9 @@ } span.step-number { - font-size: 24px; + font-size: 16px; font-weight: bold; - margin: 0 10px; + margin: 0 5px 0 10px; min-width: fit-content; } diff --git a/app/views/steps/_step.html.erb b/app/views/steps/_step.html.erb index 840db03d2..bfbfadd56 100644 --- a/app/views/steps/_step.html.erb +++ b/app/views/steps/_step.html.erb @@ -11,7 +11,7 @@ - <%= step.position + 1 %> + <%= step.position + 1 %>. <%= render partial: 'users/settings/sidebar.html.erb' %> -
+