Skip to content

Redesign: layout center margin bottom#10675

Merged
ferblape merged 1 commit intofeature/redesignfrom
feature/redesign-layout-center-margin-bottom
Apr 11, 2023
Merged

Redesign: layout center margin bottom#10675
ferblape merged 1 commit intofeature/redesignfrom
feature/redesign-layout-center-margin-bottom

Conversation

@Crashillo
Copy link
Copy Markdown
Contributor

@Crashillo Crashillo commented Apr 3, 2023

🎩 What? Why?

Generalize the bottom margin for every view using a layout_center type. This PR is only a refactor of that views to adapt them properly.

📷 Screenshots


1 and their subpages also. You might browse through them

@Crashillo Crashillo added the project: redesign Barcelona City Council contract label Apr 3, 2023
@Crashillo Crashillo marked this pull request as ready for review April 3, 2023 16:46
@Crashillo Crashillo requested a review from ferblape April 3, 2023 16:46
@ferblape ferblape requested a review from a team April 5, 2023 13:27
@ferblape
Copy link
Copy Markdown
Contributor

ferblape commented Apr 5, 2023

Moved to maintainers, since it's a refactor and I've checked it at UI level, just a quick look at the code should be enough.

@furilo
Copy link
Copy Markdown
Contributor

furilo commented Apr 10, 2023

Ping @decidim/maintainers

@alecslupu
Copy link
Copy Markdown
Contributor

Ping @decidim/maintainers

I was just reviewing, when you pinged us.

@furilo
Copy link
Copy Markdown
Contributor

furilo commented Apr 10, 2023 via email

@ferblape ferblape merged commit 783e586 into feature/redesign Apr 11, 2023
@ferblape ferblape deleted the feature/redesign-layout-center-margin-bottom branch April 11, 2023 05:30
entantoencuanto added a commit that referenced this pull request Apr 12, 2023
…content-blocks

* feature/redesign:
  replace uses of specific margin-bottom for layout margins (#10675)
  Redesign: menu mobile (#10351)
  Fix comments scss to avoid compilation errors (#10657)
  Redesign: Add a new <aside> to layout item (#10620)
entantoencuanto added a commit that referenced this pull request Apr 13, 2023
* feature/redesign:
  replace uses of specific margin-bottom for layout margins (#10675)
  Redesign: menu mobile (#10351)
  Fix comments scss to avoid compilation errors (#10657)
  Redesign: Add a new <aside> to layout item (#10620)
  Redesign: author tooltip (#10438)
  Redesign: pending things of the public profile (#10472)
  Redesign: card L link whole card (#10554)
  strip links from cards, standarize author cell (#10547)
entantoencuanto added a commit that referenced this pull request Apr 21, 2023
* feature/redesign:
  Redesign: filters (#10390)
  replace uses of specific margin-bottom for layout margins (#10675)
entantoencuanto added a commit that referenced this pull request Apr 28, 2023
…ent-blocks

* feature/redesign: (196 commits)
  Redesign: process & process group cards (#10716)
  Redesign: conference cards (#10502)
  Redesign: pending blogs (#10686)
  Redesign: blog cards (#10685)
  Redesign: filters (#10390)
  replace uses of specific margin-bottom for layout margins (#10675)
  Redesign: menu mobile (#10351)
  Fix comments scss to avoid compilation errors (#10657)
  Redesign: Add a new <aside> to layout item (#10620)
  Redesign: author tooltip (#10438)
  Redesign: pending things of the public profile (#10472)
  Redesign: card L link whole card (#10554)
  strip links from cards, standarize author cell (#10547)
  include a clause to change a data-attr on the fly
  Update tests
  Restore specs
  set different modals foreach comment
  unify report button for futher uses
  use report_button instead of flag_modal
  Unify comments:loaded event
  ...
entantoencuanto added a commit that referenced this pull request May 26, 2023
* feature/redesign: (21 commits)
  Feature/redesign components breadcrumb (#10441)
  Redesign: debates (#10653)
  Redesign: Remove reference to commentable in activity cell (#10816)
  Redesign: spinner (#10848)
  Redesign: omnipresent banner (#10847)
  Add redesign enable ENV variable to control the pipeline (#10610)
  Redesign: progress bar (#10638)
  Redesign: meeting cards (#10722)
  Redesign: pending login (#10699)
  simplify 2col layout (#10819)
  Redesign: processes groups content blocks (#10491)
  Redesign: assemblies content blocks (#10573)
  Redesign: process & process group cards (#10716)
  Redesign: conference cards (#10502)
  Redesign: pending blogs (#10686)
  Redesign: blog cards (#10685)
  Redesign: filters (#10390)
  replace uses of specific margin-bottom for layout margins (#10675)
  Redesign: menu mobile (#10351)
  Fix comments scss to avoid compilation errors (#10657)
  ...
ferblape added a commit that referenced this pull request Jun 13, 2023
* add paginate

* remove budget_project

* add button to remove vote

* projects count

* locales

* scope locales

* remove margin-bottom card__hightlight

* add class to budgets_voted

* add class editor-content

* replace title for exit modal

* position the marker to show the budget minimum

* Wrap project_budget_button content in div with id in all cases

* add classes to project budget button

* scope locales

* list for versions

* add icon to exit modal

* update locales

* typo

* styles

* remove the announcemnt in the project list

* styles for budget_card

* styles for project_card

* add view_more to redesigned_index

* add classes and replace icons in the announcement_show

* add -webkit-appearance: none to input type search

* order projects

* revert locales

* remove mock filters

* export default function viewMore

* add orderable to budget_controller

* truncate less characters of the budget description

* fix test lint ERB

* styles for budgets

* Define a scope item in global metadata card cell

* Move category item from meetings metadata to global metadata card cell

* Define project-l card cell

* Replace project_list_item with card-l

* Remove unused methods

* Move logic to vote button cell and remove list item cell

* Change conditions to display votes count metadata

* Change vote icon if project checked out in current order

* Adapt project l cell to controllers not providing current order

* add markup and style for switch #10469

* styles for projects

* remove margin-right budget-summary

* budget cards

* budget summary

* Define scope in projects to filter by order

* Allow filter projects by addition type

* Add filter by addition type filter form

* styles and markup for addition-selector

* styles for filters

* markup for project card

* add new parameter to change voting button classes

* styles for budget and project list

* fix test lint ERB

* styles vote button and project item

* Disable link_whole_card in projects card-l called from index inside a budget

* Remove project card markup example

* Extract order progress summary content to a partial and update with AJAX

* remove editor-content

* Fix selectors in tests for order filter

* Fix syntax error

* Fix render_meeting_body expected output in test after editor-content class removal

* add map and popup to lists projects

* add margin-bottom to map

* Fix linter offenses

* fix linter js

* Remove unused translations and ignore unused on others

* Fix linter offense

* Update decidim-budgets/app/controllers/decidim/budgets/orders_controller.rb

Co-authored-by: Fernando Blat <fernando@blat.es>

* resolved changes @ferblape

* fix tests

* revert orderable

* remove deprecated way of loading styles

* budget information modal

* budget list hover

* progressas-bar fixed

* remove add to calendar and align place tags with comment

* progress-bar-fixed

* progress-bar-fixed budgets and item

* voted budgets at top

* add button delete vote to progress-bar-fixed

* comments and versions at the bottom

* fix test

* add styles to confirmation message

* dont trigger the exit modal when switching between projects

* update summary content

* Revert "Announcement toggle component"

This reverts commit 634186a.

* remove viewMore

* announcement view_more

* add new clean method

* overwrite default accordion

* Remove unused partial

* Update counter on addition selector

* Remove projects on unvoting when added filter is enabled

* Reenable events using addition filter

* move callout view-more feature to the cell

* toggle the new modal, instead the foundation one

* hovering budget list

* split the project card in two

* styles for projects

* Define an optional wrapper class on card-l when no link whole card enabled

* styles for projects

* triggering the login modal when adding a project from the item

* fix test

* responsive

* responsive

* skip_unless_redesign_active shared examples of comments and emojis

* fix test

* fix test

* fix test

* replace uses of specific margin-bottom for layout margins (#10675)

* Fix tests after import deprecation

* Fix some helper methods expected output in tests after editor-content class removal

* Remove unused translations

* Fix text in test

* Fix selector in test

* Fix test

* Skip test of filters pending of merge of redesigned filters PR

* Display selection status metadata on projects

* Avoid duplicated id

* Skip unless redesign enabled test

* Adapt tests

* Adapt tests to work in redesigned and legacy versions

* Fix expected text in test

* Mock cells and ActionView::Base to perform tests requiring cells and fix test

* hidden text responsive

* budget summary responsive

* update add button

* update amounts

* remove dialog_open from project_button_cell

* fix js lint

* fix js lint

* fix test

* add line-clamp to title

* remove modal_params

* triggering modal_budget_excess via javascript

* remove extra blank

* responsive

* add pointer-events-none to button:disabled because Chrome/Chromium/Brave ignores the disabled attribute

* remove <span>

* budget_modal_info

* padding budget__summary

* grid budget__summary

* grid layout order_progress

* add tabs and panels to projects_controller

* update proposal text

* return current_rule_description

* align card items

* reduce the size of the right block of the project list

* refactor budget-summary-grid

* budget summary responsive

* add div to button_more_information

* fix test

* fix test

* responsive summary_content

* remove local project_item from budget_summary

* align vote-button

* align project-vote-button

* fix lint

* Fix selection of resources in results tab in project

* Avoid selector ambiguity in test

* Replace attachments shared examples to use tests for redesigned version

* Extract budgets main list to a partial inside the cell

* Add Randomable concern to budgets

* Add orders to budgets list

* Avoid js errors on budgets index

* add margin-bottom to order-by

* remove link to versions

* dont trigger the exit modal when a user clicks on a link inside the tabs

* checks if the link is a child of the panel, in that case doesnt trigger the exit modal

* if selecting all or added dont replace the HTML of the selector so as not to lose the success event

* update the selector active class via js

* lint js

* add filters to budgets

* fix offensses

* remove unused js

* Enable redesign on budgets module tests

* Update decidim-budgets/app/cells/decidim/budgets/budget_list_item/projects_count.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-budgets/app/cells/decidim/budgets/budget_list_item/projects_count.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-budgets/app/cells/decidim/budgets/budget_list_item/show.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-budgets/app/cells/decidim/budgets/budget_list_item/show.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-budgets/app/cells/decidim/budgets/budget_list_item/show.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-budgets/app/controllers/decidim/budgets/projects_controller.rb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-budgets/app/models/decidim/budgets/project.rb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-budgets/app/views/decidim/budgets/line_items/update_budget.js.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-budgets/app/views/decidim/budgets/projects/_budget_summary.html.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-budgets/app/views/decidim/budgets/projects/_projects.html.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-budgets/app/views/decidim/budgets/projects/_order_progress.html.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-budgets/app/views/decidim/budgets/projects/_projects_list.html.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* project vote button: swap the conditions to show text and icon

* remove redesigned_comment

* remove duplicate keys

* extract to order_total_budget

* extract the progressbar-marks to a new partial

* Fix translation

* Allow to detect workflow and component from budget_list_item cell if not provided by controller

* Hide vote actions and data if budget item cell is in a controller context not providing component current_settings

* Define budget_list_item as default card

* Fix path in budget list item cell

* restore announcement toggle

* enhance breadcrumb mouse events

* Extract label to a method

* Refactor announcement in budgets index

* Fix path of back link in projects show

* Unskip and adapt filters tests in projects index

* missing hover action

* Fix linter offense

* Fix tests after import deprecation

* Prepare accept_confirm to admin environment

* Fix method

* Use full path of partials to render inside order_progress_summary_content

* Adapt tests to redesign

* Add comments to failing tests

* Normalize locales

* Replace pack_tag calls

* Avoid errors reordering highlighted budgets

* check if the panel-container exists

* remove comments

* fix js

* Fix indentation in partials

* Join conditions of nested ifs

* Add sign_out_path as decidim config variable for js

* Remove pointer-events-none

* Simplify conditional

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

---------

Co-authored-by: Eduardo Martinez Echevarria <eduardomech@gmail.com>
Co-authored-by: Fernando Blat <fernando@blat.es>
Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com>
Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

project: redesign Barcelona City Council contract

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants