diff --git a/app/assets/javascripts/pages/shared/wikis/components/wiki_sidebar_entries.vue b/app/assets/javascripts/pages/shared/wikis/components/wiki_sidebar_entries.vue index 0a125a663cbfa47075de75e1c185565d91d39ad4..5fe1aacbaddd285ec7709ac1e2a2d1717c9813ee 100644 --- a/app/assets/javascripts/pages/shared/wikis/components/wiki_sidebar_entries.vue +++ b/app/assets/javascripts/pages/shared/wikis/components/wiki_sidebar_entries.vue @@ -51,7 +51,7 @@ export default { <div v-if="isLoadingContent && !hasCustomSidebar" class="gl-m-3"> <gl-skeleton-loader /> </div> - <ul v-else class="wiki-pages" :class="{ 'gl-border-b !gl-pb-3': hasCustomSidebar }"> + <ul v-else class="wiki-pages" :class="{ 'gl-border-b !gl-pb-4': hasCustomSidebar }"> <gl-search-box-by-type v-model.trim="searchTerm" :placeholder="s__('Wiki|Search pages')" @@ -70,7 +70,7 @@ export default { size="small" variant="link" data-testid="view-all-pages-button" - class="gl-ml-3 gl-mt-3" + class="gl-ml-4 gl-mt-3" :href="viewAllPagesPath" > {{ s__('Wiki|View all pages') }} diff --git a/app/assets/stylesheets/page_bundles/wiki.scss b/app/assets/stylesheets/page_bundles/wiki.scss index fb044d9c2ca8799b00a9d35f1953119218d7be91..2c661b25dd2abcf0ff0b1bf7ab5d5f1f7b2ab5cf 100644 --- a/app/assets/stylesheets/page_bundles/wiki.scss +++ b/app/assets/stylesheets/page_bundles/wiki.scss @@ -28,7 +28,8 @@ li > .wiki-list { min-height: 30px; - padding: 0 $gl-padding-8; + @apply gl-mx-2; + margin-bottom: 1px; &:hover, &.active { diff --git a/app/views/shared/wikis/_sidebar.html.haml b/app/views/shared/wikis/_sidebar.html.haml index 536d91dea20511f787fd210c6f86eaac07638375..17c194cdc293c306ec8bd6f416cb42e0d41c6ac3 100644 --- a/app/views/shared/wikis/_sidebar.html.haml +++ b/app/views/shared/wikis/_sidebar.html.haml @@ -37,5 +37,5 @@ } } - if @sidebar_page - .gl-px-3.gl-pt-4.gl-pb-2 + .gl-px-4.gl-pt-4.gl-pb-2 = render_wiki_content(@sidebar_page)