Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
9afc930b
Commit
9afc930b
authored
Oct 16, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make ui-box-show more visible. Refactor some css classes
parent
6404d697
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
27 deletions
+30
-27
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+0
-21
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+2
-0
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/assets/stylesheets/gitlab_bootstrap/common.scss
+21
-0
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/projects/merge_requests/show/_mr_box.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
+4
-3
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+2
-2
No files found.
app/assets/stylesheets/common.scss
View file @
9afc930b
...
...
@@ -140,27 +140,6 @@ p.time {
border-bottom
:
2px
solid
#F90
;
}
.status_info
{
font-size
:
14px
;
padding
:
5px
15px
;
line-height
:
26px
;
text-align
:
center
;
float
:
right
;
position
:
relative
;
top
:
-5px
;
@include
border-radius
(
4px
);
&
.success
{
background
:
#4A4
;
color
:
#FFF
;
}
&
.error
{
background
:
#DA4E49
;
color
:
#FFF
;
}
}
.thin_area
{
height
:
150px
;
}
...
...
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
View file @
9afc930b
...
...
@@ -34,6 +34,8 @@
&
.ui-box-show
{
margin
:
20px
0
;
background
:
#FFF
;
box-shadow
:
inset
0
1px
0
#fff
,
0
1px
5px
#f1f1f1
;
@include
linear-gradient
(
#fafafa
,
#f1f1f1
);
.control-group
{
margin-bottom
:
0
;
...
...
app/assets/stylesheets/gitlab_bootstrap/common.scss
View file @
9afc930b
...
...
@@ -87,3 +87,24 @@ pre.well-pre {
font-weight
:
bold
;
@include
box-shadow
(
inset
0
2px
4px
rgba
(
0
,
0
,
0
,.
15
));
}
/** Big Labels **/
.state-label
{
font-size
:
14px
;
padding
:
5px
15px
;
text-align
:
center
;
float
:
right
;
position
:
relative
;
top
:
-5px
;
@include
border-radius
(
4px
);
&
.state-label-green
{
background
:
#4A4
;
color
:
#FFF
;
}
&
.state-label-red
{
background
:
#DA4E49
;
color
:
#FFF
;
}
}
app/views/projects/issues/show.html.haml
View file @
9afc930b
...
...
@@ -32,7 +32,7 @@
.ui-box-head
%h4
.box-title
-
if
@issue
.
closed?
.
error.status_info
Closed
.
state-label.state-label-red
Closed
=
gfm
escape_once
(
@issue
.
title
)
.ui-box-body
...
...
app/views/projects/merge_requests/show/_mr_box.html.haml
View file @
9afc930b
...
...
@@ -3,11 +3,12 @@
%h4
.box-title
=
gfm
escape_once
(
@merge_request
.
title
)
-
if
@merge_request
.
merged?
.s
uccess.status_info
.s
tate-label.state-label-green
%i
.icon-ok
Merged
-
elsif
@merge_request
.
closed?
.error.status_info
Closed
.state-label.state-label-red
Closed
.ui-box-body
%div
...
...
@@ -32,7 +33,7 @@
%span
%i
.icon-remove
Closed by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
)
}
%s
mall
#{
time_ago_in_words
(
@merge_request
.
closed_event
.
created_at
)
}
ago.
%s
pan
#{
time_ago_in_words
(
@merge_request
.
closed_event
.
created_at
)
}
ago.
-
if
@merge_request
.
merged?
.ui-box-bottom.alert-success
%span
...
...
app/views/projects/milestones/show.html.haml
View file @
9afc930b
...
...
@@ -26,9 +26,9 @@
.ui-box-head
%h4
.box-title
-
if
@milestone
.
closed?
.
error.status_info
Closed
.
state-label.state-label-red
Closed
-
elsif
@milestone
.
expired?
.
error.status_info
Expired
.
state-label.state-label-red
Expired
=
gfm
escape_once
(
@milestone
.
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