BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f8707e26
Unverified
Commit
f8707e26
authored
Jan 14, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix css mess around git clone panel. Align it properly
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
49c310e4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
60 additions
and
104 deletions
+60
-104
projects.scss
app/assets/stylesheets/pages/projects.scss
+43
-88
_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+8
-5
_dropdown.html.haml
app/views/projects/buttons/_dropdown.html.haml
+2
-2
git_access.html.haml
app/views/projects/wikis/git_access.html.haml
+5
-7
_clone_panel.html.haml
app/views/shared/_clone_panel.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
f8707e26
...
...
@@ -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,10 +100,22 @@
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
;
}
.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 @@ pre.light-well {
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%
;
}
}
app/views/projects/_home_panel.html.haml
View file @
f8707e26
...
...
@@ -44,13 +44,16 @@
=
render
'projects/buttons/star'
=
render
'projects/buttons/fork'
=
render
"shared/clone_panel"
.clone-row
.project-clone-holder
=
render
"shared/clone_panel"
.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'
=
render
'projects/buttons/notifications'
=
render
'projects/buttons/notifications'
:javascript
new
Star
();
app/views/projects/buttons/_dropdown.html.haml
View file @
f8707e26
-
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
)
...
...
app/views/projects/wikis/git_access.html.haml
View file @
f8707e26
...
...
@@ -3,14 +3,12 @@
=
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
.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
...
...
app/views/shared/_clone_panel.html.haml
View file @
f8707e26
-
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
...
...
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