Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: legworkstudio/Legwork2012
base: 731e59e2c5
...
head fork: legworkstudio/Legwork2012
compare: c17475bb9c
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 9 files changed
  • 0 commit comments
  • 1 contributor
View
1  Gemfile
@@ -2,6 +2,7 @@ source 'https://rubygems.org'
gem 'rails', '3.2.7'
gem 'thin'
+gem 'pg'
# Gems used only for assets and not required
# in production environments by default.
View
2  Gemfile.lock
@@ -68,6 +68,7 @@ GEM
mime-types (1.19)
multi_json (1.3.6)
netrc (0.7.5)
+ pg (0.14.0)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@@ -127,6 +128,7 @@ DEPENDENCIES
coffee-rails (~> 3.2.1)
heroku
jquery-rails
+ pg
rails (= 3.2.7)
sass-rails (~> 3.2.3)
thin
View
BIN  app/assets/images/desktop/footer_social.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/rails.png
Deleted file not rendered
View
5 app/assets/stylesheets/desktop.sass
@@ -6,4 +6,7 @@
@import shared/theme
// Legwork 2012 Desktop
-@import desktop/main
+@import desktop/main
+
+// Utils
+@import shared/utils
View
3  app/assets/stylesheets/desktop/main.sass
@@ -118,7 +118,6 @@ h1
width: 72px
height: 100%
margin-left: 15px
- background: url(nav-menu-titles.png) no-repeat 0px -55px
overflow: hidden
h2:after
@@ -310,7 +309,7 @@ h1
width: 12px
height: 13px
margin: 0 6px 0 0
- background: url(footer_social.png) no-repeat 0 0
+ background: asset-url("desktop/footer_social.png", image) no-repeat 0 0
#social-github
background-position: -12px 0
View
60 app/assets/stylesheets/shared/utils.sass
@@ -0,0 +1,60 @@
+.nmt
+ margin-top: 0 !important
+
+.nmr
+ margin-right: 0 !important
+
+.nmb
+ margin-bottom: 0 !important
+
+.nml
+ margin-left: 0 !important
+
+.ir
+ display: block
+ border: 0
+ text-indent: -999em
+ overflow: hidden
+ background-color: transparent
+ background-repeat: no-repeat
+ text-align: left
+ direction: ltr
+
+ br
+ display: none
+
+.hidden
+ display: none !important
+ visibility: hidden
+
+.visuallyhidden
+ border: 0
+ clip: rect(0 0 0 0)
+ height: 1px
+ margin: -1px
+ overflow: hidden
+ padding: 0
+ position: absolute
+ width: 1px
+
+.visuallyhidden.focusable:active,
+.visuallyhidden.focusable:focus
+ clip: auto
+ height: auto
+ margin: 0
+ overflow: visible
+ position: static
+ width: auto
+
+.invisible
+ visibility: hidden
+
+.cf:before,
+.cf:after
+ content: ""
+ display: table
+
+.cf:after
+ clear: both
+.cf
+ zoom: 1
View
6 app/views/desktop/index.html.erb
@@ -4,13 +4,13 @@
<header>
<nav class="cf">
<ul id="our-work" class="drop-menu">
- <li class="nav-dropper"><h2 class="ir">Our Work</h2></li>
+ <li class="nav-dropper"><h2>Our Work</h2></li>
<li class="drop-item"><a href="#">Interactive</a></li>
<li class="drop-item"><a href="#">Motion</a></li>
<li class="drop-item"><a href="#" class="last-so-round-it-out-son">Illustration</a></li>
</ul>
<ul id="our-world" class="drop-menu">
- <li class="nav-dropper"><h2 class="ir">Our World</h2></li>
+ <li class="nav-dropper"><h2>Our World</h2></li>
<li class="drop-item"><a href="#">About Us</a></li>
<li class="drop-item"><a href="#">Giveaways</a></li>
<li class="drop-item"><a href="#" class="last-so-round-it-out-son">Extracurricular</a></li>
@@ -27,7 +27,7 @@
<!-- Footer -->
<footer>
- <h2 class="ir">Contact Us</h2>
+ <h2>Contact Us</h2>
<a data-email="hello@legworkstudio.com" href="mailto:hello@legworkstudio.com" id="footer-email"></a>
<a data-phone="(303) 902-2180" href="tel:1-303-902-2180" id="footer-phone"></a>
<a data-address="40 S Broadway Ste. 201 Denver, CO 80209" href="http://g.co/maps/9f46q" id="footer-address"></a>
View
27 config/database.yml
@@ -1,25 +1,4 @@
-# SQLite version 3.x
-# gem install sqlite3
-#
-# Ensure the SQLite 3 gem is defined in your Gemfile
-# gem 'sqlite3'
development:
- adapter: sqlite3
- database: db/development.sqlite3
- pool: 5
- timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
- adapter: sqlite3
- database: db/test.sqlite3
- pool: 5
- timeout: 5000
-
-production:
- adapter: sqlite3
- database: db/production.sqlite3
- pool: 5
- timeout: 5000
+ adapter: postgresql
+ database: legwork_local
+ host: localhost

No commit comments for this range

Something went wrong with that request. Please try again.