Commit Graph
13034 Commits
Author SHA1 Message Date
Amy Hendrix 98cbac8a70 Remove an extra class on member thumbs 2014-07-14 21:18:15 -04:00
Amy Hendrix 81a996b8cc New markup for thumbnails 2014-07-14 20:50:35 -04:00
Amy Hendrix 8004632b41 Thumbnail style on individual planting page 2014-07-14 20:39:40 -04:00
Amy Hendrix 48d3488b2d B3 thumbnails for crops 2014-07-14 00:06:40 -04:00
Amy Hendrix e93d4df3c0 Responsive thumbnails for members 2014-07-14 00:02:53 -04:00
Amy Hendrix 6503b2ec7c Turn off caching in dev 2014-07-13 23:54:37 -04:00
Amy Hendrix d910b5629a Make thumbnail avatar responsive 2014-07-13 22:39:58 -04:00
Amy Hendrix 2fbd596811 Hidden class (not visible), to disable jumbotron class on home 2014-07-13 22:25:21 -04:00
Amy Hendrix 005a31c880 Use a hidden class for phones only, rather than multiple visible classes, on member block 2014-07-13 22:19:57 -04:00
Skud 0fd10643ce Merge pull request #369 from sabreuse/dev
Fix an issue with menu item layout at small screen sizes
2014-07-14 12:00:59 +10:00
Amy Hendrix 4be08e261a Merge branch 'dev' into bootstrap3 2014-07-13 21:55:43 -04:00
Amy Hendrix 10af60f30d Cleanup crops.js.erb 2014-07-13 21:46:33 -04:00
Amy Hendrix 191363402a Replace crops.js.erb 2014-07-13 21:45:19 -04:00
Amy Hendrix 0714c2a38c Menu items should be block, not inline-block, at mobile screen sizes 2014-07-13 21:30:08 -04:00
Amy Hendrix bf1821f8ce Force bootstrap overrides into sync with upstream/dev 2014-07-13 21:26:07 -04:00
Amy Hendrix c2435cfb8a catch up with upstream 2014-07-13 21:08:44 -04:00
Amy Hendrix db9ef0bc83 Full-width form elements 2014-07-13 20:28:20 -04:00
Amy Hendrix b374beae35 Tweaks for bottom navbar 2014-07-13 20:20:58 -04:00
Amy Hendrix fdd3951ed7 Green is the primary brand color 2014-07-13 20:13:44 -04:00
Amy Hendrix 84f6635679 Continue cleaning up header styling 2014-07-13 20:07:42 -04:00
Amy Hendrix 27062d2537 Button group styling for homepage plant/harvest/etc actions 2014-07-13 20:07:20 -04:00
Amy Hendrix 0263e361c5 Update footer markup to use bootstrap3 navbar classes 2014-07-13 20:06:31 -04:00
Amy Hendrix 17c822f6f3 Unitless line-height 2014-07-13 19:44:21 -04:00
Amy Hendrix 4728de5dd8 Clean up header markup for Bootstrap 3 2014-07-13 19:27:06 -04:00
Amy Hendrix 4436562dec Bootstrap3: fix vars for nav & dropdowns 2014-07-13 19:05:51 -04:00
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