Commit a9fba2cd authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix modal dialogs

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 42fc32d8
No related merge requests found
...@@ -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 **/
......
...@@ -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;
......
#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
......
%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}
......
%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
......
...@@ -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
......
%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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment