Skip to content
代码片段 群组 项目
提交 29ee6216 编辑于 作者: Ezekiel Kigbo's avatar Ezekiel Kigbo
浏览文件

Merge branch 'fix-settings-cutoff' into 'master'

No related branches found
No related tags found
无相关合并请求
...@@ -76,10 +76,6 @@ ...@@ -76,10 +76,6 @@
} }
} }
.settings-section {
isolation: isolate;
}
$sticky-header-z-index: 98; $sticky-header-z-index: 98;
.settings-sticky-header, .settings-sticky-header,
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.js-user-profile .js-user-profile
- else - else
= gitlab_ui_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user js-edit-user js-quick-submit gl-show-field-errors js-password-prompt-form', remote: true }, authenticity_token: true do |f| = gitlab_ui_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user js-edit-user js-quick-submit gl-show-field-errors js-password-prompt-form', remote: true }, authenticity_token: true do |f|
.settings-section.js-search-settings-section .js-search-settings-section
.settings-sticky-header .settings-sticky-header
.settings-sticky-header-inner .settings-sticky-header-inner
%h4.gl-my-0 %h4.gl-my-0
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
= s_("Profiles|Remove avatar") = s_("Profiles|Remove avatar")
.gl-pb-8 .gl-pb-8
.settings-section.js-search-settings-section.gl-border-t.gl-pt-6 .js-search-settings-section.gl-border-t.gl-pt-6
.settings-sticky-header .settings-sticky-header
.settings-sticky-header-inner .settings-sticky-header-inner
%h4.gl-my-0= s_("Profiles|Current status") %h4.gl-my-0= s_("Profiles|Current status")
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
data: { js_name: 'clearStatusAfter' } data: { js_name: 'clearStatusAfter' }
.gl-pb-7 .gl-pb-7
.settings-section.user-time-preferences.js-search-settings-section.gl-border-t.gl-pt-6 .user-time-preferences.js-search-settings-section.gl-border-t.gl-pt-6
.settings-sticky-header .settings-sticky-header
.settings-sticky-header-inner .settings-sticky-header-inner
%h4.gl-my-0= s_("Profiles|Time settings") %h4.gl-my-0= s_("Profiles|Time settings")
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
.js-timezone-dropdown{ data: { timezone_data: timezone_data.to_json, initial_value: @user.timezone, name: 'user[timezone]' } } .js-timezone-dropdown{ data: { timezone_data: timezone_data.to_json, initial_value: @user.timezone, name: 'user[timezone]' } }
.gl-pb-7 .gl-pb-7
.settings-section.js-search-settings-section.gl-border-t.gl-pt-6 .js-search-settings-section.gl-border-t.gl-pt-6
.settings-sticky-header .settings-sticky-header
.settings-sticky-header-inner .settings-sticky-header-inner
%h4.gl-my-0 %h4.gl-my-0
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册