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
a9fba2cd
Commit
a9fba2cd
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix modal dialogs
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
42fc32d8
No related merge requests found
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
109 additions
and
117 deletions
+109
-117
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+4
-0
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+1
-21
app/views/help/_shortcuts.html.haml
app/views/help/_shortcuts.html.haml
+30
-28
app/views/projects/blob/_remove.html.haml
app/views/projects/blob/_remove.html.haml
+20
-18
app/views/projects/merge_requests/show/_how_to_merge.html.haml
...iews/projects/merge_requests/show/_how_to_merge.html.haml
+40
-38
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+1
-1
app/views/projects/wikis/_new.html.haml
app/views/projects/wikis/_new.html.haml
+13
-11
No files found.
app/assets/stylesheets/generic/common.scss
View file @
a9fba2cd
...
@@ -96,6 +96,10 @@ pre.well-pre {
...
@@ -96,6 +96,10 @@ pre.well-pre {
color
:
#999
;
color
:
#999
;
text-shadow
:
none
;
text-shadow
:
none
;
}
}
&
.label-inverse
{
background-color
:
#333333
;
}
}
}
/** Big Labels **/
/** Big Labels **/
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/sections/merge_requests.scss
View file @
a9fba2cd
...
@@ -15,28 +15,8 @@
...
@@ -15,28 +15,8 @@
}
}
}
}
.accept_group
{
.accept-group
{
float
:
left
;
border
:
1px
solid
#ADA
;
padding
:
2px
;
@include
border-radius
(
5px
);
background
:
#CEB
;
.accept_merge_request
{
font-size
:
13px
;
float
:
left
;
}
.remove_branch_holder
{
margin-left
:
20px
;
margin-right
:
10px
;
float
:
left
;
}
label
{
color
:
#444
;
text-align
:
left
}
}
}
.how_to_merge_link
{
.how_to_merge_link
{
@extend
.primary
;
@extend
.primary
;
...
...
This diff is collapsed.
Click to expand it.
app/views/help/_shortcuts.html.haml
View file @
a9fba2cd
#modal-shortcuts
.modal.hide
#modal-shortcuts
.modal.hide
.modal-dialog
.modal-content
.modal-header
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
Keyboard Shortcuts
%h3
Keyboard Shortcuts
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/blob/_remove.html.haml
View file @
a9fba2cd
%div
#modal-remove-blob
.modal.hide
#modal-remove-blob
.modal.hide
.modal-dialog
.modal-content
.modal-header
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
.page-title
Remove
#{
@blob
.
name
}
%h3
.page-title
Remove
#{
@blob
.
name
}
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
a9fba2cd
%div
#modal_merge_info
.modal.hide
%div
#modal_merge_info
.modal.hide
.modal-dialog
.modal-content
.modal-header
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
How to merge
%h3
How to merge
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
a9fba2cd
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
%strong
%strong
=
link_to
"click here"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
link_to
"click here"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
for instructions
for instructions
.accept
_
group
.accept
-
group
=
f
.
submit
"Accept Merge Request"
,
class:
"btn btn-create accept_merge_request"
=
f
.
submit
"Accept Merge Request"
,
class:
"btn btn-create accept_merge_request"
-
unless
@merge_request
.
disallow_source_branch_removal?
-
unless
@merge_request
.
disallow_source_branch_removal?
.remove_branch_holder
.remove_branch_holder
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/wikis/_new.html.haml
View file @
a9fba2cd
%div
#modal-new-wiki
.modal.hide
%div
#modal-new-wiki
.modal.hide
.modal-dialog
.modal-content
.modal-header
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
.page-title
New Wiki Page
%h3
.page-title
New Wiki Page
...
...
This diff is collapsed.
Click to expand it.
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