Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Switched stylesheets to concat
  • Loading branch information
danclien committed Aug 17, 2011
1 parent 75806bb commit ddb71c6
Show file tree
Hide file tree
Showing 6 changed files with 521 additions and 1,807 deletions.
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.slim
Expand Up @@ -2,7 +2,7 @@ doctype 5
html
head
title Friday Night Hacks
= stylesheet_link_tag :all
= stylesheet_link_tag :all, :concat => true
link ref="shortcut icon" href="/favicon.ico"

= javascript_include_tag :defaults
Expand Down
2,082 changes: 382 additions & 1,700 deletions public/stylesheets/all.css

Large diffs are not rendered by default.

19 changes: 7 additions & 12 deletions public/stylesheets/main.css
Expand Up @@ -20,7 +20,7 @@ html, body {
/* .push must be the same height as .footer */
}

/* @group General */
/* General */
body {
background-color: #fff8ea;
border-top: 4px solid #f56006;
Expand All @@ -46,8 +46,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
text-decoration: none;
}

/* @end */
/* @group Header */
/* Header */
.logo {
float: left;
height: 40px;
Expand Down Expand Up @@ -104,8 +103,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
width: 960px;
}

/* @end */
/* @group Contents */
/* Contents */
.contents {
-moz-box-shadow: -8px 0px 8px black;
/* FF3.5 - 3.6 */
Expand Down Expand Up @@ -145,8 +143,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
margin-right: 0px;
}

/* @end */
/* @group Footer */
/* Footer */
.footer {
text-shadow: #413e3e 1px 1px 1px;
background: #372f2d;
Expand Down Expand Up @@ -176,15 +173,13 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
padding: 0.2em 0.5em;
}

/* @end */
/* @group Gallery */
/* Gallery */
.gallery-img {
border: 8px solid #e0cca3;
max-width: 940px;
}

/* @end */
/* @group Form */
/* Form */
.form-box {
margin: 1em auto 1em auto;
width: 300px;
Expand All @@ -206,7 +201,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
top: -5px;
}

/* @end */
/* Other */
.light-box {
-moz-border-radius: 3px;
/* FF1-3.6 */
Expand Down
196 changes: 122 additions & 74 deletions public/stylesheets/projects.css
@@ -1,76 +1,124 @@
/*
Syntax error: Invalid CSS after "...oup Projects */": expected selector or at-rule, was ".title {"
on line 5 of /Users/dan/dev/fridayhacknights/public/stylesheets/sass/projects.scss
/* Colors */
/* Fonts */
/* Mixins */
/* Projects */
.title {
padding-bottom: 20px;
}

1: @import "base"
2:
3: /* @group Projects */
4:
5: .title {
6: padding-bottom: 20px;
7: }
8:
9: .project.light-box {
10: margin: 1em 0em 1em 0em;
.project.light-box {
margin: 1em 0em 1em 0em;
padding: 20px;
}
.project.light-box h2 {
margin: 0px 0px 20px 0px;
}
.project.light-box h3 {
margin: 0px 0px 20px 0px;
}

Backtrace:
/Users/dan/dev/fridayhacknights/public/stylesheets/sass/projects.scss:5
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/scss/parser.rb:898:in `expected'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/scss/parser.rb:841:in `expected'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/scss/parser.rb:27:in `parse'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/engine.rb:320:in `_to_tree'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/engine.rb:293:in `_render'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/engine.rb:241:in `block in render'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/util.rb:297:in `silence_sass_warnings'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/engine.rb:241:in `render'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/plugin/compiler.rb:319:in `update_stylesheet'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/plugin/compiler.rb:181:in `block (2 levels) in update_stylesheets'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/plugin/compiler.rb:175:in `each'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/plugin/compiler.rb:175:in `block in update_stylesheets'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/plugin/compiler.rb:173:in `each'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/plugin/compiler.rb:173:in `update_stylesheets'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/plugin.rb:81:in `update_stylesheets'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/plugin.rb:54:in `check_for_updates'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/sass-3.1.7/lib/sass/plugin/rack.rb:51:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/warden-1.0.5/lib/warden/manager.rb:35:in `block in call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/warden-1.0.5/lib/warden/manager.rb:34:in `catch'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/warden-1.0.5/lib/warden/manager.rb:34:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/actionpack-3.0.9/lib/action_dispatch/middleware/best_standards_support.rb:17:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/actionpack-3.0.9/lib/action_dispatch/middleware/head.rb:14:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/rack-1.2.3/lib/rack/methodoverride.rb:24:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/actionpack-3.0.9/lib/action_dispatch/middleware/params_parser.rb:21:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/actionpack-3.0.9/lib/action_dispatch/middleware/flash.rb:182:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/actionpack-3.0.9/lib/action_dispatch/middleware/session/abstract_store.rb:149:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/actionpack-3.0.9/lib/action_dispatch/middleware/cookies.rb:302:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/activerecord-3.0.9/lib/active_record/query_cache.rb:32:in `block in call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/activerecord-3.0.9/lib/active_record/connection_adapters/abstract/query_cache.rb:28:in `cache'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/activerecord-3.0.9/lib/active_record/query_cache.rb:12:in `cache'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/activerecord-3.0.9/lib/active_record/query_cache.rb:31:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/activerecord-3.0.9/lib/active_record/connection_adapters/abstract/connection_pool.rb:354:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/actionpack-3.0.9/lib/action_dispatch/middleware/callbacks.rb:46:in `block in call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/activesupport-3.0.9/lib/active_support/callbacks.rb:416:in `_run_call_callbacks'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/actionpack-3.0.9/lib/action_dispatch/middleware/callbacks.rb:44:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/rack-1.2.3/lib/rack/sendfile.rb:107:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/actionpack-3.0.9/lib/action_dispatch/middleware/remote_ip.rb:48:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/actionpack-3.0.9/lib/action_dispatch/middleware/show_exceptions.rb:47:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/railties-3.0.9/lib/rails/rack/logger.rb:13:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/rack-1.2.3/lib/rack/runtime.rb:17:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/activesupport-3.0.9/lib/active_support/cache/strategy/local_cache.rb:72:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/rack-1.2.3/lib/rack/lock.rb:11:in `block in call'
<internal:prelude>:10:in `synchronize'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/rack-1.2.3/lib/rack/lock.rb:11:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/actionpack-3.0.9/lib/action_dispatch/middleware/static.rb:30:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/actionpack-3.0.9/lib/action_dispatch/middleware/static.rb:30:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/railties-3.0.9/lib/rails/application.rb:168:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/railties-3.0.9/lib/rails/application.rb:77:in `method_missing'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/railties-3.0.9/lib/rails/rack/log_tailer.rb:14:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/rack-1.2.3/lib/rack/content_length.rb:13:in `call'
/Users/dan/.rvm/gems/ruby-1.9.2-p290/gems/rack-1.2.3/lib/rack/handler/webrick.rb:52:in `service'
/Users/dan/.rvm/rubies/ruby-1.9.2-p290/lib/ruby/1.9.1/webrick/httpserver.rb:111:in `service'
/Users/dan/.rvm/rubies/ruby-1.9.2-p290/lib/ruby/1.9.1/webrick/httpserver.rb:70:in `run'
/Users/dan/.rvm/rubies/ruby-1.9.2-p290/lib/ruby/1.9.1/webrick/server.rb:183:in `block in start_thread'
*/
body:before {
white-space: pre;
font-family: monospace;
content: "Syntax error: Invalid CSS after \"...oup Projects */\": expected selector or at-rule, was \".title {\"\A on line 5 of /Users/dan/dev/fridayhacknights/public/stylesheets/sass/projects.scss\A \A 1: @import \"base\"\A 2: \A 3: /* @group Projects */\A 4: \A 5: .title {\A 6: padding-bottom: 20px;\A 7: }\A 8: \A 9: .project.light-box {\A 10: margin: 1em 0em 1em 0em;"; }
.project.index a {
text-decoration: none;
}
.project.index .view {
-moz-border-radius: 3px;
/* FF1-3.6 */
-webkit-border-radius: 3px;
/* Saf3-4, iOS 1-3.2, Android <1.6 */
border-radius: 3px;
/* Opera 10.5, IE9, Saf5, Chrome, FF4, iOS 4, Android 2.1+ */
background: #e7d6b6;
border: 1px solid #a2928e;
border: 1px solid #372f2d;
margin: 0 10px 0 0;
padding: 4px 8px;
}
.project.index .view .icon {
float: left;
margin: 6px 3px 0 0;
}
.project.index .divider {
float: left;
height: 41px;
margin: -3px 12px 0 3px;
padding-top: 4px;
}
.project.index .description {
font-size: 0.9em;
}
.project.index .project-hackers ul.item-list li .content {
background: #f2ead8;
border: 1px solid #a2928e;
}

.project.show .website h3 {
margin-bottom: 5px;
}
.project.show .activity {
padding-left: 10px;
}
.project.show .activity .checkin {
-moz-border-radius: 3px;
/* FF1-3.6 */
-webkit-border-radius: 3px;
/* Saf3-4, iOS 1-3.2, Android <1.6 */
border-radius: 3px;
/* Opera 10.5, IE9, Saf5, Chrome, FF4, iOS 4, Android 2.1+ */
background: #f2ead8;
border: 1px solid #a2928e;
padding: 8px;
width: 45%;
float: left;
margin-bottom: 3%;
}
.project.show .activity .checkin.l-col {
margin-right: 3%;
}
.project.show .activity .description .sig {
white-space: nowrap;
}
.project.show .activity .description .name {
font-size: 0.8em;
}
.project.show .activity .description .name a {
text-decoration: none;
}
.project.show .activity .description .date {
font-size: 0.6em;
font-family: helvetica, arial, clean, sans-serif;
color: #8b7772;
}
.project.show .activity .admin {
text-align: right;
}
.project.show .activity .admin input[name=delete_checkin] {
color: #fff;
text-shadow: #333 0 1px 1px;
background: #ff3019;
background: -moz-linear-gradient(top, #ff3019 0%, #cf0404 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ff3019), color-stop(100%, #cf0404));
}
.project.show .checkin-input-wrap h3 {
margin-bottom: 5px;
}
.project.show .checkin-input-wrap label {
font-size: 0.7em;
font-family: helvetica, arial, clean, sans-serif;
}
.project.show .checkin-input-wrap textarea {
height: 50px;
width: 373px;
}
.project.show .checkin-input-wrap input[type=submit] {
margin: 0 0 0 18px;
font-size: 30px;
}
.project.show .project-hackers li {
margin-bottom: 10px;
}
.project.show > .description {
margin-left: 0;
}
.project.show > .description h3 {
color: #8b7772;
}
24 changes: 7 additions & 17 deletions public/stylesheets/sass/main.scss
Expand Up @@ -17,7 +17,7 @@ html, body {
height: 50px; /* .push must be the same height as .footer */
}

/* @group General */
/* General */

body {
background-color: $bgcolor;
Expand All @@ -44,9 +44,7 @@ h1, h2, h3, h4, h5, h6 {
}
}

/* @end */

/* @group Header */
/* Header */

.header {
}
Expand Down Expand Up @@ -104,9 +102,7 @@ h1, h2, h3, h4, h5, h6 {
width: 960px;
}

/* @end */

/* @group Contents */
/* Contents */

.contents {
-moz-box-shadow: -8px 0px 8px #000; /* FF3.5 - 3.6 */
Expand Down Expand Up @@ -148,9 +144,7 @@ h1, h2, h3, h4, h5, h6 {
margin-right: 0px;
}

/* @end */

/* @group Footer */
/* Footer */


.footer {
Expand Down Expand Up @@ -183,19 +177,15 @@ h1, h2, h3, h4, h5, h6 {
}


/* @end */

/* @group Gallery */
/* Gallery */

.gallery-img {
border: 8px solid $imgborder;
max-width: 940px;
}

/* @end */


/* @group Form */
/* Form */

.form-box {
margin: 1em auto 1em auto;
Expand All @@ -218,7 +208,7 @@ h1, h2, h3, h4, h5, h6 {
top: -5px;
}

/* @end */
/* Other */

.light-box { @include rounded; @include light-box; padding: 0 20px; }

Expand Down
5 changes: 2 additions & 3 deletions public/stylesheets/sass/projects.scss
@@ -1,6 +1,6 @@
@import "base"
@import "base";

/* @group Projects */
/* Projects */

.title {
padding-bottom: 20px;
Expand Down Expand Up @@ -98,4 +98,3 @@
}
}

/* @end */

0 comments on commit ddb71c6

Please sign in to comment.