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
Boxiang Sun
gitlab-ce
Commits
8835514b
Commit
8835514b
authored
Mar 04, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes style consistencies.
parent
c060823d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
10 deletions
+9
-10
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+2
-3
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+3
-3
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+4
-4
No files found.
app/assets/stylesheets/pages/issues.scss
View file @
8835514b
...
@@ -135,9 +135,8 @@ form.edit-issue {
...
@@ -135,9 +135,8 @@ form.edit-issue {
}
}
.editor-details
{
.editor-details
{
@media
(
max-width
:
$screen-sm-max
)
{
display
:
block
;
display
:
block
;
}
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
display
:
inline-block
;
display
:
inline-block
;
}
}
...
...
app/views/projects/issues/show.html.haml
View file @
8835514b
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
=
icon
(
'circle-o'
)
=
icon
(
'circle-o'
)
%a
.btn.btn-default.pull-right.hidden-sm.hidden-md.hidden-lg.gutter-toggle
{
href:
"#"
}
%a
.btn.btn-default.pull-right.hidden-sm.hidden-md.hidden-lg.gutter-toggle
{
href:
"#"
}
=
icon
(
'angle-double-left'
)
=
icon
(
'angle-double-left'
)
.issue-meta
.issue-meta
%strong
.identifier
%strong
.identifier
...
@@ -29,11 +29,11 @@
...
@@ -29,11 +29,11 @@
.editor-details
.editor-details
.editor-details
.editor-details
%strong
%strong
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
%span
.hidden-xs
%span
.hidden-xs
=
'@'
+
@issue
.
author
.
username
=
'@'
+
@issue
.
author
.
username
%strong
%strong
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
by_username:
true
,
avatar:
false
)
by_username:
true
,
avatar:
false
)
=
time_ago_with_tooltip
(
@issue
.
created_at
)
=
time_ago_with_tooltip
(
@issue
.
created_at
)
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
8835514b
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
%span
.hidden-xs
%span
.hidden-xs
=
@merge_request
.
state_human_name
=
@merge_request
.
state_human_name
%span
.hidden-sm.hidden-md.hidden-lg
%span
.hidden-sm.hidden-md.hidden-lg
=
icon
(
@merge_request
.
state_icon_name
)
=
icon
(
@merge_request
.
state_icon_name
)
%a
.btn.btn-default.pull-right.hidden-sm.hidden-md.hidden-lg.gutter-toggle
{
href:
"#"
}
%a
.btn.btn-default.pull-right.hidden-sm.hidden-md.hidden-lg.gutter-toggle
{
href:
"#"
}
=
icon
(
'angle-double-left'
)
=
icon
(
'angle-double-left'
)
.issue-meta
.issue-meta
%strong
.identifier
%strong
.identifier
Merge Request ##{@merge_request.iid}
Merge Request ##{@merge_request.iid}
...
@@ -13,11 +13,11 @@
...
@@ -13,11 +13,11 @@
by
by
.editor-details
.editor-details
%strong
%strong
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
%span
.hidden-xs
%span
.hidden-xs
=
'@'
+
@merge_request
.
author
.
username
=
'@'
+
@merge_request
.
author
.
username
%strong
%strong
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
by_username:
true
,
avatar:
false
)
by_username:
true
,
avatar:
false
)
=
time_ago_with_tooltip
(
@merge_request
.
created_at
)
=
time_ago_with_tooltip
(
@merge_request
.
created_at
)
...
...
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