Commit 4abd06a4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fix css mess around git clone panel. Align it properly



Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent b54be57131ac
......@@ -53,6 +53,8 @@
}
.notifications-btn {
float: left;
.fa-bell {
margin-right: 6px;
}
......@@ -77,21 +79,6 @@
}
}
.git-clone-holder {
max-width: 498px;
.form-control {
background: #FFF;
font-size: 14px;
margin-left: -1px;
}
.btn-clipboard {
border: 1px solid $border-color;
padding: 6px $gl-padding;
}
}
.visibility-level-label {
@extend .btn;
@extend .btn-gray;
......@@ -104,11 +91,6 @@
}
}
.git-clone-holder {
display: inline-table;
position: relative;
}
.project-repo-buttons {
margin-top: 12px;
margin-bottom: 0px;
......@@ -118,7 +100,18 @@
margin-bottom: 12px;
}
.clone-row {
.split-repo-buttons,
.project-clone-holder {
display: inline-block;
}
.split-repo-buttons {
margin: 0 12px;
}
}
.btn {
@include btn-gray;
text-transform: none;
}
......@@ -121,7 +114,8 @@
.btn {
@include btn-gray;
text-transform: none;
}
.count-with-arrow {
display: inline-block;
position: relative;
......@@ -195,74 +189,6 @@
}
}
.git-clone-holder {
.project-home-dropdown + & {
margin-right: 45px;
}
.clone-options {
display: table-cell;
a.btn {
width: 100%;
}
}
.form-control {
cursor: auto;
@extend .monospace;
background: #FAFAFA;
width: 101%;
}
.input-group-addon {
background: #f7f8fa;
&.git-protocols {
padding: 0;
border: none;
.input-group-btn:last-child > .btn {
@include border-radius-right(0);
border-left: 1px solid #c6cacf;
margin-left: -2px !important;
}
}
}
}
.split-repo-buttons {
display: inline-table;
margin: 0 12px 0 12px;
.btn{
@include btn-gray;
@include btn-default;
}
.dropdown-toggle {
margin: -5px;
}
}
#notification-form {
margin-left: 5px;
}
.dropdown-new {
margin-left: -5px;
}
.open > .dropdown-new.btn {
@include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
border: 1px solid #c6cacf !important;
background-color: #e4e7ed !important;
text-transform: none;
color: #313236 !important;
font-size: 15px;
}
.dropdown-menu {
@include box-shadow(rgba(76, 86, 103, 0.247059) 0px 0px 1px 0px, rgba(31, 37, 50, 0.317647) 0px 2px 18px 0px);
@include border-radius (0px);
......@@ -603,3 +529,32 @@
position: relative;
}
}
.git-clone-holder {
width: 498px;
.btn-clipboard {
border: 1px solid $border-color;
padding: 6px $gl-padding;
}
.project-home-dropdown + & {
margin-right: 45px;
}
.clone-options {
display: table-cell;
a.btn {
width: 100%;
}
}
.form-control {
@extend .monospace;
background: #FFF;
font-size: 14px;
margin-left: -1px;
cursor: auto;
width: 101%;
}
}
......@@ -44,5 +44,7 @@
= render 'projects/buttons/star'
= render 'projects/buttons/fork'
= render "shared/clone_panel"
.clone-row
.project-clone-holder
= render "shared/clone_panel"
......@@ -48,5 +50,6 @@
.split-repo-buttons
= render "projects/buttons/download"
= render 'projects/buttons/dropdown'
.split-repo-buttons
.btn-group.pull-left
= render "projects/buttons/download"
= render 'projects/buttons/dropdown'
......@@ -52,5 +55,5 @@
= render 'projects/buttons/notifications'
= render 'projects/buttons/notifications'
:javascript
new Star();
- if current_user
%span.dropdown
%a.dropdown-new.btn.btn-new{href: '#', "data-toggle" => "dropdown"}
.btn-group
%a.btn.dropdown-toggle{href: '#', "data-toggle" => "dropdown"}
= icon('plus')
%ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
- if can?(current_user, :create_issue, @project)
......
......@@ -3,9 +3,7 @@
= render 'nav'
.gray-content-block
.row
.col-sm-6
%h3.page-title.oneline
Git access for
%strong= @project_wiki.path_with_namespace
%span.oneline
Git access for
%strong= @project_wiki.path_with_namespace
......@@ -11,6 +9,6 @@
.col-sm-6
= render "shared/clone_panel", project: @project_wiki
.pull-right
= render "shared/clone_panel", project: @project_wiki
.git-empty.prepend-top-default
%fieldset
......
- project = project || @project
.git-clone-holder
.btn-group.clone-options
.git-clone-holder.input-group
.input-group-btn
%a#clone-dropdown.clone-dropdown-btn.btn{href: '#', 'data-toggle' => 'dropdown'}
%span
= default_clone_protocol.upcase
......
Supports Markdown
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