home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'assets-css-helpers' into 'master'

Browse Source 
Use rails helper image-url for reference images in css

Fixes #1001
This commit is contained in:
Dmitriy Zaporozhets
2014-03-06 13:49:55 +00:00
parent 4c132ed48e 2ed06dc41d
commit cf6a0ff760
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/generic/forms.scss
+1 -1
View File
@@ -1,5 +1,5 @@
input[type='search'].search-text-input {
background-image: url("icon-search.png");
background-image: image-url("icon-search.png");
background-repeat: no-repeat;
background-position: 10px;
padding-left: 25px;
app/assets/stylesheets/generic/typography.scss
+1 -1
View File
@@ -105,7 +105,7 @@ a:focus {
display: inline-block;
width: $size;
height: $size;
background-image: url("icon-link.png");
background-image: image-url("icon-link.png");
background-size: contain;
background-repeat: no-repeat;
}
app/assets/stylesheets/sections/commits.scss
+1 -1
View File
@@ -73,7 +73,7 @@
.commits-compare-switch{
background: url("switch_icon.png") no-repeat center center;
background: image-url("switch_icon.png") no-repeat center center;
width: 32px;
height: 32px;
text-indent: -9999px;
app/assets/stylesheets/sections/diff.scss
+7 -7
View File
@@ -144,7 +144,7 @@
line-height: 0;
img{
border: 1px solid #FFF;
background: url('trans_bg.gif');
background: image-url('trans_bg.gif');
max-width: 100%;
}
&.deleted {
@@ -209,7 +209,7 @@
width: 15px;
position: absolute;
top: 0px;
background: url('swipemode_sprites.gif') 0 3px no-repeat;
background: image-url('swipemode_sprites.gif') 0 3px no-repeat;
}
.bottom-handle{
display: block;
@@ -217,7 +217,7 @@
width: 15px;
position: absolute;
bottom: 0px;
background: url('swipemode_sprites.gif') 0 -11px no-repeat;
background: image-url('swipemode_sprites.gif') 0 -11px no-repeat;
}
}
} //.view.swipe
@@ -249,7 +249,7 @@
left: 12px;
height: 10px;
width: 276px;
background: url('onion_skin_sprites.gif') -4px -20px repeat-x;
background: image-url('onion_skin_sprites.gif') -4px -20px repeat-x;
}
.dragger {
@@ -259,7 +259,7 @@
top: 0px;
height: 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;
}
@@ -270,7 +270,7 @@
right: 0px;
height: 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 {
@@ -280,7 +280,7 @@
left: 0px;
height: 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
app/assets/stylesheets/sections/header.scss
+1 -1
View File
@@ -161,7 +161,7 @@ header {
}
.search-input {
background-image: url("icon-search.png");
background-image: image-url("icon-search.png");
background-repeat: no-repeat;
background-position: 10px;
height: inherit;
app/assets/stylesheets/sections/notes.scss
+1 -1
View File
@@ -196,7 +196,7 @@ ul.notes {
.diff-file tr.line_holder {
.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;
margin-left: -65px;
position: absolute;
app/helpers/application_helper.rb
+1 -1
View File
@@ -54,7 +54,7 @@ module ApplicationHelper
if group && group.avatar.present?
group.avatar.url
else
'/assets/no_group_avatar.png'
image_path('no_group_avatar.png')
end
end
spec/helpers/application_helper_spec.rb
+1 -1
View File
@@ -52,7 +52,7 @@ describe ApplicationHelper do
it "should give default avatar_icon when no avatar is present" do
group = create(:group)
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