diff --git a/src/App.vue b/src/App.vue index 5beb17d1..b6f31c58 100644 --- a/src/App.vue +++ b/src/App.vue @@ -14,6 +14,9 @@ Vikunja + + +

- - - diff --git a/src/styles/components/list.scss b/src/styles/components/list.scss index 96cb2a2d..2becc126 100644 --- a/src/styles/components/list.scss +++ b/src/styles/components/list.scss @@ -40,6 +40,12 @@ .list-title { display: flex; align-items: center; + justify-content: center; + + @media screen and (max-width: $tablet) { + // We need a fixed width for overflowing ellipsis to work + width: calc(100vw - #{$user-dropdown-width-mobile} - #{2 * $hamburger-menu-icon-spacing} - #{$hamburger-menu-icon-width} - 1rem); // -1rem for the edit icon + } h1 { margin: 0; diff --git a/src/styles/theme/content.scss b/src/styles/theme/content.scss index cbf53c98..a43e47e4 100644 --- a/src/styles/theme/content.scss +++ b/src/styles/theme/content.scss @@ -1,7 +1,7 @@ .app-container { min-height: calc(100vh - 65px); @media screen and (max-width: $tablet) { - padding-top: $navbar-height + 0.75rem; + padding-top: $navbar-height; } .app-content { diff --git a/src/styles/theme/navigation.scss b/src/styles/theme/navigation.scss index 261ca0c0..1f60a306 100644 --- a/src/styles/theme/navigation.scss +++ b/src/styles/theme/navigation.scss @@ -25,6 +25,9 @@ .title { margin: 0; font-size: 1.75rem; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; } .navbar-end { @@ -37,15 +40,11 @@ @media screen and (max-width: $tablet) { .navbar-brand { - // This prevents the user icon from snapping to the left into the menu button - width: 0; - overflow: hidden; + display: none; } - } - @media screen and (max-width: 640px) { // Magic number to hide the username if it would take too much space otherwise .user { - width: 4rem; + width: $user-dropdown-width-mobile; display: flex; align-items: center; @@ -110,7 +109,7 @@ transition: all $transition; position: fixed; bottom: 0; - top: $navbar-height + 0.75rem; + top: $navbar-height; overflow-x: auto; width: 17vw; @@ -350,7 +349,6 @@ .mobilemenu-hide-button, .mobilemenu-show-button { display: none; - position: fixed; z-index: 31; font-weight: bold; font-size: 2em; @@ -363,7 +361,7 @@ } .mobilemenu-hide-button { - color: $dark; + position: fixed; &:hover, &:focus { color: $dark; @@ -386,14 +384,13 @@ @media screen and (max-width: $tablet) { .mobilemenu-hide-button { display: block; - top: 1rem; - right: 1rem; + top: $hamburger-menu-icon-spacing; + right: $hamburger-menu-icon-spacing; } .mobilemenu-show-button { display: block; - top: 1rem; - left: 1rem; + margin-left: $hamburger-menu-icon-spacing; } .mobile-overlay { diff --git a/src/styles/theme/variables.scss b/src/styles/theme/variables.scss index e54dff0a..1ae99714 100644 --- a/src/styles/theme/variables.scss +++ b/src/styles/theme/variables.scss @@ -1,6 +1,4 @@ - -$black: hsl(0, 0%, 4%) !default - +$black: hsl(0, 0%, 4%) !default; $orange: #ff851b; $green: #00CE6E; $blue: #5974d9; @@ -22,7 +20,7 @@ $transparent-background-light: rgba($light-background, 0.9); $vikunja-font: 'Quicksand', sans-serif; $vikunja-light-text: darken(#fff, 10%); -$vikunja-blue: #7F23FF;// #7F23FF; // #5974d9 +$vikunja-blue: #7F23FF; // #7F23FF; // #5974d9 $vikunja-green: #4DB788; $navbar-padding: 2em; @@ -46,4 +44,9 @@ $scrollbar-hover-color: lighten($dark, 30); $button-height: 2.648em; -$switch-view-height: 43px; \ No newline at end of file +$switch-view-height: 43px; + +$user-dropdown-width-mobile: 4rem; +$hamburger-menu-icon-spacing: 1rem; +$hamburger-menu-icon-width: 28px; +$navbar-height: 4rem;