From 9e9d945c3d818bfe6ccb316d66efa9bac23b43f3 Mon Sep 17 00:00:00 2001 From: Rory Aronson Date: Mon, 2 Mar 2015 18:58:42 -0800 Subject: [PATCH 1/5] make life stage icons circular, and new guide nav horizontally scroll --- .../components/_guide_creation_nav.css.scss | 7 +++++- .../guides/components/_step_2.css.scss | 23 +++++++++++++++++-- .../guides/new/_new_guide_step_2.html.erb | 22 ++++++++++-------- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/styles/components/guides/components/_guide_creation_nav.css.scss b/app/assets/stylesheets/styles/components/guides/components/_guide_creation_nav.css.scss index 31f2bf9f8..bb759b637 100644 --- a/app/assets/stylesheets/styles/components/guides/components/_guide_creation_nav.css.scss +++ b/app/assets/stylesheets/styles/components/guides/components/_guide_creation_nav.css.scss @@ -1,12 +1,17 @@ .guide-creation-nav { $guide-nav-color: #5E9546; background: $guide-nav-color; + overflow-x: auto; + overflow-y: hidden; // the ul containing the links ul { + list-style: none; + margin-left: 0px; padding-top: 5px; + padding-left: 0px; + padding-right: 0px; text-align: center; - list-style: none; white-space: nowrap; } diff --git a/app/assets/stylesheets/styles/components/guides/components/_step_2.css.scss b/app/assets/stylesheets/styles/components/guides/components/_step_2.css.scss index f611392ec..4ae6f638a 100644 --- a/app/assets/stylesheets/styles/components/guides/components/_step_2.css.scss +++ b/app/assets/stylesheets/styles/components/guides/components/_step_2.css.scss @@ -1,10 +1,28 @@ /* Step 2 */ .life-stages { + .all-stages-wrapper { + margin-left: auto; + margin-right: auto; + @media #{$small-only} { + width: 360px; + } + @media #{$medium-only} { + width: 540px; + } + @media #{$large-only} { + width: 720px; + } + @media #{$xlarge-up} { + width: 900px; + } + } + .stage-wrapper { display: inline-block; - overflow: hidden; - height: 142px; + height: 150px; margin-bottom: 3%; + overflow: hidden; + width: 180px; } input[type="checkbox"] { @@ -17,6 +35,7 @@ padding: .25rem; box-shadow: 0px 1px 1px rgba(0, 0, 0, .2); border: solid 1px #DFDFDF; + border-radius: 150px; width: 100%; height: 100%; transition: border .2s; diff --git a/app/views/guides/new/_new_guide_step_2.html.erb b/app/views/guides/new/_new_guide_step_2.html.erb index 5b07b59e3..eed582784 100644 --- a/app/views/guides/new/_new_guide_step_2.html.erb +++ b/app/views/guides/new/_new_guide_step_2.html.erb @@ -7,16 +7,18 @@
-
- - +
+
+ + +
From 2116235f03dd8ca4d6dbd3116be47ed1b3465eda Mon Sep 17 00:00:00 2001 From: Rory Aronson Date: Mon, 2 Mar 2015 19:02:39 -0800 Subject: [PATCH 2/5] Hounding and fix stuff --- .../guides/components/_guide_creation_nav.css.scss | 6 +++--- .../styles/components/guides/components/_step_2.css.scss | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/styles/components/guides/components/_guide_creation_nav.css.scss b/app/assets/stylesheets/styles/components/guides/components/_guide_creation_nav.css.scss index bb759b637..a8c30b9ba 100644 --- a/app/assets/stylesheets/styles/components/guides/components/_guide_creation_nav.css.scss +++ b/app/assets/stylesheets/styles/components/guides/components/_guide_creation_nav.css.scss @@ -7,10 +7,10 @@ // the ul containing the links ul { list-style: none; - margin-left: 0px; + margin-left: 0; padding-top: 5px; - padding-left: 0px; - padding-right: 0px; + padding-left: 0; + padding-right: 0; text-align: center; white-space: nowrap; } diff --git a/app/assets/stylesheets/styles/components/guides/components/_step_2.css.scss b/app/assets/stylesheets/styles/components/guides/components/_step_2.css.scss index 4ae6f638a..23a332166 100644 --- a/app/assets/stylesheets/styles/components/guides/components/_step_2.css.scss +++ b/app/assets/stylesheets/styles/components/guides/components/_step_2.css.scss @@ -31,7 +31,6 @@ .stage-option { display: block; - border-radius: 4px; padding: .25rem; box-shadow: 0px 1px 1px rgba(0, 0, 0, .2); border: solid 1px #DFDFDF; From 6701b57581cf5efcce46fef2496532ad99e7a4f0 Mon Sep 17 00:00:00 2001 From: Rory Aronson Date: Mon, 2 Mar 2015 19:05:31 -0800 Subject: [PATCH 3/5] And add the Slack google form to the readme! --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f92ad6045..fb6182839 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Other use cases: a mobile app for home gardeners, Google providing "One Box" ans ### Core Contributor Group -We use [Slack](https://openfarm.slack.com/) for real-time discussion and mockup sharing among the core team. We strongly recommend joining this group if you want to get involved and meet the other contributors. All you have to do is [email Rory](mailto:rory@openfarm.cc) with your email address and he'll send you an invitation to join! +We use [Slack](https://openfarm.slack.com/) for real-time discussion and mockup sharing among the core team. We strongly recommend joining this group if you want to get involved and meet the other contributors. All you have to do is enter your email into [this form](http://goo.gl/forms/ZqBdmN2nu2) or [email Rory](mailto:rory@openfarm.cc) with your email address and he'll send you an invitation to join! ### Community Discussion Group From 4d1834586df408ba8725e72ad67f42cb5f9b998a Mon Sep 17 00:00:00 2001 From: Rory Aronson Date: Mon, 2 Mar 2015 23:03:29 -0800 Subject: [PATCH 4/5] added all soil types from the soil pyramid. Close #502 --- app/assets/javascripts/guides/new.js | 7 ++++--- app/views/users/gardens.html.erb | 13 +++++++++++-- config/locales/en.yml | 13 +++++++++++-- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/guides/new.js b/app/assets/javascripts/guides/new.js index e6559b65a..c50064fc1 100644 --- a/app/assets/javascripts/guides/new.js +++ b/app/assets/javascripts/guides/new.js @@ -312,9 +312,10 @@ openFarmApp.controller('newGuideCtrl', ['$scope', '$http', '$filter', .success(function(response){ var stageWhere = ['Potted', 'Outside', 'Greenhouse', 'Indoors']; var stageLight = ['Full Sun', 'Partial Sun', 'Shaded', 'Darkness']; - var stageSoil = ['Potting', 'Loam', - 'Sandy Loam', 'Clay Loam', - 'Sand', 'Clay']; + var stageSoil = ['Potting', 'Loam', 'Clay', 'Clay Loam', 'Loamy Sand', + 'Sandy Clay', 'Sandy Loam', 'Sandy Clay Loam', + 'Sand', 'Silty Clay', 'Silty Clay Loam', + 'Silt Loam', 'Silt']; $scope.stages = response.stage_options; $scope.stages = $filter('orderBy')($scope.stages, 'order'); // Trickery to make sure the existing stages don't get diff --git a/app/views/users/gardens.html.erb b/app/views/users/gardens.html.erb index c4e695311..766dd8705 100644 --- a/app/views/users/gardens.html.erb +++ b/app/views/users/gardens.html.erb @@ -118,10 +118,19 @@ backend %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 4117216e8..02d0be0b8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -135,10 +135,19 @@ en: partial_sun: "Partial Sun" full_shade: "Full Shade" soil_type: "Soil Type" + potting: "Potting" loam: "Loam" + loamy_sand: "Loamy Sand" + sandy_clay: "Sandy Clay" + sandy_loam: "Sandy Loam" + clay_loam: "Clay Loam" + sandy_clay_loam: "Sandy Clay Loam" + sand: "Sand" clay: "Clay" - sandy: "Sandy" - silty: "Silty" + silty_clay: "Silty Clay" + silty_clay_loam: "Silty Clay Loam" + silt_loam: "Silt Loam" + silt: "Silt" ph: "pH" edit: "Edit" save_changes: "Save Changes" From 562e964114869d64da0d10ffc5ac5b74b11ce466 Mon Sep 17 00:00:00 2001 From: Rory Aronson Date: Mon, 2 Mar 2015 23:27:20 -0800 Subject: [PATCH 5/5] Fix #508 by replacing 'outdoors' with 'outside' --- app/controllers/api/gardens_controller.rb | 2 +- app/controllers/registrations_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/gardens_controller.rb b/app/controllers/api/gardens_controller.rb index d73e9acdc..fd65d0fbd 100644 --- a/app/controllers/api/gardens_controller.rb +++ b/app/controllers/api/gardens_controller.rb @@ -8,7 +8,7 @@ def create user: current_user, description: I18n.t('registrations.generated_this_garden'), average_sun: 'Full Sun', - type: 'Outdoors', + type: 'Outside', soil_type: 'Loam' ) respond_with_mutation(:created) diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 41fa67d66..96e50fa3a 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -7,7 +7,7 @@ def create name: I18n.t('registrations.your_first_garden'), description: I18n.t('registrations.generated_this_garden'), average_sun: 'Full Sun', - type: 'Outdoors', + type: 'Outside', soil_type: 'Loam' )