Skip to content

Commit

Permalink
Added cheeks icons to store
Browse files Browse the repository at this point in the history
- Updated the css for the pattern primer to point at the store edge
- Added additional items to the item icons section
- Renamed a few items in the item icons section so that the items show up correctly
  • Loading branch information
Mark Geller committed Sep 27, 2013
1 parent 0b84099 commit f1c8eff
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
22 changes: 13 additions & 9 deletions patterns/item-icons.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
iconTitle = $(this).find('div').attr('class').replace(/\-/g, ' '),
iconClass = $(this).find('div').attr('class'),
iconShort = $(this).find('div').attr('data-short');

console.log(this);
$('#pattern-item-icons #icon-show').css({
'background-position' : $(this).find('div').css('backgroundPosition')
})
});
console.log($(this).find('div').css('backgroundPosition'));
$('#pattern-item-icons #icon-title').text( iconTitle );
$('#pattern-item-icons #icon-class').text( iconClass );
$('#pattern-item-icons #icon-short').text( iconShort );
Expand Down Expand Up @@ -210,14 +211,17 @@
<li><div class="fire-birdcage" data-short="a15"></div></li>
<li><div class="gas-mask" data-short="b16"></div></li>
<li><div class="piston-arm" data-short="c16"></div></li>
<li><div class="phlogistaff" data-short="d16"></div></li>
<li><div class="articulated" data-short="e16"></div></li>
<li><div class="gear-of-war" data-short="f16"></div></li>
<li><div class="thermal-coupling" data-short="d16"></div></li>
<li><div class="hinged-ballista" data-short="e16"></div></li>
<li><div class="flywheel" data-short="f16"></div></li>
<li><div class="thermalleus" data-short="g16"></div></li>
<li><div class="expansion-blade" data-short="h16"></div></li>
<li><div class="bayonettish" data-short="i16"></div></li>
<li><div class="steam-powered-tool" data-short="j16"></div></li>
<li><div class="timesplitter" data-short="h16"></div></li>
<li><div class="bayonette" data-short="i16"></div></li>
<li><div class="tool-and-die" data-short="j16"></div></li>
<li><div class="steamer-trunk" data-short="a17"></div></li>
<li><div class="steampunk-costume-loot-box" data-short="b17"></div></li>
<li><div class="dyeable-steampunk-costume" data-short="b17"></div></li>
<li><div class="cheeks-and-totes-bundle" data-short="c17"></div></li>
<li><div class="totes" data-short="d17"></div></li>
<li><div class="cheeks" data-short="e17"></div></li>
</ul>
</div>
2 changes: 1 addition & 1 deletion public/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
border: 1px solid black;
margin: 0 10px 0 0;
float: left;
background: url(http://tera-cdn0.enmasse-game.com/assets/store-sprite.png) no-repeat 100px 100px;
background: url(//store-1.edge.enmasse-game.com/assets/store-sprite.e19892bd4a7f8f34b6929a3792d3e20e.png) no-repeat 100px 100px;
}
#pattern-item-icons #icon-show:after {
content: "";
Expand Down
3 changes: 2 additions & 1 deletion views/index.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>

<link rel="stylesheet" type="text/css" href="http://tera.enmasse.com/assets/application.css">
<!-- <link rel="stylesheet" type="text/css" href="http://tera.enmasse.com/assets/application.css"> -->
<link rel="stylesheet" type="text/css" href="http://store-2.edge.enmasse-game.com/css/app.css">
<!-- <link rel="stylesheet" type="text/css" href="/style.css"> -->
<style type="text/css">
<%= File.read(File.join('public/style.css')) %>
Expand Down

0 comments on commit f1c8eff

Please sign in to comment.