From 4db83e73059443ce77aa2a891fab9b6cb3b42d7e Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 26 Jun 2017 16:37:55 +0200 Subject: [PATCH 1/6] makes milestones textarea form bigger --- app/views/admin/budget_investment_milestones/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/budget_investment_milestones/_form.html.erb b/app/views/admin/budget_investment_milestones/_form.html.erb index 5f8af9d33..95237c2ca 100644 --- a/app/views/admin/budget_investment_milestones/_form.html.erb +++ b/app/views/admin/budget_investment_milestones/_form.html.erb @@ -1,7 +1,7 @@ <%= form_for [:admin, @investment.budget, @investment, @milestone] do |f| %> <%= f.text_field :title, maxlength: Budget::Investment::Milestone.title_max_length %> - <%= f.text_area :description %> + <%= f.text_area :description, rows: 5 %> <%= f.submit nil, class: "button success" %> <% end %> From c793202a33fb78cd2961c42ffca0f139dd491591 Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 26 Jun 2017 16:40:33 +0200 Subject: [PATCH 2/6] improves color contrast on milestone date --- app/assets/stylesheets/participation.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 76d947c2b..6318e2c24 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -539,7 +539,7 @@ } strong { - color: $text-light; + color: $text-medium; font-size: 0.9rem; } } From fac913edde459f1201c469b005d4f393c489f341 Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 26 Jun 2017 16:41:32 +0200 Subject: [PATCH 3/6] removes empty lines on scss --- app/assets/stylesheets/participation.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 6318e2c24..8773e4111 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -494,7 +494,6 @@ } } - .tab-milestones ul { position: relative; margin-top: rem-calc(40); @@ -595,7 +594,6 @@ } } - // 04. List participation // ---------------------- From ffff527862ea1892c4188c4f09052198a9280468 Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 26 Jun 2017 16:51:53 +0200 Subject: [PATCH 4/6] avoids qualifying elements in selectors --- app/assets/stylesheets/participation.scss | 16 ++++++++++------ .../budgets/investments/_milestones.html.erb | 6 ++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 8773e4111..51c34a38c 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -528,7 +528,7 @@ } } -.tab-milestones ul div { +.tab-milestones ul .milestone-content { position: relative; padding: rem-calc(3) rem-calc(10); @@ -537,7 +537,7 @@ margin-bottom: 0; } - strong { + .milestone-date { color: $text-medium; font-size: 0.9rem; } @@ -546,7 +546,8 @@ .tab-milestones .timeline ul li:nth-child(odd), .tab-milestones .timeline ul li:nth-child(even) { - div { + .milestone-content { + @include breakpoint(medium) { width: rem-calc(300); } @@ -558,7 +559,8 @@ } .tab-milestones .timeline ul li:nth-child(odd) { - div { + + .milestone-content { text-align: right; @include breakpoint(medium) { @@ -572,7 +574,8 @@ } .tab-milestones .timeline ul li:nth-child(even) { - div { + + .milestone-content { left: rem-calc(15); } } @@ -585,7 +588,8 @@ &:nth-child(odd), &:nth-child(even) { - div { + + .milestone-content { text-align: left; left: rem-calc(15); } diff --git a/app/views/budgets/investments/_milestones.html.erb b/app/views/budgets/investments/_milestones.html.erb index b848c5bc5..87cd1cdd6 100644 --- a/app/views/budgets/investments/_milestones.html.erb +++ b/app/views/budgets/investments/_milestones.html.erb @@ -10,9 +10,11 @@
    <% @investment.milestones.each do |milestone| %>
  • -
    +

    <%= milestone.title %>

    - <%= t("budgets.investments.show.milestone_publish_date", publish_date: milestone.created_at.strftime("%d/%m/%Y")) %> + + <%= t("budgets.investments.show.milestone_publish_date", publish_date: milestone.created_at.strftime("%d/%m/%Y")) %> +

    <%= milestone.description %>

    • From 6bb434f0ddcd9ef8da4bd0ff9429aea71fd84e64 Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 26 Jun 2017 17:06:02 +0200 Subject: [PATCH 5/6] improves css units --- app/assets/stylesheets/participation.scss | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 51c34a38c..4f12979af 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -507,11 +507,11 @@ li::before { content: ''; position: absolute; - top: rem-calc(5); + top: 5px; transform: translateX(-50%); width: rem-calc(20); height: rem-calc(20); - border-radius: 50%; + border-radius: rem-calc(20); background: $budget; z-index: 2; } @@ -523,23 +523,22 @@ bottom: 100%; height: 100%; position: absolute; - top: rem-calc(25); + top: 25px; z-index: 1; } } .tab-milestones ul .milestone-content { position: relative; - padding: rem-calc(3) rem-calc(10); + padding: $line-height / 6 $line-height / 2; h3 { - font-size: 1.2rem; margin-bottom: 0; } .milestone-date { color: $text-medium; - font-size: 0.9rem; + font-size: $small-font-size; } } @@ -576,7 +575,7 @@ .tab-milestones .timeline ul li:nth-child(even) { .milestone-content { - left: rem-calc(15); + left: 15px; } } @@ -591,7 +590,7 @@ .milestone-content { text-align: left; - left: rem-calc(15); + left: 15px; } } } From 4b3d585ecd73024a7eb710c4dc76d8e7594acecd Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 26 Jun 2017 17:07:50 +0200 Subject: [PATCH 6/6] =?UTF-8?q?changes=20css=20attributes=20to=20alphabeti?= =?UTF-8?q?cal=20order=20=F0=9F=A4=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/participation.scss | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 4f12979af..8af8071ea 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -495,42 +495,42 @@ } .tab-milestones ul { - position: relative; margin-top: rem-calc(40); + position: relative; li { + margin: 0 auto; position: relative; width: 0; - margin: 0 auto; } li::before { + background: $budget; + border-radius: rem-calc(20); content: ''; + height: rem-calc(20); position: absolute; top: 5px; transform: translateX(-50%); width: rem-calc(20); - height: rem-calc(20); - border-radius: rem-calc(20); - background: $budget; z-index: 2; } li::after { - content: ''; - width: 1px; background: $light-gray; bottom: 100%; + content: ''; height: 100%; position: absolute; top: 25px; + width: 1px; z-index: 1; } } .tab-milestones ul .milestone-content { - position: relative; padding: $line-height / 6 $line-height / 2; + position: relative; h3 { margin-bottom: 0; @@ -589,8 +589,8 @@ &:nth-child(even) { .milestone-content { - text-align: left; left: 15px; + text-align: left; } } }