glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:Connoropolous/metamaps_gen002

Browse source
This commit is contained in:
Connor Turland 2012-11-03 11:54:33 -04:00
commit 6acbdf13c1
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/background2-for-repeating.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 46 KiB

2
app/assets/stylesheets/application.css
View file

@ -23,7 +23,7 @@ img {border:0; padding:0; margin:0; display:block; text-indent:-9999px;}
html, body, .main, .wrapper, #container { height: 100%; } html, body, .main, .wrapper, #container { height: 100%; }
html { } html { }
body { background:#031924 url(background2.jpg) repeat 0 0; font-family: 'katarine-web', sans-serif; background-attachment:fixed; color:#FFF; } body { background:#031924 url(background2-for-repeating.jpg) repeat 0 0; font-family: 'katarine-web', sans-serif; background-attachment:fixed; color:#FFF; }
h1,h2,h3,h4,h5,h6 { font-weight:normal; } h1,h2,h3,h4,h5,h6 { font-weight:normal; }
h1 {display:block; text-align:left; font-family: "vinyl",sans-serif; } h1 {display:block; text-align:left; font-family: "vinyl",sans-serif; }

BIN
config/.database.yml.swp Normal file
View file

Binary file not shown.

34
config/database.yml
View file

@ -1,32 +1,32 @@
development: development:
min_messages: WARNING
adapter: postgresql
host: ec2-54-243-188-58.compute-1.amazonaws.com
port: 5442
encoding: unicode
database: da81fvorvn5pp9
pool: 5
username: yolhqgtlivenrk
password: "oi_EAZwbXboYjqB_9tWPh2x5YS"
test:
min_messages: WARNING min_messages: WARNING
adapter: postgresql adapter: postgresql
host: 127.0.0.1 host: 127.0.0.1
port: 5432 port: 5432
encoding: unicode encoding: unicode
database: metamap002_test database: metamap002_development
pool: 5 pool: 5
username: postgres username: postgres
password: "3112" password: "3112"
test:
min_messages: WARNING
adapter: postgresql
host: ec2-107-21-107-194.compute-1.amazonaws.com
port: 5432
encoding: unicode
database: ddcrn2lgphjk9k
pool: 5
username: qqpckkahytovwv
password: "njeP6cMA8EjM9ukHk9s3ReOdy7"
production: production:
min_messages: WARNING min_messages: WARNING
adapter: postgresql adapter: postgresql
host: ec2-54-243-188-58.compute-1.amazonaws.com host: ec2-107-21-107-194.compute-1.amazonaws.com
port: 5442 port: 5432
encoding: unicode encoding: unicode
database: da81fvorvn5pp9 database: ddcrn2lgphjk9k
pool: 5 pool: 5
username: yolhqgtlivenrk username: qqpckkahytovwv
password: "oi_EAZwbXboYjqB_9tWPh2x5YS" password: "njeP6cMA8EjM9ukHk9s3ReOdy7"