Browse Source

Working on a bunch of new changes

development
Godwin 10 years ago
parent
commit
f28a6b3ed8
  1. 15
      Gemfile
  2. 229
      Gemfile.lock
  3. 53
      app/assets/stylesheets/application.css.scss
  4. 3
      app/assets/stylesheets/event_types.css.scss
  5. 3
      app/assets/stylesheets/events.css.scss
  6. 3
      app/assets/stylesheets/oauths.css.scss
  7. 510
      app/assets/stylesheets/sass/_base.scss
  8. 2917
      app/assets/stylesheets/sass/_froala_editor.scss
  9. 1083
      app/assets/stylesheets/sass/_layout.scss
  10. 11
      app/assets/stylesheets/sass/_mixins.scss
  11. 656
      app/assets/stylesheets/sass/_typography.scss
  12. 69
      app/assets/stylesheets/scaffolds.css.scss
  13. 3
      app/assets/stylesheets/workshop_facilitators.css.scss
  14. 3
      app/assets/stylesheets/workshop_requested_resources.css.scss
  15. 3
      app/assets/stylesheets/workshops.css.scss
  16. 3
      app/helpers/application_helper.rb
  17. 14
      app/views/layouts/application.html.haml
  18. 8
      config/application.rb

15
Gemfile

@ -10,8 +10,11 @@ gem 'coffee-rails', '~> 4.0.0'
gem 'i18n-active_record',
:git => 'git://github.com/svenfuchs/i18n-active_record.git',
:require => 'i18n/active_record'
gem 'sass-rails', '~> 4.0.0'
gem "compass-rails", "~> 1.1.3"
#gem 'sass', '~> 3.3'
#gem 'compass'
#gem 'compass-rails'
gem 'sass-rails', :git => 'git://github.com/rails/sass-rails.git'
gem 'buoy', :path => '../buoy'
gem 'foundation-rails'
gem 'uglifier', '>= 1.3.0'
gem 'sorcery', '>= 0.8.1'
@ -19,7 +22,7 @@ gem 'oauth2', '~> 0.8.0'
gem 'carrierwave'
gem 'carrierwave-imageoptimizer'
gem 'mini_magick'
gem 'carmen', :path => '../carmen/' if File.directory?('../carmen/') && RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
gem 'carmen', :git => 'git://github.com/eikes/carmen.git'
gem 'carmen-rails'
gem 'nested_form'
gem 'acts_as_list'
@ -31,7 +34,11 @@ gem 'wysiwyg-rails'
gem 'rails-assets-cdn'
gem 'sitemap_generator'
gem 'activerecord-session_store'
gem 'paypal-express'
gem 'paypal-express', '0.7.1'
gem 'sass-json-vars'
group :assets do
end
group :development, :test do
gem 'rspec'

229
Gemfile.lock

@ -1,10 +1,28 @@
GIT
remote: git://github.com/eikes/carmen.git
revision: 6d9f2f834deaf8f5b4502e71aaf40d8f4f01e8fa
specs:
carmen (1.0.1)
unicode_utils (~> 1.4.0)
GIT
remote: git://github.com/josevalim/rails-footnotes.git
revision: 087914beabb56c2e9979f63eeb0183591065dde3
revision: 5d5a43db5a898e755359343d8d981ce966c06418
specs:
rails-footnotes (4.0.2)
rails-footnotes (4.1.4)
rails (>= 3.2)
GIT
remote: git://github.com/rails/sass-rails.git
revision: df3dadffb41dba048535e88b733c802036acd520
specs:
sass-rails (5.0.0.beta1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2, >= 3.2.2)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
GIT
remote: git://github.com/svenfuchs/i18n-active_record.git
revision: 2d9a22b6a4e5d809782cdbfa65b14d9e47aa27fc
@ -12,6 +30,15 @@ GIT
i18n-active_record (0.0.2)
i18n (>= 0.5.0)
PATH
remote: ../buoy
specs:
buoy (0.0.4)
railties (>= 3.2, < 5.0)
sass-json-vars
sass-rails
useragent
GEM
remote: http://rubygems.org/
specs:
@ -43,17 +70,18 @@ GEM
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
acts_as_list (0.4.0)
acts_as_list (0.5.0)
activerecord (>= 3.0)
addressable (2.3.6)
arel (4.0.2)
attr_required (1.0.0)
awesome_print (1.2.0)
bcrypt (3.1.7)
bcrypt (3.1.7-x86-mingw32)
better_errors (1.1.0)
bcrypt (3.1.9)
bcrypt (3.1.9-x86-mingw32)
better_errors (2.0.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.1.4)
@ -64,14 +92,12 @@ GEM
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
capybara (2.4.1)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
carmen (1.0.1)
unicode_utils (~> 1.4.0)
carmen-rails (1.0.1)
carmen (~> 1.0.0)
rails
@ -83,11 +109,10 @@ GEM
carrierwave-imageoptimizer (1.2.1)
carrierwave (~> 0.8)
image_optimizer (~> 1.2)
celluloid (0.15.2)
timers (~> 1.1.0)
childprocess (0.5.3)
celluloid (0.16.0)
timers (~> 4.0.0)
childprocess (0.5.5)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.3.1)
cliver (0.3.2)
coderay (1.1.0)
coffee-rails (4.0.1)
@ -96,15 +121,8 @@ GEM
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.1)
compass (0.12.7)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
compass-rails (1.1.7)
compass (>= 0.12.2)
sprockets (<= 2.11.0)
coveralls (0.7.0)
coffee-script-source (1.8.0)
coveralls (0.7.1)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
@ -112,16 +130,16 @@ GEM
thor
crack (0.4.2)
safe_yaml (~> 1.0.0)
cucumber (1.3.15)
cucumber (1.3.17)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.1)
cucumber-rails (1.4.1)
cucumber-rails (1.4.2)
capybara (>= 1.1.2, < 3)
cucumber (>= 1.3.8, < 2)
mime-types (~> 1.16)
mime-types (>= 1.16, < 3)
nokogiri (~> 1.5)
rails (>= 3, < 5)
database_cleaner (1.3.0)
@ -129,39 +147,40 @@ GEM
diff-lcs (1.2.5)
docile (1.1.5)
erubis (2.7.0)
execjs (2.2.1)
factory_girl (4.4.0)
execjs (2.2.2)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.3)
ffi (1.9.3-x86-mingw32)
font-awesome-rails (4.1.0.0)
ffi (1.9.6)
ffi (1.9.6-x86-mingw32)
font-awesome-rails (4.2.0.0)
railties (>= 3.2, < 5.0)
forgery (0.6.0)
formatador (0.2.5)
foundation-rails (5.3.1.0)
foundation-rails (5.4.5.0)
railties (>= 3.1.0)
sass (>= 3.2.0)
fssm (0.2.10)
geocoder (1.2.3)
geocoder (1.2.6)
gherkin (2.12.2)
multi_json (~> 1.3)
gherkin (2.12.2-x86-mingw32)
multi_json (~> 1.3)
guard (2.6.1)
guard (2.10.1)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-rspec (4.2.10)
guard-compat (0.3.0)
guard-rspec (4.4.2)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
haml (4.0.5)
guard-compat (~> 0.1)
rspec (>= 2.99.0, < 4.0)
haml (4.0.6)
tilt
haml-rails (0.5.1)
actionpack (~> 4.0.0)
@ -170,20 +189,21 @@ GEM
railties (~> 4.0.0)
highline (1.6.21)
hike (1.2.3)
hitimes (1.2.2)
httpauth (0.2.1)
i18n (0.6.11)
image_optimizer (1.2.1)
jquery-rails (3.1.1)
image_optimizer (1.3.0)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.0)
jquery-ui-rails (5.0.3)
railties (>= 3.2.16)
json (1.8.1)
jwt (0.1.13)
multi_json (>= 1.5)
launchy (2.4.2)
launchy (2.4.3)
addressable (~> 2.3)
listen (2.7.9)
listen (2.8.3)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
@ -191,15 +211,14 @@ GEM
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
meta_request (0.3.3)
meta_request (0.3.4)
callsite (~> 0.0, >= 0.0.11)
rack-contrib (~> 1.1)
railties (>= 3.0.0, < 5.0.0)
method_source (0.8.2)
mime-types (1.25.1)
mini_magick (3.7.0)
subexec (~> 0.2.1)
mini_portile (0.6.0)
mini_magick (4.0.1)
mini_portile (0.6.1)
minitest (4.7.5)
multi_json (1.10.1)
multi_test (0.1.1)
@ -212,11 +231,11 @@ GEM
net-ssh (2.9.1)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
netrc (0.7.7)
nokogiri (1.6.2.1)
mini_portile (= 0.6.0)
nokogiri (1.6.2.1-x86-mingw32)
mini_portile (= 0.6.0)
netrc (0.9.0)
nokogiri (1.6.5)
mini_portile (~> 0.6.0)
nokogiri (1.6.5-x86-mingw32)
mini_portile (~> 0.6.0)
oauth (0.4.7)
oauth2 (0.8.1)
faraday (~> 0.8)
@ -224,13 +243,13 @@ GEM
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
paper_trail (3.0.5)
paper_trail (3.0.6)
activerecord (>= 3.0, < 5.0)
activesupport (>= 3.0, < 5.0)
paypal-express (0.5.5)
paypal-express (0.7.1)
activesupport (>= 2.3)
attr_required (>= 0.0.5)
restclient_with_cert
rest-client
pg (0.17.1)
pg (0.17.1-x86-mingw32)
poltergeist (1.5.1)
@ -239,17 +258,17 @@ GEM
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
polyglot (0.3.5)
pry (0.10.0)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry (0.10.0-x86-mingw32)
pry (0.10.1-x86-mingw32)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
win32console (~> 1.3)
rack (1.5.2)
rack-contrib (1.1.0)
rack-contrib (1.2.0)
rack (>= 0.9.1)
rack-test (0.6.2)
rack (>= 1.0)
@ -263,7 +282,7 @@ GEM
sprockets-rails (~> 2.0.0)
rails-assets-cdn (0.1.0)
rails
rails_12factor (0.0.2)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.2)
@ -273,7 +292,7 @@ GEM
activesupport (= 4.0.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rake (10.4.2)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
@ -284,56 +303,51 @@ GEM
ffi (~> 1.9)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
restclient_with_cert (0.0.8)
rest-client (>= 1.6)
rspec (3.0.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-core (3.0.2)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.2)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.2)
rspec-support (~> 3.0.0)
rspec-rails (3.0.1)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.2)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
rubyzip (1.1.6)
rvm-capistrano (1.5.3)
rvm-capistrano (1.5.5)
capistrano (~> 2.15.4)
safe_yaml (1.0.3)
sass (3.2.19)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
selenium-webdriver (2.42.0)
childprocess (>= 0.5.0)
safe_yaml (1.0.4)
sass (3.4.9)
sass-json-vars (0.3.2)
sass (>= 3.1)
selenium-webdriver (2.44.0)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0.4)
simplecov (0.9.0)
websocket (~> 1.0)
simplecov (0.9.1)
docile (~> 1.1.0)
multi_json
multi_json (~> 1.0)
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
sitemap_generator (5.0.4)
sitemap_generator (5.0.5)
builder
slop (3.6.0)
sorcery (0.8.6)
bcrypt (~> 3.1)
oauth (~> 0.4, >= 0.4.4)
oauth2 (>= 0.8.0, < 1.0.0)
sprockets (2.11.0)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@ -342,31 +356,32 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
subexec (0.2.3)
term-ansicolor (1.3.0)
tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
timers (1.1.0)
tins (1.3.0)
timers (4.0.1)
hitimes
tins (1.3.3)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.40)
tzinfo (0.3.42)
uglifier (2.5.3)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicode_utils (1.4.0)
useragent (0.10.0)
wdm (0.1.0)
webmock (1.18.0)
webmock (1.20.4)
addressable (>= 2.3.6)
crack (>= 0.3.2)
websocket (1.0.7)
websocket-driver (0.3.4)
websocket (1.2.1)
websocket-driver (0.4.0)
win32console (1.3.2-x86-mingw32)
wysiwyg-rails (1.1.6)
font-awesome-rails (= 4.1.0.0)
wysiwyg-rails (1.2.4)
font-awesome-rails (= 4.2.0.0)
railties (>= 3.2, < 5.0)
xpath (2.0.0)
nokogiri (~> 1.3)
@ -381,13 +396,14 @@ DEPENDENCIES
awesome_print
better_errors
binding_of_caller
buoy!
capistrano
capybara
carmen!
carmen-rails
carrierwave
carrierwave-imageoptimizer
coffee-rails (~> 4.0.0)
compass-rails (~> 1.1.3)
coveralls
cucumber-rails
database_cleaner
@ -408,7 +424,7 @@ DEPENDENCIES
nested_form
oauth2 (~> 0.8.0)
paper_trail (~> 3.0.5)
paypal-express
paypal-express (= 0.7.1)
pg
poltergeist
rails (= 4.0.0)
@ -418,7 +434,8 @@ DEPENDENCIES
rspec
rspec-rails
rvm-capistrano
sass-rails (~> 4.0.0)
sass-json-vars
sass-rails!
selenium-webdriver
simplecov
sitemap_generator

53
app/assets/stylesheets/application.css.scss

@ -1,49 +1,8 @@
/*
*
*/
//@include fontface('AlteHaasGroteskBold', '/assets/AlteHaasGroteskBold', 'alte_haas_groteskbold', ttf, normal, bold);
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
*/
//body {
// font-family: 'AlteHaasGroteskBold';
//}
@font-face {
font-family: 'FontAwesome';
src: url('/assets/fontawesome-webfont.eot');
src: url('/assets/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
url('/assets/fontawesome-webfont.woff') format('woff'),
url('/assets/fontawesome-webfont.ttf') format('truetype'),
url('/assets/fontawesome-webfont.svg#alte_haas_groteskbold') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'AlteHaasGroteskBold';
src: url('/assets/AlteHaasGroteskBold.eot');
src: url('/assets/AlteHaasGroteskBold.eot?#iefix') format('embedded-opentype'),
url('/assets/AlteHaasGroteskBold.woff') format('woff'),
url('/assets/AlteHaasGroteskBold.ttf') format('truetype'),
url('/assets/AlteHaasGroteskBold.svg#alte_haas_groteskbold') format('svg');
font-weight: bold;
font-style: normal;
}
// Libraries
@import "compass";
//@import "font-awesome";
@import "foundation_and_overrides";
// Local settings (also edit foundation_and_overrides.scss to modify global variables)
@import "sass/mixins";
@import "sass/froala_editor";
@import "sass/layout";
@import "sass/typography";
@import "sass/base";
//@include breakpoint(medium-only) {
//}

3
app/assets/stylesheets/event_types.css.scss

@ -1,3 +0,0 @@
// Place all the styles related to the event_types controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/events.css.scss

@ -1,3 +0,0 @@
// Place all the styles related to the events controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/oauths.css.scss

@ -1,3 +0,0 @@
// Place all the styles related to the Oauths controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

510
app/assets/stylesheets/sass/_base.scss

@ -1,510 +0,0 @@
table#translations {
table-layout: fixed;
padding: 0;
.key, .pages {
width: 25%;
overflow: hidden;
&:hover {
overflow: visible;
}
}
.pages {
position: relative;
ul {
font-size: 1em;
margin: 0;
list-style: none;
position: absolute;
left: 0;
top: 0;
}
a {
display: block;
}
&:hover {
ul {
z-index: 100;
}
a {
background-color: $white;
}
}
}
td.value {
position: relative;
cursor: text;
&:hover,
.translation-form {
color: $white;
background-color: $body-font-color;
}
}
.not-exists {
td.value {
font-style: italic;
color: lighten($body-font-color, 45);
}
}
.translation-form {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
z-index: 10;
padding: inherit;
textarea {
height: 100%;
font-size: inherit;
padding: 0;
color: inherit;
background-color: inherit;
}
button {
right: 100%;
position: absolute;
border-radius: 0;
top: 0;
}
}
.auto-translate {
float: right;
}
}
.grid.links {
&.inactive li > a {
opacity: 0.75;
}
li > a {
display: block;
background-color: $color-5;
color: $white;
padding: 1em;
min-height: 7em;
&.complete {
background-color: $color-2;
}
&.needs-work {
background-color: $color-4;
}
&:hover {
background-color: $color-1;
opacity: 1;
}
h3 {
color: inherit;
}
}
}
ul.tags,
.tags > ul {
display: inline;
list-style: none;
font-size: 0.9em;
margin: 0;
}
.tags {
li {
display: inline-block;
background-color: $black;
color: $white;
padding: 0 0.5em;
margin: 0.6em 0 0 0.3em;
}
h5 {
float: left;
color: lighten($body-font-color, 10);
}
}
.org-preview {
/*display: block;
position: relative;
margin: 3em 0 0;
background-color: $organization-color;
background-size: cover;
background-position: center;
/*&:before {
content: '';
display: block;
padding-top: 50%;
}*/
/*figcaption {
display: block;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
a {
display: block;
height: 100%;
}
h3 {
position: absolute;
bottom: 100%;
height: 2em;
width: 100%;
background-color: $organization-color;
margin: 0;
font-size: 1em;
padding: 0.25em 0.5em;
}
img {
background-color: $white;
margin: auto;
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
}*/
}
.preview-list {
li {
position: relative;
margin-bottom: 1em;
&:before {
content: '';
display: block;
padding-top: 50%;
}
h4, h5 {
position: absolute;
top: 0;
min-height: 2em;
margin: 0;
font-size: 1em;
padding: 0.25em 0.5em;
color: $white;
//width: 100%;
z-index: 1;
left: 0;//.6667em;
right: 0;//.6667em;
}
h5 {
left: 0.6667em;
right: 0.6667em;
}
figure {
position: absolute;
//width: 100%;
height: 100%;
left: 0.6667em;
right: 0.6667em;
margin: 0;
bottom: 0;
text-align: center;
background-size: cover;
background-position: center;
background-blend-mode: luminosity;
@include single-transition(all, 100ms, ease-in);
&:after {
content: '';
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
background-color: $white;
opacity: 0.5;
@include single-transition(all, 100ms, ease-in);
}
img {
margin: auto;
position: absolute;
left: 0;
right: 0;
top: 2em;
bottom: 0;
max-width: 90%;
max-height: 66.667%;
z-index: 1;
-webkit-transform: translate3d(0,0,0);
}
}
a {
&:hover {
figure {
background-color: transparent;
&:after {
opacity: 0.25;
}
}
}
}
&.city figure {
background-color: rgba($primary-color, 0.75);
&:after {
display: none;
}
}
}
&.org-list li {
h4 {
background-color: $primary-color;
}
h5 {
background-color: $organization-color;
}
figure {
background-color: $organization-color;
}
}
&.conference-list li {
h4 {
background-color: $secondary-color;
}
h5 {
background-color: $conference-color;
}
figure {
background-color: $conference-color;
}
}
li.city figure {
background-color: rgba($primary-color, 0.75);
&:after {
display: none;
}
}
@include breakpoint(medium) {
margin-left: 3em;
aside & {
margin-left: 0;
}
}
}
.org-mini-preview {
position: relative;
overflow: auto;
margin: 0;
background-color: $gray;
border: 0.25em solid lighten($black, 33);
&.portrait {
img {
float: left;
max-width: 50%;
}
figcaption {
float: right;
max-width: 50%;
}
}
p {
font-size: 0.9em;
line-height: 1.25em;
}
figcaption {
padding: 0.25em
}
}
.org-list-select {
&.chosen {
display: none;
}
ul {
list-style: none;
margin: 0;
overflow: auto;
height: 25em;
border: 0.25em solid $gray;
}
li {
background-color: lighten($gray, 5);//rgba(225, 225, 225, 0.5);
margin: 0.25em;
&:hover {
background-color: lighten($color-4, 25);//desaturate(lighten($organization-color, 33), 33);
}
&.removable:hover {
background-color: desaturate(lighten($color-3, 16), 16);
}
&.selected {
background-color: desaturate(lighten($organization-color, 33), 33);
}
&.not-found {
display: none;
}
}
figure {
margin: 0;
padding: 0.25em;
overflow: auto;
}
img {
float: left;
margin-right: 1em;
}
h6 {
margin: 0;
}
p {
font-size: 0.8em;
margin: 0;
}
figcaption {
overflow: auto;
}
@include breakpoint(medium) {
&.chosen {
display: block;
}
&.choose {
li.selected {
display: none;
}
}
}
}
#org-filter {
width: 100%;
font-size: 1.25em;
padding: 0.333em;
border: 3px solid $gray;
margin-top: 0.5em;
outline: none !important;
}
#register-dlg {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background-color: transparent;
visibility: hidden;
z-index: 100;
@include text-shadow(none);
@include transition(background-color 250ms ease-in-out 125ms, visibility 0 linear 250ms);
form {
position: fixed;
min-width: 30em;
left: 110%;
right: 0;
max-width: 30em;
bottom: 0;
margin: auto;
top: 0;
background-color: $white;
height: 10em;
padding: 1em;
z-index: 101;
@include transform(skewX(-30deg));
@include transition(all 250ms ease-in-out 0);
}
&.open {
background-color: rgba($primary-color, 0.8);
visibility: visible;
@include transition(background-color 250ms ease-in-out);
form {
left: 0;
@include transform(skewX(0));
@include transition(all 250ms ease-in-out 125ms);
}
}
}
@include breakpoint(medium) {
.organizations-index,
.conferences-index {
#content {
h2 {
margin-top: 1em;
}
h3 {
margin-left: 1em;
}
}
}
}
.workshop {
list-style: none;
overflow: auto;
&:target {
background-color: $color-5;
}
}
.registrations .user {
vertical-align: top;
&:target {
background-color: $color-5;
}
}

2917
app/assets/stylesheets/sass/_froala_editor.scss

File diff suppressed because it is too large

1083
app/assets/stylesheets/sass/_layout.scss

File diff suppressed because it is too large

11
app/assets/stylesheets/sass/_mixins.scss

@ -1,11 +0,0 @@
@mixin breakpoint($query) {
@if $query == small {
@media #{$small-only} { @content; }
} @else if $query == medium {
@media #{$medium-up} { @content; }
} @else if $query == large {
@media #{$large-up} { @content; }
} @else {
@media #{$query} { @content; }
}
}

656
app/assets/stylesheets/sass/_typography.scss

@ -1,656 +0,0 @@
/**
Basic theme rules, html native elements only
*/
//$translate-me-bgcolor: rgba(255, 0, 0, 0.25) !default;
//$translate-me-outline-color: rgba(255, 0, 0, 0.5) !default;
.button, button, input[type="file"] {
/*background-color: rgba($white, 0.5);
color: $primary-color;
border: 1px solid;
padding: 0.75em 1.5em;
text-transform: uppercase;
text-shadow: none;
&:hover {
color: #FFF;
}*/
background-color: $primary-color;
color: $white;
font-weight: bold;
//font-family: $header-font-family;
font-size: 1.333em;
border: 0.15em solid transparent;
padding: 0.5em 1em;
vertical-align: middle;
&.organization, &.secondary, &.best {
background-color: $organization-color;
}
&.article, &.good {
background-color: $article-color;
}
&.better {
background-color: darken($warning-color, 2);
}
&:hover {
color: $primary-color;
border: 0.15em solid;
background-color: transparent;
&.organization, &.secondary, &.best {
color: $organization-color;
}
&.better {
color: darken($warning-color, 2);
}
&.article, &.good {
color: $article-color;
}
}
&[id*="previous"],
&.less,
&.arrow-l {
&:before {
content: '\f053';
font-family: $icons;
vertical-align: middle;
margin-right: 0.25em;
}
}
&[id*="next"],
&.more,
&.arrow-r {
&:after {
content: '\f054';
font-family: $icons;
vertical-align: middle;
margin-left: 0.25em;
}
}
}
input[type="file"] {
display: none;/*inline-block;
width: auto;
text-align: center;
-webkit-appearance: none;
background-color: #FFF;
border-radius: 1.5em;
padding: 0.6em 0;
cursor: pointer;
font-family: $button-font-family;
outline: none;
&:hover {
background-color: $primary-color;
}
&::-webkit-file-upload-button {
visibility: none;
opacity: 0;
width: 0;
}*/
}
input[type="date"] {
&:invalid {
color: #CCC;
}
}
h2 {
line-height: 1em;
margin-bottom: 0.5em;
}
select {
border: 1px solid #CCC;
border-radius: 0.2em;
font-size: 1.25em;
font-family: $body-font-family;
color: rgba($black, 0.75);
padding: 0 0.5em;
height: 2em;
box-shadow: 0 2px #CCC;
outline: 0;
background-color: #FFF;
&.small {
font-size: 0.8em;
margin: 0 0 0.25em;
box-shadow: none;
}
}
fieldset {
background-color: #FFF;
legend {
margin-left: -2em;
font-family: $header-font-family;
}
}
.field {
margin-bottom: 1em;
position: relative;
//border: 1px solid #CCC;
//border-radius: 1.25em 0 0 1.25em;
//overflow: hidden;
label {
//float: left;
font-family: $header-font-family;
line-height: 2.5em;
//margin-right: 1em;
//background-color: rgba(#FFF, 0.2);
//color: $white;
display: inline-block;
position: absolute;
top: 100%;
margin: -1.333em 1.75em 0;
span {
padding: 0 1em;
font-size: 0.9em;
}
}
div {
//border: 1px solid #EEE;
//border-width: 1px 0 0 1px;
}
input, select, button {
//margin: 0;
height: auto;
line-height: 1em;
padding: 0.333em 0.5em;
}
input:not([type="file"]) {
border-bottom: 1px dashed #CCC;
line-height: 1.25em;
}
textarea {
border: 1px dashed #CCC;
height: 10em;
font-size: 1.25em;
}
&.text-area-field {
label {
/*top: 1px;
right: 1px;
bottom: 1px;
left: 1px;
display: block;
width: 100%;
height: 100%;
margin: 0;
padding: 0;
background-color: rgba(255, 255, 255, 0.5);
text-align: center;
width: calc(100% - 2px);
height: calc(100% - 2px);*/
position: static;
background-color: #252528;
margin-top: 1em;
span {
background-color: inherit;
color: $white;
/*position: relative;
top: 50%;
text-align: center;
font-size: 1.25em;
font-weight: 600;
margin: -1em 0 0;
padding: 0 0.5em;
display: inline-block;
border-radius: 0.5em;
box-shadow: 0 0 1em;*/
}
}
.froala-element {
min-height: 10em;
}
textarea:focus + label {
display: none;
}
.medium-8 > & {
font-size: 0.75em;
}
}
input, select, button, label span {
background-color: $white;
color: #333;
}
&.field-slug {
position: absolute;
top: 100%;
right: 0;
left: 50%;
margin-top: -0.875em;
margin-right: 0.9em;
margin-left: 10em;
z-index: 1;
input {
font-size: 1em;
padding-bottom: 0;
background-color: $gray;
}
label {
margin-top: -3em;
right: 100%;
margin-right: 0;
}
}
&.image-field {
label {
position: relative;
margin: 0;
border-bottom: 1px dotted #CCC;
padding-bottom: 1.3em;
text-align: center;
> span {
position: absolute;
background-color: transparent;
left: 0;
right: 0;
}
&:hover {
img {
@include opacity(0.75);
}
}
}
}
&.check-box-field {
margin-bottom: 0;
div {
float: left;
font-size: 1.75em;
//display: none;
/*input {
-webkit-appearance: none;
}
&:before {
content: '';
width: 1em;
height: 1em;
display: inline-block;
border: 1px solid #CCC;
line-height: 0.75em;
text-align: center;
font-size: 1.6667em;
border-radius: 0.2em;
box-shadow: 0 1.9px #CCC;
content: '';
}*/
}
input {
margin: 0;
}
label {
position: relative;
margin: 0;
display: inline-block;
line-height: 1.6em;
span {
display: inline-block;
vertical-align: text-top;
}
}
}
&.select {
overflow: auto;
label {
position: static;
margin: 0;
float: left;
& + div {
float: left;
}
}
}
&.user-select-field,
&.organization-select-field {
display: inline-block;
position: relative;
border: 1px solid #CCC;
padding: 0.25em;
margin: 1em 1em 0;
border-radius: 0.25em;
float: left;
box-shadow: 0 2px #CCC;
overflow: hidden;
label {
display: block;
position: relative;
margin: 0 auto;
}
input[type="checkbox"] {
position: absolute;
-webkit-appearance: none;
-moz-appearance: none;
-ms-appearance: none;
-o-appearance: none;
appearance: none;
width: 100%;
width: calc(100% - 0.6em);
height: 9em;
border: 0;
background-color: transparent;
cursor: pointer;
outline: none;
+ label {
display: none;
width: 100%;
width: calc(100% - 0.06em);
height: 0.94em;
font-size: 8em;
position: absolute;
top: 0.03em;
left: 0.03em;
color: $white;
line-height: 0.75em;
text-align: center;
text-shadow: 0 2px 0px $black;
}
&:checked {
+ label {
background-color: rgba($warning-color, 0.5);
display: block;
text-shadow: 0 2px 0px $warning-color;
}
}
&:hover {
+ label {
display: block;
color: $warning-color;
}
}
}
&.new {
input[type="checkbox"],
input[type="checkbox"] + label {
display: none;
}
}
img {
display: block;
}
.select-user,
.select-organization {
margin-bottom: 0.5em;
display: block;
}
.remove-item {
position: absolute;
top: 0;
right: 0;
&:before {
content: '';
height: 0;
width: 0;
border-width: 0 2.5em 2.5em 0;
border-color: transparent $black;
border-style: solid;
position: absolute;
right: 0;
top: 0;
}
&:after {
content: '×';
color: $white;
position: absolute;
right: 0;
top: 0;
width: 1.5em;
height: 1.25em;
text-align: center;
line-height: 1.25em;
}
}
}
}
form > div:first-child + .columns:not([class*="medium-"]) {
margin-top: 1em;
margin-bottom: 3em;
> .field:first-child {
text-align: center;
label {
//margin-left: 0;
//margin-right: 0;
left: 0;
right: 0;
}
input {
font-size: 3em;
text-align: center;
}
}
//+ .columns[class*="medium-"] {//+ .columns[class*="medium-"] {
//padding-top: 1em;
//}
}
.actions {
text-align: center;
padding-top: 1em;
}
:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
font-style: italic;
color: rgba(0, 0, 0, 0.25);
}
::-moz-placeholder { /* Mozilla Firefox 19+ */
font-style: italic;
color: rgba(0, 0, 0, 0.25);
}
:-ms-input-placeholder { /* Internet Explorer 10+ */
font-style: italic;
color: rgba(0, 0, 0, 0.25);
}
::-webkit-input-placeholder {
font-style: italic;
color: rgba(0, 0, 0, 0.25);
}
input:-webkit-autofill {
-webkit-box-shadow:0 0 0 5em $input-bg-color inset; /* Change the color to your own background color */
-webkit-text-fill-color: $input-font-color;
&:focus {
-webkit-box-shadow: 0 0 0 2em $input-focus-bg-color inset; /* Change the color to your own background color */
}
}
.tabs {
display: inline-block;
border: 1px solid #CCC;
margin: 1em 0;
box-shadow: 0 0.1em 0 #CCC;
border-radius: 0.25em;
overflow: hidden;
font-family: $header-font-family;
.tab {
border-right: 1px solid #CCC;
display: inline-block;
//padding: 0.25em 1em 0.3333em 0.75em;
padding: 0.5em 1.5em 0.5em 1.25em;
background-color: #FFF;
color: $black;
float: left;
&.current {
background-color: #EEE;
background-color: #EEE;
}
&:hover {
background-color: #DDD;
color: $black;
}
&:last-child {
border: 0;
}
}
}
.sub-tabs {
background-color: #E1E1E1;
padding: 1em;
margin-bottom: 2em;
a {
display: block;
position: relative;
padding: 1em;
margin: 1px 0;
height: 3.1em;
font-size: 1.1em;
font-family: $header-font-family;
color: $white;
background-color: $black;
text-transform: uppercase;
&.current {
background-color: $primary-color;
&:after {
content: '';
position: absolute;
top: 0;
left: 100%;
width: 0;
height: 0;
border: 1.55em solid $primary-color;
border-color: transparent transparent transparent $primary-color;
border-width: 1.55em 0 1.55em 1.55em;
}
}
}
}
svg {
height: 0%;
}
#footer {
color: $white;
padding: 2.5em 0;
font-size: 1.25em;
a {
margin: 0 1em;
}
a, a:visited {
color: $white;
}
a:hover {
color: rgba($white, 0.5);
}
}
article {
p {
font-size: 1.4rem;
}
}
.error {
position: relative;
padding: 0.5em 1em;
background-color: $warning-color;
&:before {
content: '!';
position: absolute;
font-family: $header-font-family;
background-color: $alert-color;
color: $white;
font-size: 2em;
line-height: 1em;
width: 1em;
text-align: center;
border-radius: 50%;
right: -0.333em;
top: -0.333em;
}
}
p.help {
font-size: 1.1em;
}
.small-form {
> .field {
display: inline-block;
vertical-align: baseline;
width: 10em;
input {
text-align: right;
}
label {
display: none;
}
}
.actions {
display: inline-block;
vertical-align: middle;
}
}

69
app/assets/stylesheets/scaffolds.css.scss

@ -1,69 +0,0 @@
body {
background-color: #fff;
color: #333;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
line-height: 18px;
}
p, ol, ul, td {
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
line-height: 18px;
}
pre {
background-color: #eee;
padding: 10px;
font-size: 11px;
}
a {
color: #000;
&:visited {
color: #666;
}
&:hover {
color: #fff;
background-color: #000;
}
}
div {
&.field, &.actions {
margin-bottom: 10px;
}
}
#notice {
color: green;
}
.field_with_errors {
padding: 2px;
background-color: red;
display: table;
}
#error_explanation {
width: 450px;
border: 2px solid red;
padding: 7px;
padding-bottom: 0;
margin-bottom: 20px;
background-color: #f0f0f0;
h2 {
text-align: left;
font-weight: bold;
padding: 5px 5px 5px 15px;
font-size: 12px;
margin: -7px;
margin-bottom: 0px;
background-color: #c00;
color: #fff;
}
ul li {
font-size: 12px;
list-style: square;
}
}

3
app/assets/stylesheets/workshop_facilitators.css.scss

@ -1,3 +0,0 @@
// Place all the styles related to the workshop_facilitators controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/workshop_requested_resources.css.scss

@ -1,3 +0,0 @@
// Place all the styles related to the workshop_requested_resources controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/workshops.css.scss

@ -1,3 +0,0 @@
// Place all the styles related to the workshops controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/helpers/application_helper.rb

@ -572,6 +572,9 @@ module ApplicationHelper
YAML.load(File.read(Rails.root.join("config/#{name.to_s}.yml")))[Rails.env].symbolize_keys
end
def buoy_stylesheet
end
private
def _form_field(type, name, value, options)
if type == 'check_box'

14
app/views/layouts/application.html.haml

@ -8,7 +8,11 @@
= csrf_meta_tags
/[if lt IE 9]
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
= stylesheet_link_tag '//fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic', 'application', media: 'all'
= stylesheet_link_tag '//fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic', media: 'all'
=# stylesheet_link_tag 'application', media: 'all'
= inject_css!
=#:javascript
=# !function(){function e(e,n){try{if(localStorage[e])t(e);else{var a=new XMLHttpRequest;a.open("GET",n,!0),a.onload=function(){a.status>=200&&a.status<400&&(localStorage[e]=a.responseText,t())},a.send()}}catch(o){}}function t(e){var t=document.createElement("style");t.rel="stylesheet",document.head.appendChild(t),t.textContent=localStorage[e]}e("AlteHaasGroteskBold","/assets/AlteHaasGroteskBold")}();
%link{ href: asset_path('favicon.ico'), rel: 'shortcut icon', type: 'image/x-icon' }
%link{ href: asset_path('favicon.ico'), rel: 'icon', type: 'image/x-icon' }
%link{ href: asset_path('apple-touch-icon.png'), rel: 'apple-touch-icon' }
@ -16,9 +20,6 @@
%link{ href: asset_path('apple-touch-icon-114x114.png'), rel: 'apple-touch-icon', sizes: '114x114' }
%link{ href: asset_path('apple-touch-icon-144x144.png'), rel: 'apple-touch-icon', sizes: '144x144' }
= yield :head
=# javascript_include_tag '//use.typekit.net/iqv7hcg.js'
=# javascript_include_tag 'application'
=# javascript_include_tag 'nested_form'
%body{ class: (yield_or_default :page_style) }
:javascript
@ -49,6 +50,11 @@
#content=yield
- else
= yield
.row
.columns.medium-8
here is something to look at
.columns.medium-4
here is another thing
= yield :garbage
#footer
%footer

8
config/application.rb

@ -24,14 +24,8 @@ module BikeBike
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
config.i18n.default_locale = :en #:de
config.i18n.default_locale = :en
config.i18n.enforce_available_locales = false
self.paths['config/database'] = Rails.root.parent.join('BikeBike', 'config', 'database.yml')
# config.action_controller.default_url_options = { :trailing_slash => true }
#config.middleware.swap 'Rack::MethodOverride', 'Rack::MethodOverrideWithParams'
#config.i18n.exception_handler = I18n::MissingTranslationExceptionHandler.new
#require '/app/helpers/bike_bike_form_helper'
#ActionView::Base.default_form_builder
#config.action_view.default_form_builder = 'BikeBikeFormHelper::BikeBikeFormBuilder'
end
end

Loading…
Cancel
Save