Amy Hendrix
155d68bab1
Bootstrap3: inline lists
2014-07-13 18:46:08 -04:00
Amy Hendrix
b7fbe60b83
Bootstrap3: form control groups
2014-07-13 18:45:56 -04:00
Amy Hendrix
76f2d003c5
visible and hidden elements to bootstrap3
2014-07-13 18:37:33 -04:00
Amy Hendrix
0d7fbc9b76
update button class to bootstrap3
2014-07-13 18:33:19 -04:00
Amy Hendrix
6ec7b8f897
Jumbotron classes to bootstrap3
2014-07-13 18:27:48 -04:00
Amy Hendrix
bf217b1618
correct navbar-btn
2014-07-13 18:25:02 -04:00
Amy Hendrix
bb458c17e8
another navbar-collapse instance
2014-07-13 18:23:53 -04:00
Amy Hendrix
6cb89d1c75
correct navbar-nav class in header
2014-07-13 18:22:01 -04:00
Amy Hendrix
e9b3c33022
Navbar centering style for bootstrap3
2014-07-13 18:21:04 -04:00
Amy Hendrix
d7145b327f
Update .brand to bootstrap3
2014-07-13 18:19:22 -04:00
Amy Hendrix
f0cd8df6e0
Update column classes
2014-07-13 18:16:57 -04:00
Amy Hendrix
8d0d01991b
Bootstrap3 update: row classes
2014-07-13 15:15:08 -04:00
Amy Hendrix
df9169c13d
Get stylesheet includes working
2014-07-13 15:11:59 -04:00
Amy Hendrix
088cd36d6f
Update variable names to bootstrap 3 versions
2014-07-13 15:11:35 -04:00
Amy Hendrix
e226ce406c
Rename bootstrap_and_overrides file
2014-07-13 15:11:21 -04:00
Amy Hendrix
bc38359219
Didn't need to specify including custom bootstrap - require_tree takes care of it
2014-07-13 14:23:35 -04:00
Amy Hendrix
471ecbc458
Require the new custom bootstrap the main stylesheet
2014-07-13 14:15:27 -04:00
Amy Hendrix
9a09d8a0ae
Switch from twitter-bootstrap-rails gem to less-rails-bootstrap
2014-07-13 14:12:36 -04:00
Taylor Griffin
ded464ad4c
removed call to for debugging
2014-07-13 18:00:46 +10:00
Taylor Griffin
8b45a1759c
got scientific names working on the crop page but view tests are failing
2014-07-13 17:57:55 +10:00
Amy Hendrix
21d5156137
Merge branch 'master' of https://github.com/Growstuff/growstuff into dev
2014-07-10 19:43:47 -04:00
Skud
8ee1499a07
Merge pull request #367 from Skud/new-contributors
...
added a few recent contributors
2014-07-10 10:53:17 +10:00
Skud
0558d854af
added a few recent contributors
2014-07-10 10:52:20 +10:00
Joseph Caudle
c89e1ec096
Merge pull request #365 from Skud/case-insensitive-search
...
Case insensitive search
2014-07-08 16:22:37 -04:00
Joseph Caudle
95130bda67
Merge pull request #366 from Skud/wrangler-rake-task
...
Added rake task to add new crop wranglers
2014-07-08 16:20:40 -04:00
Skud
e560258b39
install pg in all environments
2014-07-06 21:40:10 +10:00
Skud
60b407986d
One more try to get travis working with postgres
2014-07-06 21:34:23 +10:00
Skud
cf41a9b866
don't install production gems in test
2014-07-06 21:30:20 +10:00
Skud
c2f7cf08ca
trying to revert to the simplest travis config
2014-07-06 21:25:12 +10:00
Skud
7d624fd9ca
Attempting to get scientific name editing on one page (doesn't work yet)
2014-07-06 21:21:51 +10:00
Skud
0718b5818a
looks like we needed that postgres creation line after all
2014-07-06 20:52:42 +10:00
Skud
5744499182
Added rake task to add new crop wranglers
...
Also changed code for admin and crop wrangler to assume we already have
those roles set up, as they're part of db/seeds.rb
2014-07-06 20:37:54 +10:00
Skud
0174202ef0
Remove travis environment
...
We had this special environment because we wanted travis to be different
to our test environment -- specifically, to use postgres, while we used
sqlite in dev/test. We now use postgres in dev/test so this is no
longer necessary.
2014-07-06 20:27:35 +10:00
Skud
77d2b0e950
make crop search case insensitive
2014-07-06 20:16:59 +10:00
Skud
8897e5149d
switch to using postgres in dev and test
2014-07-06 20:14:12 +10:00
Skud
dd381378f1
Merge pull request #364 from Skud/crop-map3
...
Finally got crop maps AND community map working
2014-07-04 11:42:17 +10:00
Skud
34c45c8935
Fixed bug with specific place map
...
(it was still referring to div#map not #placesmap)
also changed the headings a bit on that page
2014-07-04 11:17:04 +10:00
Skud
99c473ab40
Changed headings on places maps to match new menu ('Community map')
2014-07-04 11:13:35 +10:00
Skud
0dac36df74
fixed tests to pass with new map div ids
2014-07-04 11:08:13 +10:00
Skud
828e9d318a
check that map exists on page before drawing it
2014-07-04 11:02:23 +10:00
Skud
890a21ddb2
small refactoring to clean up js
2014-07-04 10:49:52 +10:00
Skud
c8dbdbe298
Rename map on /places to #placesmap
...
The way the javascript is compiled means it's a good idea to make sure
everything is as distinct as possible.
2014-07-04 10:47:50 +10:00
Skud
9f1a7aad63
Merge pull request #363 from Skud/crop-map2
...
fixed error with crop map on staging
2014-07-04 10:39:34 +10:00
Skud
f28ddaded1
renamed div#map to #cropmap on crop page
...
this prevents confusion when assets are compiled (i.e. it worked in dev
but not on staging; this fixes the problem.)
2014-07-04 10:38:37 +10:00
pozorvlak
ec9bd2bd7b
Merge pull request #361 from Skud/crop-map
...
Crop map
2014-07-03 10:44:01 +01:00
Skud
67dae650bc
Merge pull request #362 from Skud/navbar-visual-tweaks
...
Navbar visual tweaks
2014-07-02 07:33:17 +12:00
Amelia Greenhall
a5e4b0816c
fix centering on top nav
2014-07-02 07:16:22 +12:00
Amelia Greenhall
adb275737f
update the navbar and footer to more modern design and colors
2014-07-02 07:16:22 +12:00
Amelia Greenhall
c489c6ac70
remove 1px wide black line on borders
2014-07-02 07:16:22 +12:00
Skud
fea7da3546
rearranged crop page headings and added tests
2014-06-30 12:14:06 -07:00
