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
Jérome Perrin
gitlab-ce
Commits
6e559be6
Commit
6e559be6
authored
Feb 24, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor header logo and setup expectation on it size
parent
1faf3676
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
22 deletions
+18
-22
app/assets/images/logo-black.png
app/assets/images/logo-black.png
+0
-0
app/assets/images/logo-white.png
app/assets/images/logo-white.png
+0
-0
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+8
-12
app/assets/stylesheets/themes/dark-theme.scss
app/assets/stylesheets/themes/dark-theme.scss
+0
-6
app/helpers/appearances_helper.rb
app/helpers/appearances_helper.rb
+8
-0
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+1
-1
app/views/layouts/_public_head_panel.html.haml
app/views/layouts/_public_head_panel.html.haml
+1
-3
No files found.
app/assets/images/logo-black.png
View replaced file @
1faf3676
View file @
6e559be6
2.55 KB
|
W:
|
H:
3.81 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/assets/images/logo-white.png
View replaced file @
1faf3676
View file @
6e559be6
7.16 KB
|
W:
|
H:
7.52 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/assets/stylesheets/sections/header.scss
View file @
6e559be6
...
@@ -100,18 +100,14 @@ header {
...
@@ -100,18 +100,14 @@ header {
a
{
a
{
float
:
left
;
float
:
left
;
padding
:
0px
;
padding
:
5px
0
;
margin
:
0
6px
;
height
:
46px
;
width
:
52px
;
h1
{
text-align
:
center
;
margin
:
0
;
background
:
image-url
(
'logo-black.png'
)
no-repeat
center
center
;
img
{
background-size
:
32px
;
width
:
36px
;
float
:
left
;
height
:
36px
;
height
:
46px
;
width
:
40px
;
@include
header-font
;
text-indent
:
-9999px
;
}
}
}
}
&
:hover
{
&
:hover
{
...
...
app/assets/stylesheets/themes/dark-theme.scss
View file @
6e559be6
...
@@ -12,12 +12,6 @@
...
@@ -12,12 +12,6 @@
&
:hover
{
&
:hover
{
background-color
:
$color-darker
;
background-color
:
$color-darker
;
}
}
h1
{
background
:
image-url
(
'logo-white.png'
)
no-repeat
center
center
;
background-size
:
32px
;
color
:
#FFF
;
}
}
}
.app_logo
{
.app_logo
{
...
...
app/helpers/appearances_helper.rb
View file @
6e559be6
...
@@ -14,4 +14,12 @@ module AppearancesHelper
...
@@ -14,4 +14,12 @@ module AppearancesHelper
def
brand_text
def
brand_text
nil
nil
end
end
def
brand_header_logo
if
theme_type
==
'light_theme'
image_tag
'logo-black.png'
else
image_tag
'logo-white.png'
end
end
end
end
app/views/layouts/_head_panel.html.haml
View file @
6e559be6
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.container
.container
%div
.app_logo
%div
.app_logo
=
link_to
root_path
,
class:
"home has_bottom_tooltip"
,
title:
"Dashboard"
do
=
link_to
root_path
,
class:
"home has_bottom_tooltip"
,
title:
"Dashboard"
do
%h1
GITLAB
=
brand_header_logo
%h1
.title
=
title
%h1
.title
=
title
%button
.navbar-toggle
{
"data-target"
=>
".navbar-collapse"
,
"data-toggle"
=>
"collapse"
,
type:
"button"
}
%button
.navbar-toggle
{
"data-target"
=>
".navbar-collapse"
,
"data-toggle"
=>
"collapse"
,
type:
"button"
}
...
...
app/views/layouts/_public_head_panel.html.haml
View file @
6e559be6
...
@@ -2,10 +2,8 @@
...
@@ -2,10 +2,8 @@
.navbar-inner
.navbar-inner
.container
.container
%div
.app_logo
%div
.app_logo
%span
.separator
=
link_to
explore_root_path
,
class:
"home"
do
=
link_to
explore_root_path
,
class:
"home"
do
%h1
GITLAB
=
brand_header_logo
%span
.separator
%h1
.title
=
title
%h1
.title
=
title
%button
.navbar-toggle
{
"data-target"
=>
".navbar-collapse"
,
"data-toggle"
=>
"collapse"
,
type:
"button"
}
%button
.navbar-toggle
{
"data-target"
=>
".navbar-collapse"
,
"data-toggle"
=>
"collapse"
,
type:
"button"
}
...
...
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