Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
00464099
Commit
00464099
authored
Nov 21, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
I prefer icons on header
parent
4c6c2485
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
81 additions
and
152 deletions
+81
-152
app/assets/javascripts/main.js.coffee
app/assets/javascripts/main.js.coffee
+4
-0
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+49
-9
app/assets/stylesheets/themes/ui_basic.scss
app/assets/stylesheets/themes/ui_basic.scss
+18
-0
app/assets/stylesheets/themes/ui_color.scss
app/assets/stylesheets/themes/ui_color.scss
+1
-46
app/assets/stylesheets/themes/ui_gray.scss
app/assets/stylesheets/themes/ui_gray.scss
+1
-46
app/assets/stylesheets/themes/ui_modern.scss
app/assets/stylesheets/themes/ui_modern.scss
+1
-46
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+7
-5
No files found.
app/assets/javascripts/main.js.coffee
View file @
00464099
...
...
@@ -30,6 +30,10 @@ $ ->
# Initialize tooltips
$
(
'.has_tooltip'
).
tooltip
()
# Bottom tooltip
$
(
'.has_bottom_tooltip'
).
tooltip
(
placement
:
'bottom'
)
# Disable form buttons while a form is submitting
$
(
'body'
).
on
'ajax:complete, ajax:beforeSend, submit'
,
'form'
,
(
e
)
->
buttons
=
$
(
'[type="submit"]'
,
@
)
...
...
app/assets/stylesheets/sections/header.scss
View file @
00464099
...
...
@@ -12,6 +12,8 @@ header {
.nav
>
li
>
a
{
color
:
$style_color
;
text-shadow
:
0
1px
0
#fff
;
font-size
:
18px
;
padding
:
11px
;
}
/** NAV block with links and profile **/
...
...
@@ -51,15 +53,6 @@ header {
height
:
40px
;
font-family
:
'Korolev'
,
sans-serif
;
}
}
.separator
{
float
:
left
;
height
:
60px
;
width
:
1px
;
background
:
white
;
border-left
:
1px
solid
#DDD
;
margin-top
:
-10px
;
}
}
...
...
@@ -218,5 +211,52 @@ header {
border-bottom-right-radius
:
5px
;
border-bottom-left-radius
:
5px
;
border-bottom
:
0
;
}
}
/*
* Dark header
*
*/
&
.header-dark
{
&
.navbar-gitlab
{
.navbar-inner
{
background
:
#708090
;
border-bottom
:
1px
solid
#AAA
;
.nav
>
li
>
a
{
color
:
#fff
;
text-shadow
:
0
1px
0
#111
;
}
}
}
.search
{
.search-input
{
background-color
:
#D2D5DA
;
background-color
:
rgba
(
255
,
255
,
255
,
0
.5
);
&
:focus
{
background-color
:
white
;
}
}
}
.
search-input
:
:-
webkit-input-placeholder
{
color
:
#666
;
}
.app_logo
{
a
{
h1
{
background
:
url('logo_white.png')
no-repeat
0px
2px
;
color
:
#fff
;
text-shadow
:
0
1px
1px
#111
;
}
}
}
.project_name
{
color
:
#fff
;
text-shadow
:
0
1px
1px
#111
;
}
}
}
app/assets/stylesheets/themes/ui_basic.scss
View file @
00464099
...
...
@@ -15,4 +15,22 @@
color
:
$blue_link
;
}
}
.app_logo
{
.separator
{
margin-left
:
0
;
margin-right
:
0
;
}
}
.separator
{
float
:
left
;
height
:
60px
;
width
:
1px
;
background
:
white
;
border-left
:
1px
solid
#DDD
;
margin-top
:
-10px
;
margin-left
:
10px
;
margin-right
:
10px
;
}
}
app/assets/stylesheets/themes/ui_color.scss
View file @
00464099
...
...
@@ -8,61 +8,16 @@
*
*/
.ui_color
{
/*
* Application Header
*
*/
header
{
@extend
.header-dark
;
&
.navbar-gitlab
{
.navbar-inner
{
background
:
#657
;
border-bottom
:
1px
solid
#AAA
;
.nav
>
li
>
a
{
color
:
#fff
;
text-shadow
:
0
1px
0
#111
;
}
}
}
.search
{
float
:
right
;
margin-right
:
45px
;
.search-input
{
border
:
1px
solid
#aaa
;
background-color
:
#D2D5DA
;
background-color
:
rgba
(
255
,
255
,
255
,
0
.5
);
&
:focus
{
background-color
:
white
;
}
}
}
.
search-input
:
:-
webkit-input-placeholder
{
color
:
#666
;
}
.app_logo
{
a
{
h1
{
background
:
url('logo_white.png')
no-repeat
0px
2px
;
color
:
#fff
;
text-shadow
:
0
1px
1px
#111
;
}
}
.separator
{
display
:none
;
}
}
.project_name
{
color
:
#fff
;
text-shadow
:
0
1px
1px
#111
;
}
}
/*
* End of Application Header
*
*/
}
app/assets/stylesheets/themes/ui_gray.scss
View file @
00464099
...
...
@@ -8,61 +8,16 @@
*
*/
.ui_gray
{
/*
* Application Header
*
*/
header
{
@extend
.header-dark
;
&
.navbar-gitlab
{
.navbar-inner
{
background
:
#708090
;
border-bottom
:
1px
solid
#AAA
;
.nav
>
li
>
a
{
color
:
#fff
;
text-shadow
:
0
1px
0
#111
;
}
}
}
.search
{
float
:
right
;
margin-right
:
45px
;
.search-input
{
border
:
1px
solid
#aaa
;
background-color
:
#D2D5DA
;
background-color
:
rgba
(
255
,
255
,
255
,
0
.5
);
&
:focus
{
background-color
:
white
;
}
}
}
.
search-input
:
:-
webkit-input-placeholder
{
color
:
#666
;
}
.app_logo
{
a
{
h1
{
background
:
url('logo_white.png')
no-repeat
0px
2px
;
color
:
#fff
;
text-shadow
:
0
1px
1px
#111
;
}
}
.separator
{
display
:none
;
}
}
.project_name
{
color
:
#fff
;
text-shadow
:
0
1px
1px
#111
;
}
}
/*
* End of Application Header
*
*/
}
app/assets/stylesheets/themes/ui_modern.scss
View file @
00464099
...
...
@@ -8,61 +8,16 @@
*
*/
.ui_modern
{
/*
* Application Header
*
*/
header
{
@extend
.header-dark
;
&
.navbar-gitlab
{
.navbar-inner
{
background
:
#567
;
border-bottom
:
1px
solid
#AAA
;
.nav
>
li
>
a
{
color
:
#fff
;
text-shadow
:
0
1px
0
#111
;
}
}
}
.search
{
float
:
right
;
margin-right
:
45px
;
.search-input
{
border
:
1px
solid
#aaa
;
background-color
:
#D2D5DA
;
background-color
:
rgba
(
255
,
255
,
255
,
0
.5
);
&
:focus
{
background-color
:
white
;
}
}
}
.
search-input
:
:-
webkit-input-placeholder
{
color
:
#666
;
}
.app_logo
{
a
{
h1
{
background
:
url('logo_white.png')
no-repeat
0px
2px
;
color
:
#fff
;
text-shadow
:
0
1px
1px
#111
;
}
}
.separator
{
display
:none
;
}
}
.project_name
{
color
:
#fff
;
text-shadow
:
0
1px
1px
#111
;
}
}
/*
* End of Application Header
*
*/
}
app/views/layouts/_head_panel.html.haml
View file @
00464099
...
...
@@ -9,14 +9,16 @@
%ul
.nav
-
if
current_user
.
is_admin?
%li
=
link_to
admin_root_path
,
title:
"Admin area"
do
%i
.icon-cog
Admin
=
link_to
admin_root_path
,
title:
"Admin area"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Admin area'
do
%i
.icon-cogs
-
if
current_user
.
can_create_project?
%li
=
link_to
new_project_path
,
title:
"Create New Project"
do
=
link_to
new_project_path
,
title:
"Create New Project"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'New project'
do
%i
.icon-plus
Project
%li
=
link_to
profile_path
,
title:
"Your Profile"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Your profile'
do
%i
.icon-user
%span
.separator
%li
=
render
"layouts/search"
%li
...
...
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