diff --git a/app/assets/stylesheets/app/_editor.scss b/app/assets/stylesheets/app/_editor.scss index e07ea1e77..0d4f3b225 100644 --- a/app/assets/stylesheets/app/_editor.scss +++ b/app/assets/stylesheets/app/_editor.scss @@ -21,7 +21,7 @@ $heading-height: 75px; background-color: white; border-bottom: none; - z-index: 100; + z-index: $z-index-editor-title-bar; height: auto; overflow: visible; @@ -96,7 +96,7 @@ $heading-height: 75px; .editor-content, #editor-content { flex: 1; - z-index: 10; + z-index: $z-index-editor-content; overflow-y: hidden; height: 100%; display: flex; diff --git a/app/assets/stylesheets/app/_footer.scss b/app/assets/stylesheets/app/_footer.scss index de48f2244..d2d1519ce 100644 --- a/app/assets/stylesheets/app/_footer.scss +++ b/app/assets/stylesheets/app/_footer.scss @@ -3,11 +3,11 @@ width: 100%; height: $footer-height; max-height: $footer-height; - z-index: 100; + z-index: $z-index-footer-bar; } #footer-bar .item { - z-index: 1000; + z-index: $z-index-footer-bar-item; position: relative; user-select: none; @@ -18,7 +18,7 @@ left: 10px; bottom: 40px; min-width: 300px; - z-index: 1000; + z-index: $z-index-footer-bar-item-panel; margin-top: 15px; background-color: white; } diff --git a/app/assets/stylesheets/app/_lock-screen.scss b/app/assets/stylesheets/app/_lock-screen.scss index 432edb997..7dad8285a 100644 --- a/app/assets/stylesheets/app/_lock-screen.scss +++ b/app/assets/stylesheets/app/_lock-screen.scss @@ -11,7 +11,7 @@ top: 0; bottom: 0; - z-index: 10000; + z-index: $z-index-lock-screen; background-color: rgba(white, 0.5); color: black; font-size: 16px; diff --git a/app/assets/stylesheets/app/_main.scss b/app/assets/stylesheets/app/_main.scss index 09d297340..d915c5e71 100644 --- a/app/assets/stylesheets/app/_main.scss +++ b/app/assets/stylesheets/app/_main.scss @@ -6,6 +6,21 @@ $selection-color: $bg-color; $selected-text-color: black; $blue-color: #086dd6; +$z-index-editor-content: 10; + +$z-index-editor-title-bar: 100; +$z-index-dropdown-menu: 100; + +$z-index-resizer-overlay: 1000; +$z-index-panel-resizer: 1001; + +$z-index-footer-bar: 2000; +$z-index-footer-bar-item: 2000; +$z-index-footer-bar-item-panel: 2000; + +$z-index-lock-screen: 10000; +$z-index-modal: 10000; + html, body { font-family: -apple-system, BlinkMacSystemFont, @@ -80,7 +95,7 @@ $footer-height: 32px; width: 100%; height: 100%; background-color: transparent; - z-index: 1000; + z-index: $z-index-resizer-overlay; opacity: 0; } @@ -95,7 +110,7 @@ $footer-height: 32px; panel-resizer { top: 0; right: 0; - z-index: 1001; + z-index: $z-index-panel-resizer; width: 8px; height: 100%; position: absolute; diff --git a/app/assets/stylesheets/app/_menus.scss b/app/assets/stylesheets/app/_menus.scss index 362eaf767..77de3a5ff 100644 --- a/app/assets/stylesheets/app/_menus.scss +++ b/app/assets/stylesheets/app/_menus.scss @@ -10,7 +10,7 @@ left: 0; float: left; min-width: 160px; - z-index: 100; + z-index: $z-index-dropdown-menu; margin-top: 5px; width: 280px; diff --git a/app/assets/stylesheets/app/_modals.scss b/app/assets/stylesheets/app/_modals.scss index b1909e151..ca1dac561 100644 --- a/app/assets/stylesheets/app/_modals.scss +++ b/app/assets/stylesheets/app/_modals.scss @@ -59,7 +59,7 @@ right: 0; top: 0; bottom: 0; - z-index: 10000; + z-index: $z-index-modal; width: 100vw; height: 100vh; background-color: rgba(gray, 0.3); diff --git a/config/application.rb b/config/application.rb index c63f7d77e..2ecff23ce 100644 --- a/config/application.rb +++ b/config/application.rb @@ -16,21 +16,6 @@ Bundler.require(*Rails.groups) module Neeto class Application < Rails::Application - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # config.time_zone = 'Central Time (US & Canada)' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - - # Do not swallow errors in after_commit/after_rollback callbacks. - # config.active_record.raise_in_transactional_callbacks = true - # Cross-Origin Resource Sharing (CORS) for Rack compatible web applications. config.middleware.insert_before 0, Rack::Cors do allow do