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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
9fa65125
Commit
9fa65125
authored
Nov 15, 2016
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update design of wiki git access page
parent
48f4f76c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
32 deletions
+54
-32
app/assets/stylesheets/pages/wiki.scss
app/assets/stylesheets/pages/wiki.scss
+32
-8
app/views/projects/wikis/git_access.html.haml
app/views/projects/wikis/git_access.html.haml
+22
-24
No files found.
app/assets/stylesheets/pages/wiki.scss
View file @
9fa65125
...
@@ -8,10 +8,6 @@
...
@@ -8,10 +8,6 @@
.top-area
{
.top-area
{
position
:
relative
;
position
:
relative
;
&
.sub-header-block
{
padding-right
:
40px
;
}
button
.sidebar-toggle
{
button
.sidebar-toggle
{
position
:
absolute
;
position
:
absolute
;
right
:
0
;
right
:
0
;
...
@@ -24,10 +20,7 @@
...
@@ -24,10 +20,7 @@
}
}
@media
(
min-width
:
$screen-md-min
)
{
@media
(
min-width
:
$screen-md-min
)
{
&
,
padding-right
:
0
;
&
.sub-header-block
{
padding-right
:
0
;
}
button
.sidebar-toggle
{
button
.sidebar-toggle
{
display
:
none
;
display
:
none
;
...
@@ -35,6 +28,37 @@
...
@@ -35,6 +28,37 @@
}
}
}
}
.wiki-page-header
{
@extend
.top-area
;
.git-access-header
{
padding
:
16px
0
11px
;
line-height
:
28px
;
font-size
:
18px
;
}
.git-clone-holder
{
width
:
480px
;
padding-bottom
:
40px
;
}
@media
(
max-width
:
$screen-xs-max
)
{
.git-clone-holder
{
width
:
100%
;
}
}
}
.wiki-git-access
{
margin
:
$gl-padding
0
;
h3
{
font-size
:
22px
;
font-weight
:
normal
;
margin-top
:
1
.4em
;
}
}
.right-sidebar.wiki-sidebar
{
.right-sidebar.wiki-sidebar
{
padding
:
$gl-padding
0
;
padding
:
$gl-padding
0
;
...
...
app/views/projects/wikis/git_access.html.haml
View file @
9fa65125
...
@@ -2,37 +2,35 @@
...
@@ -2,37 +2,35 @@
-
page_title
"Git Access"
,
"Wiki"
-
page_title
"Git Access"
,
"Wiki"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.
top-area.sub-header-block
.
wiki-page-header
%button
.btn.btn-default.visible-xs.visible-sm.pull-right.sidebar-toggle.js-sidebar-wiki-toggle
{
role:
"button"
,
type:
"button"
}
%button
.btn.btn-default.visible-xs.visible-sm.pull-right.sidebar-toggle.js-sidebar-wiki-toggle
{
role:
"button"
,
type:
"button"
}
=
icon
(
'angle-double-left'
)
=
icon
(
'angle-double-left'
)
%span
.oneline
.git-access-header
Git access for
Clone repository
%strong
=
@project_wiki
.
path_with_namespace
%strong
=
@project_wiki
.
path_with_namespace
.pull-right
=
render
"shared/clone_panel"
,
project:
@project_wiki
=
render
"shared/clone_panel"
,
project:
@project_wiki
.prepend-top-default
.wiki-git-access
%fieldset
%h3
Install Gollum
%legend
Install Gollum:
%pre
.dark
%pre
.dark
:preserve
:preserve
gem install gollum
gem install gollum
%legend
Clone Your Wiki:
%h3
Clone your wiki
%pre
.dark
%pre
.dark
:preserve
:preserve
git clone
#{
content_tag
(
:span
,
default_url_to_repo
(
@project_wiki
),
class:
'clone'
)
}
git clone
#{
content_tag
(
:span
,
default_url_to_repo
(
@project_wiki
),
class:
'clone'
)
}
cd
#{
h
@project_wiki
.
path
}
cd
#{
h
@project_wiki
.
path
}
%legend
Start Gollum And Edit Locally:
%h3
Start Gollum and edit locally
%pre
.dark
%pre
.dark
:preserve
:preserve
gollum
gollum
== Sinatra/1.3.5 has taken the stage on 4567 for development with backup from Thin
== Sinatra/1.3.5 has taken the stage on 4567 for development with backup from Thin
>> Thin web server (v1.5.0 codename Knife)
>> Thin web server (v1.5.0 codename Knife)
>> Maximum connections set to 1024
>> Maximum connections set to 1024
>> Listening on 0.0.0.0:4567, CTRL+C to stop
>> Listening on 0.0.0.0:4567, CTRL+C to stop
=
render
'sidebar'
=
render
'sidebar'
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