diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-09-10 16:21:49 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-09-21 14:00:33 +0200 |
| commit | b0f7ad1508a1ae4ad54bc50782249343251682fc (patch) | |
| tree | 2233e366fed4a38f5336c887b6c3b7569e250064 /core | |
| parent | 4a3efdc6df25508187a04e58a586ee75be9bf8f7 (diff) | |
| download | nextcloud-server-b0f7ad1508a1ae4ad54bc50782249343251682fc.tar.gz nextcloud-server-b0f7ad1508a1ae4ad54bc50782249343251682fc.zip | |
Finally force the menu to be a first-child of app-navigation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/apps.scss | 132 |
1 files changed, 65 insertions, 67 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index 82f20ef4eac..04c704d38dd 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -103,6 +103,9 @@ kbd { > li { display: inline-flex; flex-wrap: wrap; + position: relative; + width: 100%; + box-sizing: border-box; &:focus, &:hover, &.active, @@ -135,83 +138,78 @@ kbd { } } } - } - .collapsible.open { - &:hover, - &:focus { - //box-shadow: inset 0 0 3px $color-box-shadow; - } - ul { + > a { + background-size: 16px 16px; + background-position: 14px center; + background-repeat: no-repeat; display: block; + justify-content: space-between; + line-height: 44px; + min-height: 44px; + padding: 0 12px; + overflow: hidden; + box-sizing: border-box; + white-space: nowrap; + text-overflow: ellipsis; + color: $color-main-text; + opacity: .57; + flex: 1 1 0; + &:first-child img { + margin-bottom: -3px; + margin-right: 11px; + width: 16px; + margin-left: 2px; + } + + /* Add padding if an icon is set with a class or an inline style */ + &[class*='icon-'], + &[style*="background-image:"] { + padding-left: 44px; + } + + /* Counter can also be inside the link */ + > .app-navigation-entry-utils { + display: inline-block; + float: right; + .app-navigation-entry-utils-counter { + padding-right: 0 !important; + } + } } - } - } - li { - position: relative; - width: 100%; - box-sizing: border-box; - > a { - background-size: 16px 16px; - background-position: 14px center; - background-repeat: no-repeat; - display: block; - justify-content: space-between; - line-height: 44px; - min-height: 44px; - padding: 0 12px; - overflow: hidden; - box-sizing: border-box; - white-space: nowrap; - text-overflow: ellipsis; - color: $color-main-text; - opacity: .57; - flex: 1 1 0; - &:first-child img { - margin-bottom: -3px; - margin-right: 11px; - width: 16px; - margin-left: 2px; + > .app-navigation-entry-menu { + /* fix the flex positionning of the li parent */ + top: 44px; } - /* Add padding if an icon is set with a class or an inline style */ - &[class*='icon-'], - &[style*="background-image:"] { - padding-left: 44px; + /* Show edit/undo field if editing/deleted */ + &.editing, + &.deleted { + > a, + > .app-navigation-entry-utils { + //display: none; + //transform: translateX(100%); + } } - - /* Counter can also be inside the link */ - > .app-navigation-entry-utils { - display: inline-block; - float: right; - .app-navigation-entry-utils-counter { - padding-right: 0 !important; + &.editing { + .app-navigation-entry-edit { + //display: block; + transform: translateX(0); } } - } - > .app-navigation-entry-menu { - /* fix the flex positionning of the li parent */ - top: 44px; - } - - /* Show edit/undo field if editing/deleted */ - &.editing, - &.deleted { - > a, - > .app-navigation-entry-utils { - //display: none; - //transform: translateX(100%); + &.deleted { + .app-navigation-entry-deleted { + //display: inline-flex; + transform: translateX(0); + } } } - &.editing { - .app-navigation-entry-edit { - //display: block; - transform: translateX(0); + .collapsible.open { + &:hover, + &:focus { + //box-shadow: inset 0 0 3px $color-box-shadow; } - } - &.deleted { - .app-navigation-entry-deleted { - //display: inline-flex; - transform: translateX(0); + ul { + display: block; } } } |