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
22bb925a
Commit
22bb925a
authored
Nov 10, 2011
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #88 from iamntz/master
small UI changes
parents
e5852d41
59445156
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
19 deletions
+51
-19
style.scss
app/assets/stylesheets/style.scss
+37
-13
_head_panel.html.erb
app/views/layouts/_head_panel.html.erb
+9
-2
project.html.haml
app/views/layouts/project.html.haml
+2
-1
_tile.html.haml
app/views/projects/_tile.html.haml
+3
-3
No files found.
app/assets/stylesheets/style.scss
View file @
22bb925a
...
...
@@ -444,7 +444,24 @@ float: right;
}
.account-box.hover
{
height
:
138px
;}
.account-box.hover
.account-links
,
.account-box.hover
.arrow-up
{
display
:
block
;}
.account-box
:hover
>
.account-links
{
display
:
block
;}
header
.account-links
{
background
:
white
;
display
:
none
;
border-radius
:
5px
;
width
:
100px
;
margin-top
:
0
;
float
:
right
;
box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,.
2
);
position
:relative
;}
header
.account-links
:before
{
content
:
"."
;
width
:
0
;
height
:
0
;
position
:absolute
;
border
:
5px
solid
transparent
;
border-color
:rgba
(
255
,
255
,
255
,
0
)
;
border-bottom-color
:
#fafafa
;
text-indent
:
-9999px
;
top
:
-10px
;
line-height
:
0
;
right
:
10px
;
z-index
:
10
;
}
/* Inspired by http://maxvoltar.com/temp/nowplaying/ */
header
.account-links
{
background
:
white
;
display
:
none
;
z-index
:
100000
;
border-radius
:
5px
;
width
:
100px
;
position
:
absolute
;
right
:
20px
;
top
:
46px
;
margin-top
:
0
;
float
:
right
;
box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,.
2
);
}
...
...
@@ -477,18 +494,15 @@ header .account-links a:last-child{
border-bottom
:
0
;
}
header
a
.arrow-up
{
display
:
none
;
width
:
0
;
height
:
0
;
float
:
right
;
margin-right
:
26px
;
margin-bottom
:
0
;
border-left
:
5px
solid
transparent
;
border-right
:
5px
solid
transparent
;
border-bottom
:
5px
solid
white
;
#no_ssh_key_defined
{
border
:
1px
solid
#ee8801
;
margin
:
20px
;
padding
:
20px
;
background
:
#ffe3f0
;
h2
{
margin
:
0
;}
p
{
margin
:
10px
0
0
;}
}
/* eo Account Box */
input
.search-input
{
float
:
left
;
text-shadow
:
none
;
width
:
116px
;
background-image
:
url('icon-search.png')
;
background-repeat
:
no-repeat
;
background-position
:
10px
;
border-radius
:
100px
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,.
7
);
box-shadow
:
0
1px
0
rgba
(
255
,
255
,
255
,.
2
)
,
0
2px
2px
rgba
(
0
,
0
,
0
,.
4
)
inset
;
background-color
:
#D2D5DA
;
background-color
:
rgba
(
255
,
255
,
255
,.
5
);
padding
:
5px
;
padding-left
:
26px
;
margin-top
:
4px
;
margin-right
:
10px
}
input
.search-input
:focus
{
background-color
:
white
;
width
:
216px
;}
...
...
@@ -553,7 +567,17 @@ body.project-page h2.icon span{ background-position: -78px -68px; }
body
.project-page
.project-container
{
position
:
relative
;
float
:
left
;
width
:
100%
;
height
:
100%
;
}
body
.project-page
.page-title
{
margin-bottom
:
0
}
body
.project-page
.project-sidebar
{
width
:
220px
;
left
:
0
;
top
:
0
;
height
:
100%
;
bottom
:
0
;
position
:
absolute
;
background-color
:
#f7f7f7
;
float
:
left
;
display
:
inline-block
;
background
:
#f7f7f7
;
padding
:
20px
0
20px
2%
;
margin
:
0
;
}
body
.project-page
.project-sidebar
input
.text.git-url
{
font-size
:
12px
;
border-radius
:
5px
;
color
:
#666
;
box-shadow
:
0
1px
2px
rgba
(
0
,
0
,
0
,.
2
)
inset
;
padding
:
8px
14px
8px
30px
;
margin-bottom
:
20px
;
background
:
white
url('images.png')
no-repeat
8px
-40px
;}
body
.project-page
input
.text.git-url
,
body
.projects-page
input
.text.git-url
{
font-size
:
12px
;
border-radius
:
5px
;
color
:
#666
;
box-shadow
:
0
1px
2px
rgba
(
0
,
0
,
0
,.
2
)
inset
;
padding
:
5px
14px
5px
30px
;
margin-bottom
:
20px
;
background
:
white
url('images.png')
no-repeat
8px
-43px
;
width
:
100%
;
border
:
0
;}
body
.projects-page
input
.text.git-url
{
margin
:
10px
0
0
}
.git_url_wrapper
{
margin-right
:
50px
}
.projects_selector
:hover
>
.project-box
{
-moz-box-shadow
:
0px
0px
10px
rgba
(
0
,
0
,
0
,
.5
);
-webkit-box-shadow
:
0px
0px
10px
rgba
(
0
,
0
,
0
,
.5
);
box-shadow
:
0px
0px
10px
rgba
(
0
,
0
,
0
,
.5
);
}
body
.project-page
.project-sidebar
aside
{
width
:
219px
}
body
.project-page
.project-sidebar
aside
a
{
display
:
block
;
position
:
relative
;
background
:
white
;
padding
:
15px
10px
;
border-bottom
:
1px
solid
#eee
}
body
.project-page
.project-sidebar
aside
a
:first-child
{
...
...
app/views/layouts/_head_panel.html.erb
View file @
22bb925a
...
...
@@ -8,8 +8,6 @@
<%=
image_tag
gravatar_icon
(
current_user
.
email
)
%>
<%
end
%>
<a
href=
"#"
class=
"arrow-up"
></a>
<div
class=
"account-links"
>
<%=
link_to
profile_path
,
:class
=>
"username"
do
%>
<%#= current_user.name %>
...
...
@@ -50,3 +48,11 @@
});
<% end %>
<% end %>
<% if current_user.keys.all.empty? %>
<div id="no_ssh_key_defined">
<h2>ATTENTION!</h2>
<p>No SSH Key is defined. You won't be able to use any Git command!
<p>Click <%=link_to( 'here', keys_path ) %> to add one!
</div>
<% end %>
\ No newline at end of file
app/views/layouts/project.html.haml
View file @
22bb925a
...
...
@@ -16,7 +16,8 @@
.project-container
.project-sidebar
.fixed
%input
.git-url.text
{
:id
=>
""
,
:name
=>
""
,
:readonly
=>
""
,
:type
=>
"text"
,
:value
=>
@project
.
url_to_repo
,
:class
=>
"one_click_select"
}
.git_url_wrapper
%input
.git-url.text
{
:id
=>
""
,
:name
=>
""
,
:readonly
=>
""
,
:type
=>
"text"
,
:value
=>
@project
.
url_to_repo
,
:class
=>
"one_click_select"
}
%aside
=
link_to
"History"
,
project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"show"
,
:id
=>
@project
)
?
"current"
:
nil
=
link_to
"Tree"
,
tree_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"tree"
,
:id
=>
@project
)
?
"current"
:
nil
...
...
app/views/projects/_tile.html.haml
View file @
22bb925a
-
@projects
.
in_groups_of
(
3
,
false
)
do
|
projects
|
-
projects
.
each_with_index
do
|
project
,
i
|
%div
.grid_1
%div
.grid_1
.projects_selector
%div
{
:class
=>
"project-box ui-box ui-box-big"
}
=
link_to
project_path
(
project
)
do
%h3
=
project
.
name
.data
%p
.title.repository
%p
.title.repository
.git_url_wrapper
%span
Repository:
=
project
.
url_to_repo
%input
{
:value
=>
project
.
url_to_repo
,
:class
=>
[
'git-url'
,
'one_click_select'
,
'text'
,
'project_list_url'
],
:readonly
=>
'readonly'
}
%p
.title.activity
%span
Last Activity:
-
last_note
=
project
.
notes
.
last
...
...
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