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
iv
gitlab-ce
Commits
10b6a924
Commit
10b6a924
authored
Sep 09, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style panels and add blank container
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
1e3ce077
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
55 additions
and
13 deletions
+55
-13
app/assets/stylesheets/base/gl_bootstrap.scss
app/assets/stylesheets/base/gl_bootstrap.scss
+13
-1
app/assets/stylesheets/base/gl_variables.scss
app/assets/stylesheets/base/gl_variables.scss
+6
-5
app/assets/stylesheets/generic/buttons.scss
app/assets/stylesheets/generic/buttons.scss
+1
-1
app/assets/stylesheets/generic/sidebar.scss
app/assets/stylesheets/generic/sidebar.scss
+6
-0
app/helpers/page_layout_helper.rb
app/helpers/page_layout_helper.rb
+22
-0
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+1
-1
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+2
-2
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+4
-3
No files found.
app/assets/stylesheets/base/gl_bootstrap.scss
View file @
10b6a924
...
@@ -157,8 +157,10 @@
...
@@ -157,8 +157,10 @@
*
*
*/
*/
.panel
{
.panel
{
box-shadow
:
none
;
.panel-heading
{
.panel-heading
{
font-weight
:
bold
;
font-size
:
17px
;
line-height
:
38px
;
.panel-head-actions
{
.panel-head-actions
{
position
:
relative
;
position
:
relative
;
...
@@ -182,6 +184,10 @@
...
@@ -182,6 +184,10 @@
.pagination
{
.pagination
{
margin
:
0
;
margin
:
0
;
}
}
.btn
{
min-width
:
124px
;
}
}
}
&
.panel-small
{
&
.panel-small
{
...
@@ -209,6 +215,12 @@
...
@@ -209,6 +215,12 @@
}
}
}
}
.alert-help
{
background-color
:
$background-color
;
border
:
1px
solid
$border-color
;
color
:
$gl-gray
;
}
// Typography =================================================================
// Typography =================================================================
.text-primary
,
.text-primary
,
...
...
app/assets/stylesheets/base/gl_variables.scss
View file @
10b6a924
...
@@ -114,11 +114,12 @@ $alert-border-radius: 0;
...
@@ -114,11 +114,12 @@ $alert-border-radius: 0;
//
//
//##
//##
$panel-border-radius
:
0
;
$panel-border-radius
:
2px
;
$panel-default-text
:
$text-color
;
$panel-default-text
:
$text-color
;
$panel-default-border
:
#E7E9ED
;
$panel-default-border
:
$border-color
;
$panel-default-heading-bg
:
#F8FAFC
;
$panel-default-heading-bg
:
$background-color
;
$panel-footer-bg
:
$background-color
;
$panel-inner-border
:
$border-color
;
//== Wells
//== Wells
//
//
...
...
app/assets/stylesheets/generic/buttons.scss
View file @
10b6a924
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
}
}
&
.btn-save
{
&
.btn-save
{
@extend
.btn-
primary
;
@extend
.btn-
success
;
}
}
&
.btn-remove
{
&
.btn-remove
{
...
...
app/assets/stylesheets/generic/sidebar.scss
View file @
10b6a924
...
@@ -28,6 +28,12 @@
...
@@ -28,6 +28,12 @@
padding
:
$gl-padding
;
padding
:
$gl-padding
;
border
:
1px
solid
#e7e9ed
;
border
:
1px
solid
#e7e9ed
;
min-height
:
90vh
;
min-height
:
90vh
;
&
.container-blank
{
background
:
none
;
padding
:
0
;
border
:
none
;
}
}
}
}
}
...
...
app/helpers/page_layout_helper.rb
View file @
10b6a924
...
@@ -31,4 +31,26 @@ module PageLayoutHelper
...
@@ -31,4 +31,26 @@ module PageLayoutHelper
@fluid_layout
@fluid_layout
end
end
end
end
def
blank_container
(
enabled
=
false
)
if
@blank_container
.
nil?
@blank_container
=
enabled
else
@blank_container
end
end
def
container_class
css_class
=
"container-fluid"
if
fluid_layout
css_class
+=
" container-limited"
end
if
blank_container
css_class
+=
" container-blank"
end
css_class
end
end
end
app/views/layouts/_page.html.haml
View file @
10b6a924
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
=
current_user
.
username
=
current_user
.
username
.content-wrapper
.content-wrapper
=
render
"layouts/flash"
=
render
"layouts/flash"
%div
{
class:
fluid_layout
?
"container-fluid"
:
"container-fluid container-limited"
}
%div
{
class:
container_class
}
.content
.content
.clearfix
.clearfix
=
yield
=
yield
app/views/profiles/preferences/show.html.haml
View file @
10b6a924
-
page_title
'Preferences'
-
page_title
'Preferences'
-
header_title
page_title
,
profile_preferences_path
-
header_title
page_title
,
profile_preferences_path
-
@blank_container
=
true
.
gray-content-block.top-block
.
alert.alert-help
These settings allow you to customize the appearance and behavior of the site.
These settings allow you to customize the appearance and behavior of the site.
They are saved with your account and will persist to any device you use to
They are saved with your account and will persist to any device you use to
access the site.
access the site.
.prepend-top-default
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
,
html:
{
class:
'js-preferences-form form-horizontal'
}
do
|
f
|
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
,
html:
{
class:
'js-preferences-form form-horizontal'
}
do
|
f
|
.panel.panel-default.application-theme
.panel.panel-default.application-theme
...
...
app/views/projects/edit.html.haml
View file @
10b6a924
-
@blank_container
=
true
.project-edit-container
.project-edit-container
.project-edit-errors
.project-edit-errors
.project-edit-content
.project-edit-content
%div
.panel.panel-default
%h3
.page-title
.panel-heading
Project settings
Project settings
%hr
.panel-body
.panel-body
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
],
remote:
true
,
html:
{
multipart:
true
,
class:
"edit_project form-horizontal fieldset-form"
},
authenticity_token:
true
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
],
remote:
true
,
html:
{
multipart:
true
,
class:
"edit_project form-horizontal fieldset-form"
},
authenticity_token:
true
do
|
f
|
...
...
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