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
0276e903
Unverified
Commit
0276e903
authored
Aug 26, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Limit content width for big screens except certain pages
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
7140e800
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
22 additions
and
21 deletions
+22
-21
layout.scss
app/assets/stylesheets/base/layout.scss
+5
-0
variables.scss
app/assets/stylesheets/base/variables.scss
+1
-1
issuable.scss
app/assets/stylesheets/pages/issuable.scss
+0
-6
tree.scss
app/assets/stylesheets/pages/tree.scss
+0
-1
page_layout_helper.rb
app/helpers/page_layout_helper.rb
+8
-0
_page.html.haml
app/views/layouts/_page.html.haml
+1
-1
_default.html.haml
app/views/layouts/header/_default.html.haml
+0
-12
index.html.haml
app/views/projects/deploy_keys/index.html.haml
+1
-0
_diffs.html.haml
app/views/projects/diffs/_diffs.html.haml
+3
-0
_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+3
-0
No files found.
app/assets/stylesheets/base/layout.scss
View file @
0276e903
...
...
@@ -20,3 +20,8 @@ html {
.navless-container
{
margin-top
:
30px
;
}
.container-limited
{
max-width
:
$fixed-layout-width
;
}
app/assets/stylesheets/base/variables.scss
View file @
0276e903
...
...
@@ -13,7 +13,7 @@ $code_line_height: 1.5;
$border-color
:
#E5E5E5
;
$background-color
:
#f5f5f5
;
$header-height
:
50px
;
$
readable-width
:
11
00px
;
$
fixed-layout-width
:
12
00px
;
/*
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
0276e903
...
...
@@ -45,9 +45,3 @@
.btn
{
font-size
:
13px
;
}
}
.issuable-details
{
.description
{
max-width
:
$readable-width
;
}
}
app/assets/stylesheets/pages/tree.scss
View file @
0276e903
...
...
@@ -117,7 +117,6 @@
.readme-holder
{
margin
:
0
auto
;
max-width
:
$readable-width
;
.readme-file-title
{
font-size
:
14px
;
...
...
app/helpers/page_layout_helper.rb
View file @
0276e903
...
...
@@ -23,4 +23,12 @@ module PageLayoutHelper
@sidebar
end
end
def
fluid_layout
(
enabled
=
false
)
if
@fluid_layout
.
nil?
@fluid_layout
=
enabled
else
@fluid_layout
end
end
end
app/views/layouts/_page.html.haml
View file @
0276e903
...
...
@@ -13,7 +13,7 @@
.username
=
current_user
.
username
.content-wrapper
.container-fluid
%div
{
class:
fluid_layout
?
"container-fluid"
:
"container-fluid container-limited"
}
.content
=
render
"layouts/flash"
.clearfix
...
...
app/views/layouts/header/_default.html.haml
View file @
0276e903
...
...
@@ -17,15 +17,6 @@
%li
.visible-sm.visible-xs
=
link_to
search_path
,
title:
'Search'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'search'
)
-#%li.hidden-xs
= link_to help_path, title: 'Help', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('question-circle fw')
-#%li
= link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('globe fw')
-#%li
= link_to user_snippets_path(current_user), title: 'Your snippets', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('clipboard fw')
-
if
current_user
.
is_admin?
%li
=
link_to
admin_root_path
,
title:
'Admin area'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
...
...
@@ -34,9 +25,6 @@
%li
.hidden-xs
=
link_to
new_project_path
,
title:
'New project'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'plus fw'
)
-#%li
= link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('cog fw')
%li
=
link_to
destroy_user_session_path
,
class:
'logout'
,
method: :delete
,
title:
'Sign out'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'sign-out'
)
...
...
app/views/projects/deploy_keys/index.html.haml
View file @
0276e903
-
page_title
"Deploy Keys"
%h3
.page-title
Deploy keys allow read-only access to the repository
...
...
app/views/projects/diffs/_diffs.html.haml
View file @
0276e903
-
if
params
[
:view
]
==
'parallel'
-
fluid_layout
true
.prepend-top-20.append-bottom-20
.pull-right
.btn-group
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
0276e903
-
page_title
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)"
,
"Merge Requests"
-
if
params
[
:view
]
==
'parallel'
-
fluid_layout
true
.merge-request
{
'data-url'
=>
merge_request_path
(
@merge_request
)}
.merge-request-details.issuable-details
=
render
"projects/merge_requests/show/mr_title"
...
...
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