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
c844723a
Commit
c844723a
authored
Feb 12, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restyled main menu. move from left to top orientation
parent
9511ec84
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
61 additions
and
34 deletions
+61
-34
common.scss
app/assets/stylesheets/common.scss
+47
-13
_app_menu.html.haml
app/views/layouts/_app_menu.html.haml
+1
-2
_project_menu.html.haml
app/views/layouts/_project_menu.html.haml
+1
-3
admin.html.haml
app/views/layouts/admin.html.haml
+1
-3
application.html.haml
app/views/layouts/application.html.haml
+3
-4
profile.html.haml
app/views/layouts/profile.html.haml
+3
-4
project.html.haml
app/views/layouts/project.html.haml
+3
-3
_tile.html.haml
app/views/projects/_tile.html.haml
+1
-1
_tree.html.haml
app/views/refs/_tree.html.haml
+1
-1
No files found.
app/assets/stylesheets/common.scss
View file @
c844723a
...
@@ -78,29 +78,63 @@ a {
...
@@ -78,29 +78,63 @@ a {
margin-top
:
62px
;
margin-top
:
62px
;
}
}
.container-fluid
>
.sidebar
{
.container-fluid
.sidebar
{
width
:
14
0px
;
width
:
25
0px
;
border-
right
:
1px
solid
$
border_color
;
border-
left
:
1px
solid
$lite_
border_color
;
height
:
100%
;
height
:
100%
;
min-height
:
450px
;
min-height
:
450px
;
float
:right
;
}
nav
.main_menu
{
border-radius
:
4px
;
box-shadow
:
0
1px
2px
black
;
width
:
100%
;
margin
:
auto
;
margin-top
:
20px
;
margin-bottom
:
20px
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#595d63
)
,
to
(
#31363e
));
background-image
:
-webkit-linear-gradient
(
#595d63
6
.6%
,
#31363e
);
background-image
:
-moz-linear-gradient
(
#595d63
6
.6%
,
#31363e
);
background-image
:
-o-linear-gradient
(
#595d63
6
.6%
,
#31363e
);
.fixed
{
.label
{
position
:fixed
;
background
:
$hover
;
text-shadow
:none
;
color
:
$style_color
;
}
}
aside
a
{
a
{
display
:block
;
position
:relative
;
padding
:
12px
10px
;
margin
:
10px
0
0
0
;
font-size
:
13px
;
font-weight
:bold
;
font-weight
:bold
;
color
:
$style_color
;
&
:first-child
{
-webkit-border-top-left-radius
:
4px
;
-webkit-border-bottom-left-radius
:
4px
;
-moz-border-radius-topleft
:
4px
;
-moz-border-radius-bottomleft
:
4px
;
border-top-left-radius
:
4px
;
border-bottom-left-radius
:
4px
;
}
padding
:
10px
25px
;
display
:
inline-block
;
color
:
#D6DADF
;
border-right
:
1px
solid
#31363E
;
position
:
relative
;
box-shadow
:
1px
0
0
rgba
(
255
,
255
,
255
,
0
.1
);
margin
:
0
;
text-shadow
:
0
-1px
0
black
;
&
.current
{
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#595d63
)
,
to
(
#2c2f35
));
background-image
:
-webkit-linear-gradient
(
#595d63
6
.6%
,
#2c2f35
);
background-image
:
-moz-linear-gradient
(
#595d63
6
.6%
,
#202227
);
background-image
:
-o-linear-gradient
(
#595d63
6
.6%
,
#202227
);
}
}
}
}
}
.container-fluid
>
.content
{
.container-fluid
>
.content
{
margin-left
:
16
0px
;
margin-left
:
0px
;
margin-top
:
20px
;
margin-top
:
20px
;
}
}
...
...
app/views/layouts/_app_
side
.html.haml
→
app/views/layouts/_app_
menu
.html.haml
View file @
c844723a
.fixed
%nav
.main_menu
%aside
-#= link_to "Activities", dashboard_path, :class => "#{"active" if current_page?(dashboard_path) || current_page?(root_path) }"
-#= link_to "Activities", dashboard_path, :class => "#{"active" if current_page?(dashboard_path) || current_page?(root_path) }"
=
link_to
"Projects"
,
projects_path
,
:class
=>
"
#{
"active"
if
current_page?
(
projects_path
)
}
"
=
link_to
"Projects"
,
projects_path
,
:class
=>
"
#{
"active"
if
current_page?
(
projects_path
)
}
"
=
link_to
"Issues"
,
dashboard_issues_path
,
:class
=>
"
#{
"active"
if
current_page?
(
dashboard_issues_path
)
}
"
,
:id
=>
"issues_slide"
=
link_to
"Issues"
,
dashboard_issues_path
,
:class
=>
"
#{
"active"
if
current_page?
(
dashboard_issues_path
)
}
"
,
:id
=>
"issues_slide"
...
...
app/views/layouts/_project_
side
.html.haml
→
app/views/layouts/_project_
menu
.html.haml
View file @
c844723a
.project-sidebar
%nav
.main_menu
.fixed
%aside
=
link_to
project_path
(
@project
),
:class
=>
project_tab_class
do
=
link_to
project_path
(
@project
),
:class
=>
project_tab_class
do
Project
Project
...
...
app/views/layouts/admin.html.haml
View file @
c844723a
...
@@ -5,9 +5,7 @@
...
@@ -5,9 +5,7 @@
=
render
"layouts/flash"
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
:title
=>
"Admin area"
=
render
"layouts/head_panel"
,
:title
=>
"Admin area"
.container-fluid
.container-fluid
.sidebar
%nav
.main_menu
.fixed
%aside
=
link_to
"Users"
,
admin_users_path
,
:class
=>
controller
.
controller_name
==
"users"
?
"current"
:
nil
=
link_to
"Users"
,
admin_users_path
,
:class
=>
controller
.
controller_name
==
"users"
?
"current"
:
nil
=
link_to
"Projects"
,
admin_projects_path
,
:class
=>
controller
.
controller_name
==
"projects"
?
"current"
:
nil
=
link_to
"Projects"
,
admin_projects_path
,
:class
=>
controller
.
controller_name
==
"projects"
?
"current"
:
nil
=
link_to
"Emails"
,
admin_emails_path
,
:class
=>
controller
.
controller_name
==
"mailer"
?
"current"
:
nil
=
link_to
"Emails"
,
admin_emails_path
,
:class
=>
controller
.
controller_name
==
"mailer"
?
"current"
:
nil
...
...
app/views/layouts/application.html.haml
View file @
c844723a
...
@@ -5,9 +5,8 @@
...
@@ -5,9 +5,8 @@
=
render
"layouts/flash"
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
:title
=>
"Dashboard"
=
render
"layouts/head_panel"
,
:title
=>
"Dashboard"
.container-fluid
.container-fluid
.sidebar
=
render
:partial
=>
"layouts/app_menu"
=
render
:partial
=>
"layouts/app_side"
.content
.content
.row
.row
.span1
0
=
yield
.span1
2
=
yield
.s
pan4
=
render
"layouts/projects_side"
.s
idebar
=
render
"layouts/projects_side"
app/views/layouts/profile.html.haml
View file @
c844723a
...
@@ -5,8 +5,7 @@
...
@@ -5,8 +5,7 @@
=
render
"layouts/flash"
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
:title
=>
"Profile"
=
render
"layouts/head_panel"
,
:title
=>
"Profile"
.container-fluid
.container-fluid
.sidebar
%nav
.main_menu
%aside
=
link_to
"Profile"
,
profile_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:show
)
?
"current"
:
nil
=
link_to
"Profile"
,
profile_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:show
)
?
"current"
:
nil
=
link_to
"Password & token"
,
profile_password_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:password
)
?
"current"
:
nil
=
link_to
"Password & token"
,
profile_password_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:password
)
?
"current"
:
nil
=
link_to
"Design"
,
profile_design_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:design
)
?
"current"
:
nil
=
link_to
"Design"
,
profile_design_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:design
)
?
"current"
:
nil
...
@@ -16,5 +15,5 @@
...
@@ -16,5 +15,5 @@
%span
.label
=
current_user
.
keys
.
count
%span
.label
=
current_user
.
keys
.
count
.content
.content
.row
.row
.span1
0
=
yield
.span1
2
=
yield
.s
pan4
=
render
"layouts/projects_side"
.s
idebar
=
render
"layouts/projects_side"
app/views/layouts/project.html.haml
View file @
c844723a
...
@@ -5,12 +5,12 @@
...
@@ -5,12 +5,12 @@
=
render
"layouts/flash"
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
:title
=>
@project
.
name
=
render
"layouts/head_panel"
,
:title
=>
@project
.
name
.container-fluid
.container-fluid
.sidebar
=
render
:partial
=>
"layouts/project_side
"
=
render
:partial
=>
"layouts/project_menu
"
.content
.content
-
if
@full_content
-
if
@full_content
=
yield
=
yield
-
else
-
else
.row
.row
.span1
0
=
yield
.span1
2
=
yield
.s
pan4
=
render
"layouts/project_side_right"
.s
idebar
=
render
"layouts/project_side_right"
app/views/projects/_tile.html.haml
View file @
c844723a
-
@projects
.
in_groups_of
(
2
,
false
)
do
|
projects
|
-
@projects
.
in_groups_of
(
2
,
false
)
do
|
projects
|
.row
.row
-
projects
.
each_with_index
do
|
project
,
i
|
-
projects
.
each_with_index
do
|
project
,
i
|
.span
4
.well
.span
5
.well
=
link_to
project_path
(
project
)
do
=
link_to
project_path
(
project
)
do
%h3
=
truncate
(
project
.
name
,
:length
=>
20
)
%h3
=
truncate
(
project
.
name
,
:length
=>
20
)
%p
.title.repository.git_url_wrapper
%p
.title.repository.git_url_wrapper
...
...
app/views/refs/_tree.html.haml
View file @
c844723a
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
=
render
:partial
=>
"refs/tree_file"
,
:locals
=>
{
:name
=>
tree
.
name
,
:content
=>
tree
.
data
,
:file
=>
tree
}
=
render
:partial
=>
"refs/tree_file"
,
:locals
=>
{
:name
=>
tree
.
name
,
:content
=>
tree
.
data
,
:file
=>
tree
}
-
else
-
else
-
contents
=
tree
.
contents
-
contents
=
tree
.
contents
%table
#tree-slider
%table
#tree-slider
.bordered-table.zebra-striped
%thead
%thead
%th
Name
%th
Name
%th
Last Update
%th
Last Update
...
...
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