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
Kazuhiko Shiozaki
gitlab-ce
Commits
cf6a0ff7
Commit
cf6a0ff7
authored
Mar 06, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'assets-css-helpers' into 'master'
Use rails helper image-url for reference images in css Fixes #1001
parents
4c132ed4
2ed06dc4
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
14 deletions
+14
-14
app/assets/stylesheets/generic/forms.scss
app/assets/stylesheets/generic/forms.scss
+1
-1
app/assets/stylesheets/generic/typography.scss
app/assets/stylesheets/generic/typography.scss
+1
-1
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+1
-1
app/assets/stylesheets/sections/diff.scss
app/assets/stylesheets/sections/diff.scss
+7
-7
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+1
-1
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+1
-1
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-1
spec/helpers/application_helper_spec.rb
spec/helpers/application_helper_spec.rb
+1
-1
No files found.
app/assets/stylesheets/generic/forms.scss
View file @
cf6a0ff7
input
[
type
=
'search'
]
.search-text-input
{
input
[
type
=
'search'
]
.search-text-input
{
background-image
:
url("icon-search.png")
;
background-image
:
image-
url
(
"icon-search.png"
);
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
background-position
:
10px
;
background-position
:
10px
;
padding-left
:
25px
;
padding-left
:
25px
;
...
...
app/assets/stylesheets/generic/typography.scss
View file @
cf6a0ff7
...
@@ -105,7 +105,7 @@ a:focus {
...
@@ -105,7 +105,7 @@ a:focus {
display
:
inline-block
;
display
:
inline-block
;
width
:
$size
;
width
:
$size
;
height
:
$size
;
height
:
$size
;
background-image
:
url("icon-link.png")
;
background-image
:
image-
url
(
"icon-link.png"
);
background-size
:
contain
;
background-size
:
contain
;
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
}
}
...
...
app/assets/stylesheets/sections/commits.scss
View file @
cf6a0ff7
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
.commits-compare-switch
{
.commits-compare-switch
{
background
:
url("switch_icon.png")
no-repeat
center
center
;
background
:
image-
url
(
"switch_icon.png"
)
no-repeat
center
center
;
width
:
32px
;
width
:
32px
;
height
:
32px
;
height
:
32px
;
text-indent
:
-9999px
;
text-indent
:
-9999px
;
...
...
app/assets/stylesheets/sections/diff.scss
View file @
cf6a0ff7
...
@@ -144,7 +144,7 @@
...
@@ -144,7 +144,7 @@
line-height
:
0
;
line-height
:
0
;
img
{
img
{
border
:
1px
solid
#FFF
;
border
:
1px
solid
#FFF
;
background
:
url('trans_bg.gif')
;
background
:
image-
url
(
'trans_bg.gif'
);
max-width
:
100%
;
max-width
:
100%
;
}
}
&
.deleted
{
&
.deleted
{
...
@@ -209,7 +209,7 @@
...
@@ -209,7 +209,7 @@
width
:
15px
;
width
:
15px
;
position
:
absolute
;
position
:
absolute
;
top
:
0px
;
top
:
0px
;
background
:
url('swipemode_sprites.gif')
0
3px
no-repeat
;
background
:
image-
url
(
'swipemode_sprites.gif'
)
0
3px
no-repeat
;
}
}
.bottom-handle
{
.bottom-handle
{
display
:
block
;
display
:
block
;
...
@@ -217,7 +217,7 @@
...
@@ -217,7 +217,7 @@
width
:
15px
;
width
:
15px
;
position
:
absolute
;
position
:
absolute
;
bottom
:
0px
;
bottom
:
0px
;
background
:
url('swipemode_sprites.gif')
0
-11px
no-repeat
;
background
:
image-
url
(
'swipemode_sprites.gif'
)
0
-11px
no-repeat
;
}
}
}
}
}
//.view.swipe
}
//.view.swipe
...
@@ -249,7 +249,7 @@
...
@@ -249,7 +249,7 @@
left
:
12px
;
left
:
12px
;
height
:
10px
;
height
:
10px
;
width
:
276px
;
width
:
276px
;
background
:
url('onion_skin_sprites.gif')
-4px
-20px
repeat-x
;
background
:
image-
url
(
'onion_skin_sprites.gif'
)
-4px
-20px
repeat-x
;
}
}
.dragger
{
.dragger
{
...
@@ -259,7 +259,7 @@
...
@@ -259,7 +259,7 @@
top
:
0px
;
top
:
0px
;
height
:
14px
;
height
:
14px
;
width
:
14px
;
width
:
14px
;
background
:
url('onion_skin_sprites.gif')
0px
-34px
repeat-x
;
background
:
image-
url
(
'onion_skin_sprites.gif'
)
0px
-34px
repeat-x
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
...
@@ -270,7 +270,7 @@
...
@@ -270,7 +270,7 @@
right
:
0px
;
right
:
0px
;
height
:
10px
;
height
:
10px
;
width
:
10px
;
width
:
10px
;
background
:
url('onion_skin_sprites.gif')
-2px
0px
no-repeat
;
background
:
image-
url
(
'onion_skin_sprites.gif'
)
-2px
0px
no-repeat
;
}
}
.opaque
{
.opaque
{
...
@@ -280,7 +280,7 @@
...
@@ -280,7 +280,7 @@
left
:
0px
;
left
:
0px
;
height
:
10px
;
height
:
10px
;
width
:
10px
;
width
:
10px
;
background
:
url('onion_skin_sprites.gif')
-2px
-10px
no-repeat
;
background
:
image-
url
(
'onion_skin_sprites.gif'
)
-2px
-10px
no-repeat
;
}
}
}
}
}
//.view.onion-skin
}
//.view.onion-skin
...
...
app/assets/stylesheets/sections/header.scss
View file @
cf6a0ff7
...
@@ -161,7 +161,7 @@ header {
...
@@ -161,7 +161,7 @@ header {
}
}
.search-input
{
.search-input
{
background-image
:
url("icon-search.png")
;
background-image
:
image-
url
(
"icon-search.png"
);
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
background-position
:
10px
;
background-position
:
10px
;
height
:
inherit
;
height
:
inherit
;
...
...
app/assets/stylesheets/sections/notes.scss
View file @
cf6a0ff7
...
@@ -196,7 +196,7 @@ ul.notes {
...
@@ -196,7 +196,7 @@ ul.notes {
.diff-file
tr
.line_holder
{
.diff-file
tr
.line_holder
{
.add-diff-note
{
.add-diff-note
{
background
:
url("diff_note_add.png")
no-repeat
left
0
;
background
:
image-
url
(
"diff_note_add.png"
)
no-repeat
left
0
;
height
:
22px
;
height
:
22px
;
margin-left
:
-65px
;
margin-left
:
-65px
;
position
:
absolute
;
position
:
absolute
;
...
...
app/helpers/application_helper.rb
View file @
cf6a0ff7
...
@@ -54,7 +54,7 @@ module ApplicationHelper
...
@@ -54,7 +54,7 @@ module ApplicationHelper
if
group
&&
group
.
avatar
.
present?
if
group
&&
group
.
avatar
.
present?
group
.
avatar
.
url
group
.
avatar
.
url
else
else
'/assets/no_group_avatar.png'
image_path
(
'no_group_avatar.png'
)
end
end
end
end
...
...
spec/helpers/application_helper_spec.rb
View file @
cf6a0ff7
...
@@ -52,7 +52,7 @@ describe ApplicationHelper do
...
@@ -52,7 +52,7 @@ describe ApplicationHelper do
it
"should give default avatar_icon when no avatar is present"
do
it
"should give default avatar_icon when no avatar is present"
do
group
=
create
(
:group
)
group
=
create
(
:group
)
group
.
save!
group
.
save!
group_icon
(
group
.
path
).
to_s
.
should
==
"/assets/no_group_avatar.png"
group_icon
(
group
.
path
).
should
match
(
"group_avatar.png"
)
end
end
end
end
...
...
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