Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Committing CSS. Going to make the carousel.
  • Loading branch information
robertmilner committed Mar 21, 2012
1 parent b625dd0 commit 60dbd51
Show file tree
Hide file tree
Showing 68 changed files with 224 additions and 435 deletions.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
18 changes: 13 additions & 5 deletions app/assets/javascripts/application.js
Expand Up @@ -12,13 +12,21 @@
//
//= require jquery
//= require jquery_ujs
//= require bootstrap-carousel
//= require_tree .

// need to get button working first
// enable and disable button
// favorite_btn
// $(document).ready(function($) {
//
$(document).ready(function($) {








// // $("#disableBtn").click(function() {
// // $("#clearBtn").attr("disabled", "disabled");
// // }); // click()
Expand All @@ -37,6 +45,6 @@
// // };
//
// // $('.label').vertAlign();
//
// }); // ready()
//

}); // ready()

32 changes: 0 additions & 32 deletions app/assets/stylesheets/fonts/icon_font.svg

This file was deleted.

12 changes: 6 additions & 6 deletions app/assets/stylesheets/global/_variables.scss
@@ -1,8 +1,8 @@
/* variables */
$black: #000000;
$blue: #ACCFE2;
$blue_shade: #96B4C5;
$red: #BD3B36;
$red_shade: #A53430;
$yellow: #FFF235;
$yellow_shade: #DFD32E;
$blue: #accfe2;
$blue_shade: #96b4c5;
$red: #bd3b36;
$red_shade: #a53430;
$yellow: #fff235;
$yellow_shade: #dfd32e;
12 changes: 6 additions & 6 deletions app/assets/stylesheets/global/fontface.css.scss
Expand Up @@ -27,12 +27,12 @@ Eye V content: 'V';
*/

@font-face {
font-family: 'IcoMoonRegular';
src: url('../fonts/icon_font-webfont.eot');
src: url('../fonts/icon_font-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/icon_font-webfont.woff') format('woff'),
url('../fonts/icon_font-webfont.ttf') format('truetype'),
url('../fonts/icon_font-webfont.svg#IcoMoonRegular') format('svg');
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;
}
11 changes: 6 additions & 5 deletions app/assets/stylesheets/global/footer.css.scss
Expand Up @@ -9,13 +9,10 @@ footer {
right: 0;
bottom: 0;
left: 0;
z-index: 100px;
z-index: 100;
font-size: 12px;
background: #000;
border-top: 2px solid $black;
a {
color: #fff;
}
ul {
min-width: 320px;
max-width: 620px;
Expand All @@ -28,14 +25,18 @@ footer {
float: left;
text-align: center;
background-color: #222;
span {
a {
color: #fff;
font-size: 36px;
line-height: 48px;
display: block;
text-align: center;
@include font_face;
@include text_shadow(0, 3px, 0, $black);
}
span.nav_label {
// display: none;
}
}
}
}
4 changes: 2 additions & 2 deletions app/assets/stylesheets/global/global.css.scss
Expand Up @@ -16,11 +16,11 @@

html, body {
font: 16px/24px "Helvetica Neue", Helvetica, Arial, sans-serif;
height: 100%
height: 100%;
}

body {
background: url('../furley_bg.png');;
background: url('/assets/furley_bg.png');
}
a {
color: $black;
Expand Down
29 changes: 14 additions & 15 deletions app/views/pages/_footer.html.haml
Expand Up @@ -2,22 +2,21 @@

%ul
%li
%a{:href => app_excuse_url, :class => "icon"}
%span H
Home
= link_to "H", app_excuse_url, :class => "icon"
%span.nav_label Home

%li
%a{:href => app_search_url, :class => "icon"}
%span S
Search
= link_to "S", app_search_url, :class => "icon"
%span.nav_label Search

%li
%a{:href => app_location_url, :class => "icon"}
%span L
Location
= link_to "L", app_location_url, :class => "icon"
%span.nav_label Location

%li
%a{:href => app_tag_url, :class => "icon"}
%span T
Tag
= link_to "T", app_tag_url, :class => "icon"
%span.nav_label Tag

%li
%a{:href => app_user_url, :class => "icon"}
%span A
Account
= link_to "A", app_user_url, :class => "icon"
%span.nav_label Account
15 changes: 15 additions & 0 deletions app/views/pages/_nav_def_list.html.haml
@@ -0,0 +1,15 @@
%dl
%dd= link_to "H", app_excuse_url, :class => "icon"
%dt Home

%dd= link_to "S", app_search_url, :class => "icon"
%dt Search

%dd= link_to "L", app_location_url, :class => "icon"
%dt Location

%dd= link_to "T", app_tag_url, :class => "icon"
%dt Tag

%dd= link_to "A", app_user_url, :class => "icon"
%dt Account
2 changes: 1 addition & 1 deletion config/environments/development.rb
Expand Up @@ -33,5 +33,5 @@
config.assets.compress = false

# Expands the lines which load the assets
config.assets.debug = false
config.assets.debug = true
end
Binary file removed vendor/assets/images/busy.png
Binary file not shown.
26 changes: 0 additions & 26 deletions vendor/assets/images/busy.svg

This file was deleted.

Binary file removed vendor/assets/images/checkmark.png
Binary file not shown.
7 changes: 0 additions & 7 deletions vendor/assets/images/checkmark.svg

This file was deleted.

Binary file removed vendor/assets/images/close.png
Binary file not shown.
8 changes: 0 additions & 8 deletions vendor/assets/images/close.svg

This file was deleted.

Binary file removed vendor/assets/images/cog2.png
Binary file not shown.
14 changes: 0 additions & 14 deletions vendor/assets/images/cog2.svg

This file was deleted.

Binary file removed vendor/assets/images/comment.png
Binary file not shown.
9 changes: 0 additions & 9 deletions vendor/assets/images/comment.svg

This file was deleted.

Binary file removed vendor/assets/images/eye.png
Binary file not shown.
19 changes: 0 additions & 19 deletions vendor/assets/images/eye.svg

This file was deleted.

Binary file removed vendor/assets/images/facebook1.png
Binary file not shown.

0 comments on commit 60dbd51

Please sign in to comment.