Commit cf6a0ff7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

Use rails helper image-url for reference images in css

Fixes #1001
parents 4c132ed4 2ed06dc4
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;
......
...@@ -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;
} }
......
...@@ -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;
......
...@@ -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
......
...@@ -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;
......
...@@ -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;
......
...@@ -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
......
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment