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
3ae7dba9
Commit
3ae7dba9
authored
9 years ago
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use gl-padding instead of 15px/20px where appropriate
parent
58dad2a9
No related merge requests found
Changes
13
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
42 additions
and
22 deletions
+42
-22
app/assets/stylesheets/framework.scss
app/assets/stylesheets/framework.scss
+2
-1
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+9
-1
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+1
-3
app/assets/stylesheets/framework/panels.scss
app/assets/stylesheets/framework/panels.scss
+15
-0
app/assets/stylesheets/framework/tables.scss
app/assets/stylesheets/framework/tables.scss
+2
-0
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-1
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+3
-4
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+1
-1
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+1
-3
app/views/projects/compare/show.html.haml
app/views/projects/compare/show.html.haml
+2
-2
app/views/projects/merge_requests/_new_compare.html.haml
app/views/projects/merge_requests/_new_compare.html.haml
+1
-2
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
app/views/shared/issuable/_context.html.haml
app/views/shared/issuable/_context.html.haml
+3
-3
No files found.
app/assets/stylesheets/framework.scss
View file @
3ae7dba9
@import
"framework/fonts"
;
@import
"framework/fonts"
;
@import
"framework/variables"
;
@import
"framework/variables"
;
@import
"framework/mixins"
;
@import
"framework/mixins"
;
@import
"framework/layout"
;
@import
'framework/tw_bootstrap_variables'
;
@import
'framework/tw_bootstrap_variables'
;
@import
'framework/tw_bootstrap'
;
@import
'framework/tw_bootstrap'
;
@import
"framework/layout"
;
@import
"framework/avatar.scss"
;
@import
"framework/avatar.scss"
;
@import
"framework/blocks.scss"
;
@import
"framework/blocks.scss"
;
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
@import
"framework/markdown_area.scss"
;
@import
"framework/markdown_area.scss"
;
@import
"framework/mobile.scss"
;
@import
"framework/mobile.scss"
;
@import
"framework/pagination.scss"
;
@import
"framework/pagination.scss"
;
@import
"framework/panels.scss"
;
@import
"framework/selects.scss"
;
@import
"framework/selects.scss"
;
@import
"framework/sidebar.scss"
;
@import
"framework/sidebar.scss"
;
@import
"framework/tables.scss"
;
@import
"framework/tables.scss"
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/common.scss
View file @
3ae7dba9
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
/** COMMON CLASSES **/
/** COMMON CLASSES **/
.prepend-top-10
{
margin-top
:
10px
}
.prepend-top-10
{
margin-top
:
10px
}
.prepend-top-default
{
margin-top
:
$gl-padding
;
}
.prepend-top-default
{
margin-top
:
$gl-padding
!
important
;
}
.prepend-top-20
{
margin-top
:
20px
}
.prepend-top-20
{
margin-top
:
20px
}
.prepend-left-10
{
margin-left
:
10px
}
.prepend-left-10
{
margin-left
:
10px
}
.prepend-left-20
{
margin-left
:
20px
}
.prepend-left-20
{
margin-left
:
20px
}
...
@@ -52,6 +52,10 @@ pre {
...
@@ -52,6 +52,10 @@ pre {
}
}
}
}
hr
{
margin
:
$gl-padding
0
;
}
.dropdown-menu
>
li
>
a
{
.dropdown-menu
>
li
>
a
{
text-shadow
:
none
;
text-shadow
:
none
;
}
}
...
@@ -433,3 +437,7 @@ table {
...
@@ -433,3 +437,7 @@ table {
.space-right
{
.space-right
{
margin-right
:
10px
;
margin-right
:
10px
;
}
}
.alert
,
.progress
{
margin-bottom
:
$gl-padding
;
}
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/files.scss
View file @
3ae7dba9
...
@@ -8,7 +8,6 @@
...
@@ -8,7 +8,6 @@
border
:
none
;
border
:
none
;
border-top
:
1px
solid
#E7E9EE
;
border-top
:
1px
solid
#E7E9EE
;
border-bottom
:
1px
solid
#E7E9EE
;
border-bottom
:
1px
solid
#E7E9EE
;
margin-bottom
:
1em
;
&
.readme-holder
{
&
.readme-holder
{
border-bottom
:
0
;
border-bottom
:
0
;
...
@@ -25,7 +24,7 @@
...
@@ -25,7 +24,7 @@
text-shadow
:
0
1px
1px
#fff
;
text-shadow
:
0
1px
1px
#fff
;
margin
:
0
;
margin
:
0
;
text-align
:
left
;
text-align
:
left
;
padding
:
10px
15px
;
padding
:
10px
$gl-padding
;
.file-actions
{
.file-actions
{
float
:
right
;
float
:
right
;
...
@@ -171,4 +170,3 @@
...
@@ -171,4 +170,3 @@
}
}
}
}
}
}
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/panels.scss
0 → 100644
View file @
3ae7dba9
.panel
{
margin-bottom
:
$gl-padding
;
.panel-heading
{
padding
:
10px
$gl-padding
;
}
.panel-body
{
padding
:
$gl-padding
;
.form-actions
{
margin
:
-
$gl-padding
;
margin-top
:
$gl-padding
;
}
}
}
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/tables.scss
View file @
3ae7dba9
...
@@ -6,6 +6,8 @@
...
@@ -6,6 +6,8 @@
table
{
table
{
&
.table
{
&
.table
{
margin-bottom
:
$gl-padding
;
.dropdown-menu
a
{
.dropdown-menu
a
{
text-decoration
:
none
;
text-decoration
:
none
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/merge_requests.scss
View file @
3ae7dba9
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
.mr-widget-body
,
.mr-widget-body
,
.ci_widget
,
.ci_widget
,
.mr-widget-footer
{
.mr-widget-footer
{
padding
:
15px
;
padding
:
$gl-padding
;
}
}
.normal
{
.normal
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/note_form.scss
View file @
3ae7dba9
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
}
}
.reply-btn
{
.reply-btn
{
@extend
.btn-primary
;
@extend
.btn-primary
;
margin
:
10px
$gl-padding
;
}
}
.diff-file
.diff-content
{
.diff-file
.diff-content
{
tr
.line_holder
:hover
{
tr
.line_holder
:hover
{
...
@@ -38,9 +39,8 @@
...
@@ -38,9 +39,8 @@
}
}
.new_note
,
.edit_note
{
.new_note
,
.edit_note
{
.buttons
{
.note-form-actions
{
margin-top
:
8px
;
margin-top
:
$gl-padding
;
margin-bottom
:
3px
;
}
}
.note-preview-holder
{
.note-preview-holder
{
...
@@ -150,7 +150,6 @@
...
@@ -150,7 +150,6 @@
.discussion-reply-holder
{
.discussion-reply-holder
{
background
:
$background-color
;
background
:
$background-color
;
padding
:
10px
15px
;
border-top
:
1px
solid
$border-color
;
border-top
:
1px
solid
$border-color
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/projects.scss
View file @
3ae7dba9
...
@@ -376,7 +376,7 @@ table.table.protected-branches-list tr.no-border {
...
@@ -376,7 +376,7 @@ table.table.protected-branches-list tr.no-border {
.project-stats
{
.project-stats
{
text-align
:
center
;
text-align
:
center
;
margin-top
:
15px
;
margin-top
:
$gl-padding
;
margin-bottom
:
0
;
margin-bottom
:
0
;
padding-top
:
10px
;
padding-top
:
10px
;
padding-bottom
:
4px
;
padding-bottom
:
4px
;
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/notifications/show.html.haml
View file @
3ae7dba9
...
@@ -53,9 +53,7 @@
...
@@ -53,9 +53,7 @@
.form-actions
.form-actions
=
f
.
submit
'Save changes'
,
class:
"btn btn-create"
=
f
.
submit
'Save changes'
,
class:
"btn btn-create"
.clearfix
.row.all-notifications.prepend-top-default
%hr
.row.all-notifications
.col-md-6
.col-md-6
%p
%p
You can also specify notification level per group or per project.
You can also specify notification level per group or per project.
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/compare/show.html.haml
View file @
3ae7dba9
...
@@ -7,11 +7,11 @@
...
@@ -7,11 +7,11 @@
=
render
"form"
=
render
"form"
-
if
@commits
.
present?
-
if
@commits
.
present?
.prepend-top-
20
.prepend-top-
default
=
render
"projects/commits/commit_list"
=
render
"projects/commits/commit_list"
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
project:
@project
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
project:
@project
-
else
-
else
.light-well.prepend-top-
20
.light-well.prepend-top-
default
.center
.center
%h4
%h4
There isn't anything to compare.
There isn't anything to compare.
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/_new_compare.html.haml
View file @
3ae7dba9
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
%h4
Compare failed
%h4
Compare failed
%p
We can't compare selected branches. It may be because of huge diff. Please try again or select different branches.
%p
We can't compare selected branches. It may be because of huge diff. Please try again or select different branches.
-
else
-
else
.light-well.append-bottom-
10
.light-well.append-bottom-
default
.center
.center
%h4
%h4
There isn't anything to merge.
There isn't anything to merge.
...
@@ -86,4 +86,3 @@
...
@@ -86,4 +86,3 @@
return
;
return
;
}
}
});
});
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/_show.html.haml
View file @
3ae7dba9
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
.merge-request-details.issuable-details
.merge-request-details.issuable-details
=
render
"projects/merge_requests/show/mr_title"
=
render
"projects/merge_requests/show/mr_title"
=
render
"projects/merge_requests/show/mr_box"
=
render
"projects/merge_requests/show/mr_box"
.append-bottom-
20
.mr-source-target.prepend-top-default
.append-bottom-
default
.mr-source-target.prepend-top-default
-
if
@merge_request
.
open?
-
if
@merge_request
.
open?
.pull-right
.pull-right
-
if
@merge_request
.
source_branch_exists?
-
if
@merge_request
.
source_branch_exists?
...
...
This diff is collapsed.
Click to expand it.
app/views/shared/issuable/_context.html.haml
View file @
3ae7dba9
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
issuable
],
remote:
true
,
html:
{
class:
'issuable-context-form inline-update js-issuable-update'
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
issuable
],
remote:
true
,
html:
{
class:
'issuable-context-form inline-update js-issuable-update'
}
do
|
f
|
%div
.prepend-top-
20
%div
.prepend-top-
default
.issuable-context-title
.issuable-context-title
%label
%label
Assignee:
Assignee:
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
-
if
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
=
users_select_tag
(
"
#{
issuable
.
class
.
table_name
.
singularize
}
[assignee_id]"
,
placeholder:
'Select assignee'
,
class:
'custom-form-control js-select2 js-assignee'
,
selected:
issuable
.
assignee_id
,
project:
@target_project
,
null_user:
true
,
current_user:
true
)
=
users_select_tag
(
"
#{
issuable
.
class
.
table_name
.
singularize
}
[assignee_id]"
,
placeholder:
'Select assignee'
,
class:
'custom-form-control js-select2 js-assignee'
,
selected:
issuable
.
assignee_id
,
project:
@target_project
,
null_user:
true
,
current_user:
true
)
%div
.prepend-top-
20
.clearfix
%div
.prepend-top-
default
.clearfix
.issuable-context-title
.issuable-context-title
%label
%label
Milestone:
Milestone:
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
-
if
current_user
-
if
current_user
-
subscribed
=
issuable
.
subscribed?
(
current_user
)
-
subscribed
=
issuable
.
subscribed?
(
current_user
)
%div
.prepend-top-
20
.clearfix
%div
.prepend-top-
default
.clearfix
.issuable-context-title
.issuable-context-title
%label
%label
Subscription:
Subscription:
...
...
This diff is collapsed.
Click to expand it.
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