Permalink
Browse files

updated gitignore for sass, refactored sparklines and updated views

  • Loading branch information...
1 parent eba16c8 commit 23edeca98eb2fbde7bbf22110791b77ac25078a6 @unthinkingly committed Oct 10, 2009
View
@@ -4,3 +4,4 @@ log/*
db/schema.rb
app/stylesheets/.sass-cache
tmp/restart.txt
+tmp/sass-cache/*
@@ -1,4 +1,70 @@
@import partials/base.sass
+@import blueprint/reset.sass
+@import compass
+@import compass/layout/sticky_footer.sass
+@import blueprint
+@import compass/utilities/general/float.sass
+@import blueprint/modules/buttons.sass
+
+=rounded
+ +left_rounded_corners
+ +right_rounded_corners
+
+=left_rounded_corners(!radius = 4px)
+ -webkit-border-radius-bottomleft= !radius
+ -webkit-border-radius-topleft= !radius
+ -moz-border-radius-bottomleft= !radius
+ -moz-border-radius-topleft= !radius
+
+=right_rounded_corners(!radius = 4px)
+ -webkit-border-radius-topright= !radius
+ -webkit-border-radius-bottomright= !radius
+ -moz-border-radius-topright= !radius
+ -moz-border-radius-bottomright= !radius
+
+=opacity(!opacity, !hover_opacity = false)
+ :opacity= !opacity / 100
+ :-moz-opacity= !opacity / 100
+ :-ms-filter= "progid:DXImageTransform.Microsoft.Alpha(Opacity=#{!opacity})"
+ :filter= "alpha(opacity=#{!opacity})"
+ @if !hover_opacity
+ +opacity-hover(!hover_opacity)
+
+=opacity-hover(!opacity)
+ &:hover
+ +opacity(!opacity)
+
+!footer_height = 300px
+!event_box_height= 375px
+!xsmall= 0.7em
+!small= 0.8em
+!big= 1.3em
+
+=debug
+ +showgrid
+ #primary
+ :background-color yellow
+ #secondary
+ :background-color blue
+ #tertiary
+ :background-color red
+ div.event_wrap
+ :background red
+ div#top_stories
+ :background green
+
+=italic
+ :font-family palatino, georgia, times
+ :font-style italic
+
+body
+ +blueprint-typography
+ +normal-text
+ +sticky-footer( !footer_height, "#container", "#blueprint_empty_footer_hack", "#footer" )
+ :border-top 5px solid #333
+ :color !font-color
+
+@import partials/base.sass
// Import all the default blueprint modules so that we can access their mixins.
// To configure the grid, edit the partials/base.sass file.
// Page layout can be done using mixins applied to your semantic classes and IDs:
@@ -1,29 +1,6 @@
-// Here is where you can define your constants for your application and to configure the blueprint framework.
-// Feel free to delete these if you want keep the defaults:
-
!blueprint_grid_columns = 24
!blueprint_container_size = 950px
!blueprint_grid_margin = 10px
-// Use this to calculate the width based on the total width.
-// Or you can set !blueprint_grid_width to a fixed value and unset !blueprint_container_size -- it will be calculated for you.
!blueprint_grid_width = (!blueprint_container_size + !blueprint_grid_margin) / !blueprint_grid_columns - !blueprint_grid_margin
-// This import applies a global reset to any page that imports this stylesheet.
-@import blueprint/reset.sass
-// To configure blueprint, edit the partials/base.sass file.
-@import blueprint
-
-//misc shortcuts
-
-= left_rounded_corners(!radius = 4px)
- -webkit-border-radius-bottomleft= !radius
- -webkit-border-radius-topleft= !radius
- -moz-border-radius-bottomleft= !radius
- -moz-border-radius-topleft= !radius
-
-= right_rounded_corners(!radius = 4px)
- -webkit-border-radius-topright= !radius
- -webkit-border-radius-bottomright= !radius
- -moz-border-radius-topright= !radius
- -moz-border-radius-bottomright= !radius
@@ -1,20 +1,10 @@
<%= render :partial => "layouts/navigation" %>
-<% @tag_history = Tag.aggregate_history.collect {|r| r["count(id)"].to_i} %>
-<%- @report_history = Report.aggregate_history.collect {|r| r["count(id)"].to_i}
-report_count = @report_history.length
-tag_count = @tag_history.length
-%>
-
<div id="header">
<h2>
- This <span class="instance_name">Project "<%= "#{APP_TAG}" %>"</span> has <%= image_tag(Gchart.sparkline( :size => '80x25', :line_colors => '0077CC', :data => @report_history)) %>
- <%= @report_history.length %>
- reports and <%= image_tag(Gchart.sparkline(:size => '80x25', :line_colors => '0077CC', :data => @tag_history)) %>
-
- <%= tag_count %> tags.</li>
+ This <span class="instance_name">Project "<%= "#{APP_TAG}" %>"</span> has <%= @report_history.length %> reports and <%= tag_count %> tags.</li>
</h2>
- <h3>Your job is to <%= logged_in? ? "tag these" : (link_to("tag these", login_path)) %> reports with <span clas="person tag">People</span>, <span class="location tag">Places</span>, and <span class="organization tag">Organizations</span>.</h3>
+ <h3 class="notice">Your job is to <%= logged_in? ? "tag these" : (link_to("tag these", login_path)) %> reports with <span clas="person tag">People</span>, <span class="location tag">Places</span>, and <span class="organization tag">Organizations</span>.</h3>
</div>
@@ -0,0 +1,8 @@
+<% @tag_history = Tag.aggregate_history.collect {|r| r["count(id)"].to_i} %>
+<%- @report_history = Report.aggregate_history.collect {|r| r["count(id)"].to_i}
+report_count = @report_history.length
+tag_count = @tag_history.length
+%>
+
+ <%= image_tag(Gchart.sparkline(:size => '80x25', :line_colors => '0077CC', :data => @tag_history)) %>
+ <%= image_tag(Gchart.sparkline( :size => '80x25', :line_colors => '0077CC', :data => @report_history)) %>
Oops, something went wrong.

0 comments on commit 23edeca

Please sign in to comment.