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
Tatuya Kamada
gitlab-ce
Commits
d8209aeb
Commit
d8209aeb
authored
Jun 16, 2015
by
Nicolas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix layout issue in header title truncation.
parent
5fa02489
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
17 deletions
+14
-17
app/assets/stylesheets/generic/header.scss
app/assets/stylesheets/generic/header.scss
+9
-10
app/assets/stylesheets/generic/mobile.scss
app/assets/stylesheets/generic/mobile.scss
+1
-2
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+2
-3
app/views/layouts/header/_public.html.haml
app/views/layouts/header/_public.html.haml
+2
-2
No files found.
app/assets/stylesheets/generic/header.scss
View file @
d8209aeb
...
@@ -98,16 +98,16 @@ header {
...
@@ -98,16 +98,16 @@ header {
height
:
$header-height
;
height
:
$header-height
;
.title
{
.title
{
position
:
relative
;
float
:
left
;
margin
:
0
;
margin
:
0
;
margin-left
:
35px
;
padding
:
0
15px
0
35px
;
overflow
:
hidden
;
font-size
:
18px
;
font-size
:
18px
;
line-height
:
$header-height
;
line-height
:
$header-height
;
font-weight
:
bold
;
font-weight
:
bold
;
color
:
#444
;
color
:
#444
;
text-overflow
:
ellipsis
;
@include
str-truncated
(
37%
);
vertical-align
:
top
;
white-space
:
nowrap
;
a
{
a
{
color
:
#444
;
color
:
#444
;
...
@@ -116,6 +116,10 @@ header {
...
@@ -116,6 +116,10 @@ header {
}
}
}
}
}
}
.navbar-collapse
{
float
:
right
;
}
}
}
.search
{
.search
{
...
@@ -167,10 +171,6 @@ header {
...
@@ -167,10 +171,6 @@ header {
}
}
@media
(
max-width
:
$screen-md-max
)
{
@media
(
max-width
:
$screen-md-max
)
{
header
.container
.title
{
max-width
:
43%
;
}
.header-collapsed
,
.header-expanded
{
.header-collapsed
,
.header-expanded
{
@include
collapsed-header
;
@include
collapsed-header
;
}
}
...
@@ -190,7 +190,6 @@ header {
...
@@ -190,7 +190,6 @@ header {
font-size
:
18px
;
font-size
:
18px
;
.title
{
.title
{
max-width
:
70%
;
}
}
.navbar-nav
{
.navbar-nav
{
...
...
app/assets/stylesheets/generic/mobile.scss
View file @
d8209aeb
...
@@ -61,8 +61,7 @@
...
@@ -61,8 +61,7 @@
}
}
.container
.title
{
.container
.title
{
margin-left
:
15px
!
important
;
padding-left
:
15px
!
important
;
max-width
:
70%
!
important
;
}
}
.issue-info
,
.merge-request-info
{
.issue-info
,
.merge-request-info
{
...
...
app/views/layouts/header/_default.html.haml
View file @
d8209aeb
...
@@ -5,9 +5,6 @@
...
@@ -5,9 +5,6 @@
=
brand_header_logo
=
brand_header_logo
%h3
GitLab
%h3
GitLab
.header-content
.header-content
%h1
.title
=
title
%button
.navbar-toggle
%button
.navbar-toggle
%span
.sr-only
Toggle navigation
%span
.sr-only
Toggle navigation
=
icon
(
'bars'
)
=
icon
(
'bars'
)
...
@@ -43,4 +40,6 @@
...
@@ -43,4 +40,6 @@
=
link_to
destroy_user_session_path
,
class:
'logout'
,
method: :delete
,
title:
'Sign out'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
link_to
destroy_user_session_path
,
class:
'logout'
,
method: :delete
,
title:
'Sign out'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'sign-out'
)
=
icon
(
'sign-out'
)
%h1
.title
=
title
=
render
'shared/outdated_browser'
=
render
'shared/outdated_browser'
app/views/layouts/header/_public.html.haml
View file @
d8209aeb
...
@@ -5,10 +5,10 @@
...
@@ -5,10 +5,10 @@
=
brand_header_logo
=
brand_header_logo
%h3
GitLab
%h3
GitLab
.header-content
.header-content
%h1
.title
=
title
-
unless
current_controller?
(
'sessions'
)
-
unless
current_controller?
(
'sessions'
)
.pull-right
.pull-right
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-success btn-sm'
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-success btn-sm'
%h1
.title
=
title
=
render
'shared/outdated_browser'
=
render
'shared/outdated_browser'
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