Permalink
Browse files

Switch to png images.

  • Loading branch information...
robertmilner committed Mar 27, 2012
1 parent 1da368a commit e1c0eaa3d39c123638074ea80e8d68f1445726e8
@@ -4,4 +4,4 @@
//= require bootstrap-transition
//= require bootstrap-tooltip
//= require bootstrap-carousel
-//= require_tree .
+//= require global
@@ -91,5 +91,7 @@ $(document).ready(function($) {
// Kick off one resize to fix all videos on page load
}).resize();
// end
+
+ $().find
});
@@ -1,38 +0,0 @@
-/*
-
-Icon Hex Entitiy CSS Content
-======================================================================
-Star-Full * content: '*';
-Twitter 0 content: '0';
-Twitter_2 1 content: '1';
-Facebook 2 content: '2';
-Facebook_2 3 content: '3';
-Support ? content: '?';
-User A content: 'A';
-Comment C content: 'C';
-Cancel D content: 'D';
-Gear E content: 'E';
-Heart-Full F content: 'F';
-Home H content: 'H';
-Info I content: 'I';
-Checkmark K content: 'K';
-Busy L content: 'L';
-Mail M content: 'M';
-Pencil N content: 'N';
-Synchronize R content: 'R';
-Search S content: 'S';
-Trashcan T content: 'T';
-Eye V content: 'V';
-
-*/
-
-@font-face {
- font-family: "IcoMoonRegular";
- src: url('/assets/icon_font-webfont.eot');
- src: url('/assets/icon_font-webfont.eot?#iefix') format('embedded-opentype'),
- url('/assets/icon_font-webfont.woff') format('woff'),
- url('/assets/icon_font-webfont.ttf') format('truetype'),
- url('/assets/icon_font-webfont.svg#IcoMoonRegular') format('svg');
- font-weight: normal;
- font-style: normal;
-}
@@ -47,103 +47,4 @@ input[type="submit"] {
}
.space {
padding-bottom: 0;
-}
-
-/*button,
-input,
-select,
-textarea {
- margin: 0;
- font-size: 100%;
- vertical-align: middle;
-}
-button,
-input {
- *overflow: visible;
- line-height: normal;
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner {
- padding: 0;
- border: 0;
-}
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
- cursor: pointer;
- -webkit-appearance: button;
-}
-input[type="search"] {
- -webkit-appearance: textfield;
- -webkit-box-sizing: content-box;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
-}
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
- -webkit-appearance: none;
-}
-.search-query {
- padding-left: 14px;
- padding-right: 14px;
- margin-bottom: 0;
- -webkit-border-radius: 14px;
- -moz-border-radius: 14px;
- border-radius: 14px;
-}
-.form-search input,
-.form-inline input,
-.form-horizontal input,
-.form-search textarea,
-.form-inline textarea,
-.form-horizontal textarea,
-.form-search select,
-.form-inline select,
-.form-horizontal select,
-.form-search .help-inline,
-.form-inline .help-inline,
-.form-horizontal .help-inline,
-.form-search .uneditable-input,
-.form-inline .uneditable-input,
-.form-horizontal .uneditable-input,
-.form-search .input-prepend,
-.form-inline .input-prepend,
-.form-horizontal .input-prepend,
-.form-search .input-append,
-.form-inline .input-append,
-.form-horizontal .input-append {
- display: inline-block;
- margin-bottom: 0;
-}
-.form-search .hide,
-.form-inline .hide,
-.form-horizontal .hide {
- display: none;
-}
-.form-search label,
-.form-inline label {
- display: inline-block;
-}
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
- margin-bottom: 0;
-}
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
- padding-left: 0;
- margin-bottom: 0;
- vertical-align: middle;
-}
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
- float: left;
- margin-left: 0;
- margin-right: 3px;
-}*/
+}
@@ -58,7 +58,8 @@ header {
padding: 6px;
background-color: $red_shade;
@include border_radius(10px);
- background-image: url('/assets/write.svg');
+ background-image: url('/assets/write.png');
+ background-image: none, url('/assets/write.svg'), url('/assets/write.png');
background-size: 26px;
background-repeat: no-repeat;
background-position: center center;
@@ -4,9 +4,9 @@ def favorited_image_tag(excuse, user)
# need to figure out how to check if current excuse is favorited by the current user
# this is currently not working
if excuse.favorites.map(&:user_id).include?(user.id)
- image_tag "heart_red.svg", :class => "btn-favorite true", :alt => ""
+ image_tag "heart_red.png", :class => "btn-favorite true", :alt => ""
else
- image_tag "heart_black.svg", :class => "btn-favorite", :alt => ""
+ image_tag "heart_black.png", :class => "btn-favorite", :alt => ""
end
end
@@ -2,21 +2,21 @@
%ul
%li
- = link_to (image_tag "/assets/home.svg"), app_excuse_url, :class => "icon", :rel => "tooltip", :title => "Home"
+ = link_to (image_tag "/assets/home.png"), app_excuse_url, :class => "icon", :rel => "tooltip", :title => "Home"
%span.nav_label Home
%li
- = link_to (image_tag "/assets/search.svg"), app_search_url, :class => "icon", :rel => "tooltip", :title => "Search excuses by words"
+ = link_to (image_tag "/assets/search.png"), app_search_url, :class => "icon", :rel => "tooltip", :title => "Search excuses by words"
%span.nav_label Search
%li
- = link_to (image_tag "/assets/location.svg"), app_location_url, :class => "icon", :rel => "tooltip", :title => "Search excuses by location"
+ = link_to (image_tag "/assets/location.png"), app_location_url, :class => "icon", :rel => "tooltip", :title => "Search excuses by location"
%span.nav_label Location
%li
- = link_to (image_tag "/assets/tag.svg"), app_tag_url, :class => "icon", :rel => "tooltip", :title => "Search excuses by tags"
+ = link_to (image_tag "/assets/tag.png"), app_tag_url, :class => "icon", :rel => "tooltip", :title => "Search excuses by tags"
%span.nav_label Tag
%li
- = link_to (image_tag "/assets/account.svg"), app_user_url, :class => "icon", :rel => "tooltip", :title => "View excuses your account"
+ = link_to (image_tag "/assets/account.png"), app_user_url, :class => "icon", :rel => "tooltip", :title => "View excuses your account"
%span.nav_label Account

0 comments on commit e1c0eaa

Please sign in to comment.