Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert sub-menu to position: relative. #10476

Merged
merged 1 commit into from
Apr 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion medusa/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ def start(self, args):

# Check if we need to perform a restore first
restore_dir = os.path.join(app.DATA_DIR, 'restore')
if os.path.exists(restore_dir):
if os.path.exists(restore_dir) and os.listdir(restore_dir):
success = self.restore_db(restore_dir, app.DATA_DIR)
if self.console_logging:
sys.stdout.write('Restore: restoring DB and config.ini %s!\n' % ('FAILED', 'SUCCESSFUL')[success])
Expand Down
9 changes: 4 additions & 5 deletions themes-default/slim/src/components/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<app-header />
<sub-menu />
<div id="content-row">
<submenu-offset />
<!-- <submenu-offset /> -->
<div id="content-col" :class="layout.wide ? 'col-lg-12 col-md-12' : 'col-lg-10 col-lg-offset-1 col-md-10 col-md-offset-1'">
<vue-snotify />
<alerts />
Expand All @@ -30,7 +30,7 @@ import Alerts from './alerts.vue';
import AppHeader from './app-header.vue';
import SubMenu from './sub-menu.vue';
import AppFooter from './app-footer.vue';
import { LoadProgressBar, ScrollButtons, SubmenuOffset } from './helpers';
import { LoadProgressBar, ScrollButtons } from './helpers';

import { mapState } from 'vuex';

Expand All @@ -42,8 +42,7 @@ export default {
AppHeader,
LoadProgressBar,
ScrollButtons,
SubMenu,
SubmenuOffset
SubMenu
},
computed: {
...mapState({
Expand Down Expand Up @@ -79,7 +78,7 @@ export default {

@media (max-width: 768px) {
#app {
padding-top: 6rem;
padding-top: 3.8rem;
}
}
</style>
1 change: 0 additions & 1 deletion themes-default/slim/src/components/helpers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ export { default as SelectList } from './select-list.vue';
export { default as SelectTraktLists } from './select-trakt-lists.vue';
export { default as ShowSelector } from './show-selector.vue';
export { default as SortedSelectList } from './sorted-select-list.vue';
export { default as SubmenuOffset } from './submenu-offset.vue';
export { default as StateSwitch } from './state-switch.vue';
export { default as TestGuessit } from './test-guessit.vue';
export { default as TestProvider } from './test-provider.vue';
Expand Down
27 changes: 0 additions & 27 deletions themes-default/slim/src/components/helpers/submenu-offset.vue

This file was deleted.

16 changes: 1 addition & 15 deletions themes-default/slim/src/components/sub-menu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,9 @@ export default {
<style scoped>
/* Theme-specific styling adds the rest */
#sub-menu-wrapper {
position: fixed;
position: relative;
width: 100%;
right: 0;
left: 0;
z-index: 1;
top: 40px;
}

#sub-menu-container {
Expand All @@ -159,15 +156,4 @@ export default {
float: right;
margin-left: 4px;
}

@media (max-width: 768px) {
#sub-menu-container {
margin-top: -12px;
}

#sub-menu-wrapper {
display: flex;
top: 60px;
}
}
</style>
98 changes: 6 additions & 92 deletions themes/dark/assets/js/medusa-runtime.js

Large diffs are not rendered by default.

98 changes: 6 additions & 92 deletions themes/light/assets/js/medusa-runtime.js

Large diffs are not rendered by default.