From a73541da715ecd4706841f957811e919f7cb93ab Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 26 Sep 2014 12:07:38 +1000 Subject: [PATCH 1/5] Change styling for register modals --- app/assets/stylesheets/darkswarm/modal-login.css.sass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/darkswarm/modal-login.css.sass b/app/assets/stylesheets/darkswarm/modal-login.css.sass index 38fe5dee3a..61108145bb 100644 --- a/app/assets/stylesheets/darkswarm/modal-login.css.sass +++ b/app/assets/stylesheets/darkswarm/modal-login.css.sass @@ -1,6 +1,13 @@ // Styling for login modal to style tabs +.reveal-modal.login-modal + border-bottom-color: #efefef + .login-modal background: #efefef .tabs-content - background: #fff \ No newline at end of file + background: #fff + padding-top: 10px + + + \ No newline at end of file From c1460afaee256dcc950bb185372d6e46a91b0d9c Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 26 Sep 2014 12:07:58 +1000 Subject: [PATCH 2/5] Tweak language around the long description --- app/assets/javascripts/templates/registration/about.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/templates/registration/about.html.haml b/app/assets/javascripts/templates/registration/about.html.haml index 57f7c482e6..d014c96d90 100644 --- a/app/assets/javascripts/templates/registration/about.html.haml +++ b/app/assets/javascripts/templates/registration/about.html.haml @@ -28,8 +28,8 @@ .row .small-12.columns %label{ for: 'enterprise_long_desc' } Long Description: - %textarea.chunky.small-12.columns{ id: 'enterprise_long_desc', placeholder: "We recommend keeping your description to under 600 characters or 150 words. Why? Cus people are lazy, and don't like to read too much text online. ;)", ng: { model: 'enterprise.long_description' } } - %small {{ enterprise.long_description.length }} characters used + %textarea.chunky.small-12.columns{ id: 'enterprise_long_desc', rows: 6, placeholder: "This is your opportunity to tell the story of your enterprise - what makes you different and wonderful? We'd suggest keeping your description to under 600 characters or 150 words.", ng: { model: 'enterprise.long_description' } } + %small {{ enterprise.long_description.length }} characters / up to 600 recommended .small-12.large-4.columns .row .small-12.columns From 3406f926fc3b8b7e31af9f94d7e0ea45b4e9356a Mon Sep 17 00:00:00 2001 From: Rafael Schouten Date: Fri, 26 Sep 2014 14:48:37 +1000 Subject: [PATCH 3/5] fix enterprsie model logic --- app/models/enterprise.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index ecd948aa7a..a81655a1de 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -215,7 +215,7 @@ class Enterprise < ActiveRecord::Base # Type: full - single - profile becomes Sells: all - own - none # Remove this return later. return "none" if !is_distributor || type == "profile" - return "own" if suppliers == [self] || type == "single" + return "own" if type == "single" || suppliers == [self] "all" end From c43b8abcbc833950e1d135def0043233abe859c5 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 26 Sep 2014 14:55:10 +1000 Subject: [PATCH 4/5] Changing the markup to give a class where is a producer --- .../javascripts/templates/partials/enterprise_header.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/templates/partials/enterprise_header.html.haml b/app/assets/javascripts/templates/partials/enterprise_header.html.haml index 8edca0280b..8612ba968e 100644 --- a/app/assets/javascripts/templates/partials/enterprise_header.html.haml +++ b/app/assets/javascripts/templates/partials/enterprise_header.html.haml @@ -5,7 +5,7 @@ %a{"bo-href" => "enterprise.path", "ofn-empties-cart" => "enterprise", bindonce: true} %i{"ng-class" => "enterprise.icon_font"} %span {{ enterprise.name }} - %h3{"ng-if" => "!enterprise.has_shopfront"} + %h3{"ng-if" => "!enterprise.has_shopfront", "ng-class" => "{'is_producer' : enterprise.is_primary_producer}"} %i{"ng-class" => "enterprise.icon_font"} %span {{ enterprise.name }} .small-12.medium-5.large-4.columns.text-right.small-only-text-left From 3adf571c1f55edd3a60b4d28164855869e0de943 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 26 Sep 2014 14:55:35 +1000 Subject: [PATCH 5/5] Style the modal headers --- .../stylesheets/darkswarm/modal-enterprises.css.sass | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/assets/stylesheets/darkswarm/modal-enterprises.css.sass b/app/assets/stylesheets/darkswarm/modal-enterprises.css.sass index 2ceaa96373..305566ad58 100644 --- a/app/assets/stylesheets/darkswarm/modal-enterprises.css.sass +++ b/app/assets/stylesheets/darkswarm/modal-enterprises.css.sass @@ -42,6 +42,10 @@ margin-bottom: 0 padding-bottom: 0 line-height: 1 + + h3 > i + color: $clr-brick + p line-height: 2.4 @media all and (max-width: 640px) @@ -50,6 +54,10 @@ h3 a:hover span border-bottom: 1px solid $clr-brick-bright + .is_producer + &, & * + color: $clr-turquoise + // ABOUT Enterprise