update wiki pages with new design
This commit is contained in:
parent
a151805572
commit
952bdfae52
|
@ -5,9 +5,39 @@
|
|||
padding-right: 7px;
|
||||
}
|
||||
|
||||
.top-area {
|
||||
.wiki-page-header {
|
||||
@extend .top-area;
|
||||
position: relative;
|
||||
|
||||
.wiki-page-title {
|
||||
margin: 0;
|
||||
font-size: 22px;
|
||||
}
|
||||
|
||||
.wiki-last-edit-by {
|
||||
color: $gl-gray-light;
|
||||
|
||||
strong {
|
||||
color: $gl-text-color;
|
||||
}
|
||||
}
|
||||
|
||||
.light {
|
||||
font-weight: normal;
|
||||
color: $gl-gray-light;
|
||||
}
|
||||
|
||||
.git-access-header {
|
||||
padding: 16px 0 11px;
|
||||
line-height: 28px;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
.git-clone-holder {
|
||||
width: 100%;
|
||||
padding-bottom: 40px;
|
||||
}
|
||||
|
||||
button.sidebar-toggle {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
|
@ -17,6 +47,10 @@
|
|||
|
||||
@media (min-width: $screen-sm-min) {
|
||||
padding-right: 40px;
|
||||
|
||||
.git-clone-holder {
|
||||
width: 480px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: $screen-md-min) {
|
||||
|
@ -28,27 +62,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
.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;
|
||||
|
||||
|
|
|
@ -34,9 +34,6 @@
|
|||
- if @page && @page.persisted?
|
||||
= f.submit 'Save changes', class: "btn-save btn"
|
||||
.pull-right
|
||||
- if can?(current_user, :admin_wiki, @project)
|
||||
= link_to namespace_project_wiki_path(@project.namespace, @project, @page), data: { confirm: "Are you sure you want to delete this page?"}, method: :delete, class: "btn btn-danger btn-grouped" do
|
||||
Delete
|
||||
= link_to "Cancel", namespace_project_wiki_path(@project.namespace, @project, @page), class: "btn btn-cancel btn-grouped"
|
||||
- else
|
||||
= f.submit 'Create page', class: "btn-create btn"
|
||||
|
|
|
@ -2,25 +2,33 @@
|
|||
- page_title "Edit", @page.title.capitalize, "Wiki"
|
||||
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
.wiki-page-header
|
||||
%button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
|
||||
= icon('angle-double-left')
|
||||
|
||||
.nav-text
|
||||
%strong
|
||||
%h2.wiki-page-title
|
||||
- if @page.persisted?
|
||||
= link_to @page.title.capitalize, namespace_project_wiki_path(@project.namespace, @project, @page)
|
||||
- else
|
||||
= @page.title.capitalize
|
||||
%span.light
|
||||
·
|
||||
Edit Page
|
||||
%span.light
|
||||
·
|
||||
- if @page.persisted?
|
||||
Edit Page
|
||||
- else
|
||||
Create Page
|
||||
|
||||
.nav-controls
|
||||
- if !(@page && @page.persisted?)
|
||||
- if can?(current_user, :create_wiki, @project)
|
||||
= link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
|
||||
New Page
|
||||
- if can?(current_user, :create_wiki, @project)
|
||||
= link_to '#modal-new-wiki', class: "add-new-wiki btn btn-new", "data-toggle" => "modal" do
|
||||
New Page
|
||||
- if @page.persisted?
|
||||
= link_to namespace_project_wiki_history_path(@project.namespace, @project, @page), class: "btn" do
|
||||
Page History
|
||||
- if can?(current_user, :admin_wiki, @project)
|
||||
= link_to namespace_project_wiki_path(@project.namespace, @project, @page), data: { confirm: "Are you sure you want to delete this page?"}, method: :delete, class: "btn btn-danger" do
|
||||
Delete
|
||||
|
||||
= render 'form'
|
||||
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
- page_title "History", @page.title.capitalize, "Wiki"
|
||||
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
.wiki-page-header
|
||||
%button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
|
||||
= icon('angle-double-left')
|
||||
|
||||
.nav-text
|
||||
%strong
|
||||
%h2.wiki-page-title
|
||||
= link_to @page.title.capitalize, namespace_project_wiki_path(@project.namespace, @project, @page)
|
||||
%span.light
|
||||
·
|
||||
History
|
||||
%span.light
|
||||
·
|
||||
History
|
||||
|
||||
.table-holder
|
||||
%table.table
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
- page_title "Pages", "Wiki"
|
||||
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
.wiki-page-header
|
||||
%button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
|
||||
= icon('angle-double-left')
|
||||
|
||||
.nav-text
|
||||
%strong
|
||||
%h2.wiki-page-title
|
||||
Wiki Pages
|
||||
|
||||
%ul.content-list
|
||||
|
|
|
@ -2,16 +2,18 @@
|
|||
- page_title @page.title.capitalize, "Wiki"
|
||||
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
.wiki-page-header
|
||||
%button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
|
||||
= icon('angle-double-left')
|
||||
|
||||
.nav-text
|
||||
%strong= @page.title.capitalize
|
||||
%h2.wiki-page-title= @page.title.capitalize
|
||||
|
||||
%span.wiki-last-edit-by
|
||||
·
|
||||
last edited by #{@page.commit.author.name} #{time_ago_with_tooltip(@page.commit.authored_date)}
|
||||
Last edited by
|
||||
%strong
|
||||
#{@page.commit.author.name}
|
||||
#{time_ago_with_tooltip(@page.commit.authored_date)}
|
||||
|
||||
.nav-controls
|
||||
= render 'main_links'
|
||||
|
@ -21,7 +23,6 @@
|
|||
This is an old version of this page.
|
||||
You can view the #{link_to "most recent version", namespace_project_wiki_path(@project.namespace, @project, @page)} or browse the #{link_to "history", namespace_project_wiki_history_path(@project.namespace, @project, @page)}.
|
||||
|
||||
|
||||
.wiki-holder.prepend-top-default.append-bottom-default
|
||||
.wiki
|
||||
= preserve do
|
||||
|
|
Loading…
Reference in New Issue