Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
aba98c58
Commit
aba98c58
authored
Dec 10, 2020
by
Chad Woolley
Committed by
Denys Mishunov
Jan 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Standardize wiki header spacing
Make it use the standard .page-title class.
parent
3ae06d3d
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
32 additions
and
35 deletions
+32
-35
app/assets/stylesheets/page_bundles/wiki.scss
app/assets/stylesheets/page_bundles/wiki.scss
+0
-5
app/views/shared/wikis/diff.html.haml
app/views/shared/wikis/diff.html.haml
+5
-6
app/views/shared/wikis/edit.html.haml
app/views/shared/wikis/edit.html.haml
+8
-9
app/views/shared/wikis/history.html.haml
app/views/shared/wikis/history.html.haml
+5
-6
app/views/shared/wikis/pages.html.haml
app/views/shared/wikis/pages.html.haml
+3
-3
changelogs/unreleased/wiki-header-spacing.yml
changelogs/unreleased/wiki-header-spacing.yml
+5
-0
spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb
...s/features/wiki/user_creates_wiki_page_shared_examples.rb
+3
-3
spec/support/shared_examples/features/wiki/user_uses_wiki_shortcuts_shared_examples.rb
...features/wiki/user_uses_wiki_shortcuts_shared_examples.rb
+1
-1
spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb
...les/features/wiki/user_views_wiki_page_shared_examples.rb
+2
-2
No files found.
app/assets/stylesheets/page_bundles/wiki.scss
View file @
aba98c58
...
@@ -15,11 +15,6 @@
...
@@ -15,11 +15,6 @@
padding
:
11px
0
;
padding
:
11px
0
;
}
}
.wiki-page-title
{
margin
:
0
;
font-size
:
22px
;
}
.wiki-last-edit-by
{
.wiki-last-edit-by
{
display
:
block
;
display
:
block
;
color
:
var
(
--
gray-500
,
$gray-500
);
color
:
var
(
--
gray-500
,
$gray-500
);
...
...
app/views/shared/wikis/diff.html.haml
View file @
aba98c58
...
@@ -5,12 +5,11 @@
...
@@ -5,12 +5,11 @@
.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
=
wiki_sidebar_toggle_button
=
wiki_sidebar_toggle_button
.nav-text
%h3
.page-title.gl-flex-fill-1
%h2
.wiki-page-title
=
link_to_wiki_page
@page
=
link_to_wiki_page
@page
%span
.light
%span
.light
·
·
=
_
(
'Changes'
)
=
_
(
'Changes'
)
.nav-controls.pb-md-3.pb-lg-0
.nav-controls.pb-md-3.pb-lg-0
=
link_to
wiki_page_path
(
@wiki
,
@page
,
action: :history
),
class:
'btn gl-button'
,
role:
'button'
,
data:
{
qa_selector:
'page_history_button'
}
do
=
link_to
wiki_page_path
(
@wiki
,
@page
,
action: :history
),
class:
'btn gl-button'
,
role:
'button'
,
data:
{
qa_selector:
'page_history_button'
}
do
...
...
app/views/shared/wikis/edit.html.haml
View file @
aba98c58
...
@@ -6,15 +6,14 @@
...
@@ -6,15 +6,14 @@
.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
=
wiki_sidebar_toggle_button
=
wiki_sidebar_toggle_button
.nav-text
%h3
.page-title.gl-flex-fill-1
%h2
.wiki-page-title
-
if
@page
.
persisted?
-
if
@page
.
persisted?
=
link_to_wiki_page
@page
=
link_to_wiki_page
@page
%span
.light
%span
.light
·
·
=
s_
(
"Wiki|Edit Page"
)
=
s_
(
"Wiki|Edit Page"
)
-
else
-
else
=
s_
(
"Wiki|Create New Page"
)
=
s_
(
"Wiki|Create New Page"
)
.nav-controls.pb-md-3.pb-lg-0
.nav-controls.pb-md-3.pb-lg-0
-
if
@page
.
persisted?
-
if
@page
.
persisted?
...
...
app/views/shared/wikis/history.html.haml
View file @
aba98c58
...
@@ -4,12 +4,11 @@
...
@@ -4,12 +4,11 @@
.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
=
wiki_sidebar_toggle_button
=
wiki_sidebar_toggle_button
.nav-text
%h3
.page-title
%h2
.wiki-page-title
=
link_to_wiki_page
@page
=
link_to_wiki_page
@page
%span
.light
%span
.light
·
·
=
_
(
'History'
)
=
_
(
'History'
)
.prepend-top-default.gl-mb-3
.prepend-top-default.gl-mb-3
.table-holder
.table-holder
...
...
app/views/shared/wikis/pages.html.haml
View file @
aba98c58
...
@@ -6,9 +6,9 @@
...
@@ -6,9 +6,9 @@
.wiki-page-header.top-area.flex-column.flex-lg-row
.wiki-page-header.top-area.flex-column.flex-lg-row
.nav-text.flex-fill
%h2
.wiki-page-title
%h3
.page-title.gl-flex-fill-1
=
s_
(
"Wiki|Wiki Pages"
)
=
s_
(
"Wiki|Wiki Pages"
)
.nav-controls.pb-md-3.pb-lg-0
.nav-controls.pb-md-3.pb-lg-0
=
link_to
wiki_path
(
@wiki
,
action: :git_access
),
class:
'btn gl-button'
do
=
link_to
wiki_path
(
@wiki
,
action: :git_access
),
class:
'btn gl-button'
do
...
...
changelogs/unreleased/wiki-header-spacing.yml
0 → 100644
View file @
aba98c58
---
title
:
Standardize page title styles on all wiki pages
merge_request
:
49777
author
:
type
:
changed
spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb
View file @
aba98c58
...
@@ -79,7 +79,7 @@ RSpec.shared_examples 'User creates wiki page' do
...
@@ -79,7 +79,7 @@ RSpec.shared_examples 'User creates wiki page' do
expect
(
current_path
).
to
eq
(
wiki_page_path
(
wiki
,
"test"
))
expect
(
current_path
).
to
eq
(
wiki_page_path
(
wiki
,
"test"
))
page
.
within
(
:css
,
".
nav-text
"
)
do
page
.
within
(
:css
,
".
wiki-page-header
"
)
do
expect
(
page
).
to
have_content
(
"Create New Page"
)
expect
(
page
).
to
have_content
(
"Create New Page"
)
end
end
...
@@ -91,7 +91,7 @@ RSpec.shared_examples 'User creates wiki page' do
...
@@ -91,7 +91,7 @@ RSpec.shared_examples 'User creates wiki page' do
expect
(
current_path
).
to
eq
(
wiki_page_path
(
wiki
,
"api"
))
expect
(
current_path
).
to
eq
(
wiki_page_path
(
wiki
,
"api"
))
page
.
within
(
:css
,
".
nav-text
"
)
do
page
.
within
(
:css
,
".
wiki-page-header
"
)
do
expect
(
page
).
to
have_content
(
"Create"
)
expect
(
page
).
to
have_content
(
"Create"
)
end
end
...
@@ -103,7 +103,7 @@ RSpec.shared_examples 'User creates wiki page' do
...
@@ -103,7 +103,7 @@ RSpec.shared_examples 'User creates wiki page' do
expect
(
current_path
).
to
eq
(
wiki_page_path
(
wiki
,
"raketasks"
))
expect
(
current_path
).
to
eq
(
wiki_page_path
(
wiki
,
"raketasks"
))
page
.
within
(
:css
,
".
nav-text
"
)
do
page
.
within
(
:css
,
".
wiki-page-header
"
)
do
expect
(
page
).
to
have_content
(
"Create"
)
expect
(
page
).
to
have_content
(
"Create"
)
end
end
end
end
...
...
spec/support/shared_examples/features/wiki/user_uses_wiki_shortcuts_shared_examples.rb
View file @
aba98c58
...
@@ -15,6 +15,6 @@ RSpec.shared_examples 'User uses wiki shortcuts' do
...
@@ -15,6 +15,6 @@ RSpec.shared_examples 'User uses wiki shortcuts' do
it
'visit edit wiki page using "e" keyboard shortcut'
,
:js
do
it
'visit edit wiki page using "e" keyboard shortcut'
,
:js
do
find
(
'body'
).
native
.
send_key
(
'e'
)
find
(
'body'
).
native
.
send_key
(
'e'
)
expect
(
find
(
'.
wiki-
page-title'
)).
to
have_content
(
'Edit Page'
)
expect
(
find
(
'.page-title'
)).
to
have_content
(
'Edit Page'
)
end
end
end
end
spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb
View file @
aba98c58
...
@@ -44,7 +44,7 @@ RSpec.shared_examples 'User views a wiki page' do
...
@@ -44,7 +44,7 @@ RSpec.shared_examples 'User views a wiki page' do
expect
(
current_path
).
to
include
(
'one/two/three-test'
)
expect
(
current_path
).
to
include
(
'one/two/three-test'
)
page
.
within
(
:css
,
'.
nav-text
'
)
do
page
.
within
(
:css
,
'.
wiki-page-header
'
)
do
expect
(
page
).
to
have_content
(
'History'
)
expect
(
page
).
to
have_content
(
'History'
)
end
end
end
end
...
@@ -69,7 +69,7 @@ RSpec.shared_examples 'User views a wiki page' do
...
@@ -69,7 +69,7 @@ RSpec.shared_examples 'User views a wiki page' do
click_on
(
'Page history'
)
click_on
(
'Page history'
)
within
(
'.
nav-text
'
)
do
within
(
'.
wiki-page-header
'
)
do
expect
(
page
).
to
have_content
(
'History'
)
expect
(
page
).
to
have_content
(
'History'
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment