Skip to content

Commit

Permalink
Add compass support; css now generated.
Browse files Browse the repository at this point in the history
  • Loading branch information
ConnorStroomberg committed Dec 18, 2013
1 parent d00808e commit 6c363d3
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 144 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ js/test.js
\#*\#
.\#*
*_archive
.sass-cache
app/css/main.css
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
all: R/service.R
all: R/service.R SCSSC

R/service.R: R/measurements.R R/smaa.R R/macbethSolve.R
cat $^ > $@

SCSSC:
compass compile

.PHONY:
SCSSC
1 change: 0 additions & 1 deletion app/css/foundation.min.css

This file was deleted.

139 changes: 0 additions & 139 deletions app/css/main.css

This file was deleted.

25 changes: 25 additions & 0 deletions config.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Require any additional compass plugins here.

# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "app/css"
sass_dir = "sass"
images_dir = "app/img"
javascripts_dir = "app/js"

add_import_path "sass-shared"
# You can select your preferred output style here (can be overridden via the command line):
# output_style = :expanded or :nested or :compact or :compressed

# To enable relative paths to assets via compass helper functions. Uncomment:
# relative_assets = true

# To disable debugging comments that display the original location of your selectors. Uncomment:
# line_comments = false


# If you prefer the indented syntax, you might want to regenerate this
# project again passing --syntax sass, or you can uncomment this:
# preferred_syntax = :sass
# and then run:
# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
2 changes: 0 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

<title>Preference elicitation</title>

<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/foundation/4.3.2/css/foundation.min.css">
<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.1/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/nprogress/0.1.2/nprogress.min.css">
<link rel="stylesheet" type="text/css" href="app/js/lib/jslider/bin/jquery.slider.min.css">
<link rel="stylesheet" type="text/css" href="app/css/nv.d3.css">
Expand Down
2 changes: 1 addition & 1 deletion sass-shared
Submodule sass-shared updated 42 files
+139 −0 _drugis.scss
+38 −0 _foundation.scss
+1,000 −0 _settings.scss
+75 −0 foundation/_functions.scss
+995 −0 foundation/_settings.scss
+49 −0 foundation/components/_accordion.scss
+117 −0 foundation/components/_alert-boxes.scss
+83 −0 foundation/components/_block-grid.scss
+123 −0 foundation/components/_breadcrumbs.scss
+97 −0 foundation/components/_button-groups.scss
+234 −0 foundation/components/_buttons.scss
+233 −0 foundation/components/_clearing.scss
+125 −0 foundation/components/_dropdown-buttons.scss
+159 −0 foundation/components/_dropdown.scss
+47 −0 foundation/components/_flex-video.scss
+472 −0 foundation/components/_forms.scss
+70 −0 foundation/components/_functions.scss
+389 −0 foundation/components/_global.scss
+234 −0 foundation/components/_grid.scss
+52 −0 foundation/components/_inline-lists.scss
+220 −0 foundation/components/_joyride.scss
+57 −0 foundation/components/_keystrokes.scss
+100 −0 foundation/components/_labels.scss
+30 −0 foundation/components/_magellan.scss
+360 −0 foundation/components/_offcanvas.scss
+353 −0 foundation/components/_orbit.scss
+145 −0 foundation/components/_pagination.scss
+87 −0 foundation/components/_panels.scss
+146 −0 foundation/components/_pricing-tables.scss
+75 −0 foundation/components/_progress-bars.scss
+165 −0 foundation/components/_reveal.scss
+83 −0 foundation/components/_side-nav.scss
+187 −0 foundation/components/_split-buttons.scss
+118 −0 foundation/components/_sub-nav.scss
+314 −0 foundation/components/_switch.scss
+93 −0 foundation/components/_tables.scss
+95 −0 foundation/components/_tabs.scss
+71 −0 foundation/components/_thumbs.scss
+121 −0 foundation/components/_tooltips.scss
+590 −0 foundation/components/_top-bar.scss
+447 −0 foundation/components/_type.scss
+661 −0 foundation/components/_visibility.scss

0 comments on commit 6c363d3

Please sign in to comment.