From 23835c91a6f48fd8860dd49693335a56a3c69560 Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Mon, 22 Nov 2021 16:53:42 +0100 Subject: [PATCH 01/18] remove comp_search --- app/javascript/stylesheets/_comp-search.scss | 37 ------------------- .../stylesheets/gobierto-admin.scss | 1 - .../stylesheets/gobierto-budgets.scss | 1 - app/javascript/stylesheets/gobierto-cms.scss | 1 - .../stylesheets/gobierto-consultations.scss | 1 - .../gobierto-dashboards-maker.scss | 1 - .../gobierto-dashboards-viewer.scss | 1 - app/javascript/stylesheets/gobierto-data.scss | 1 - .../stylesheets/gobierto-exports.scss | 1 - .../stylesheets/gobierto-indicators.scss | 1 - .../stylesheets/gobierto-investments.scss | 1 - .../stylesheets/gobierto-observatory.scss | 1 - .../stylesheets/gobierto-people.scss | 1 - .../stylesheets/gobierto-plans.scss | 1 - app/javascript/stylesheets/gobierto-user.scss | 1 - .../stylesheets/gobierto-visualizations.scss | 3 +- 16 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 app/javascript/stylesheets/_comp-search.scss diff --git a/app/javascript/stylesheets/_comp-search.scss b/app/javascript/stylesheets/_comp-search.scss deleted file mode 100644 index c671ed49e5..0000000000 --- a/app/javascript/stylesheets/_comp-search.scss +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Search results - * - */ -.search_results { - .search_box { - margin: 0 0 4em 0; - - input { - height: initial; - padding: 1em; - } - - input[type=text] { - width: 70%; - } - } - - .result { - margin: 0 0 3em 0; - - h2 { - margin: 0; - font-size: 1.2em; - } - - .item_type, - .updated_at { - opacity: 0.5; - text-transform: uppercase; - } - - .item_type::after { - content: " · "; - } - } -} diff --git a/app/javascript/stylesheets/gobierto-admin.scss b/app/javascript/stylesheets/gobierto-admin.scss index 38048ffdfc..9473dce895 100644 --- a/app/javascript/stylesheets/gobierto-admin.scss +++ b/app/javascript/stylesheets/gobierto-admin.scss @@ -17,7 +17,6 @@ $font_serif: 'Georgia, serif'; @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-budgets.scss b/app/javascript/stylesheets/gobierto-budgets.scss index 26182bf86d..1132e443f9 100644 --- a/app/javascript/stylesheets/gobierto-budgets.scss +++ b/app/javascript/stylesheets/gobierto-budgets.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-cms.scss b/app/javascript/stylesheets/gobierto-cms.scss index 14bc0788c9..74d92a14d8 100644 --- a/app/javascript/stylesheets/gobierto-cms.scss +++ b/app/javascript/stylesheets/gobierto-cms.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-consultations.scss b/app/javascript/stylesheets/gobierto-consultations.scss index d618f31135..2027a4e8a1 100644 --- a/app/javascript/stylesheets/gobierto-consultations.scss +++ b/app/javascript/stylesheets/gobierto-consultations.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-dashboards-maker.scss b/app/javascript/stylesheets/gobierto-dashboards-maker.scss index ff1de046ae..09cfa14a21 100644 --- a/app/javascript/stylesheets/gobierto-dashboards-maker.scss +++ b/app/javascript/stylesheets/gobierto-dashboards-maker.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-dashboards-viewer.scss b/app/javascript/stylesheets/gobierto-dashboards-viewer.scss index b481793f45..96ebd2d284 100644 --- a/app/javascript/stylesheets/gobierto-dashboards-viewer.scss +++ b/app/javascript/stylesheets/gobierto-dashboards-viewer.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-data.scss b/app/javascript/stylesheets/gobierto-data.scss index c6dcce0f80..a020011f47 100644 --- a/app/javascript/stylesheets/gobierto-data.scss +++ b/app/javascript/stylesheets/gobierto-data.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-exports.scss b/app/javascript/stylesheets/gobierto-exports.scss index a3af2692bc..f466d45b01 100644 --- a/app/javascript/stylesheets/gobierto-exports.scss +++ b/app/javascript/stylesheets/gobierto-exports.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-indicators.scss b/app/javascript/stylesheets/gobierto-indicators.scss index 5e555df469..1faa3cd003 100644 --- a/app/javascript/stylesheets/gobierto-indicators.scss +++ b/app/javascript/stylesheets/gobierto-indicators.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-investments.scss b/app/javascript/stylesheets/gobierto-investments.scss index d7c52b1c8f..656302f4ab 100644 --- a/app/javascript/stylesheets/gobierto-investments.scss +++ b/app/javascript/stylesheets/gobierto-investments.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-observatory.scss b/app/javascript/stylesheets/gobierto-observatory.scss index 9fef5afcae..762da5d93d 100644 --- a/app/javascript/stylesheets/gobierto-observatory.scss +++ b/app/javascript/stylesheets/gobierto-observatory.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-people.scss b/app/javascript/stylesheets/gobierto-people.scss index 236a4419e5..56ad079921 100644 --- a/app/javascript/stylesheets/gobierto-people.scss +++ b/app/javascript/stylesheets/gobierto-people.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-plans.scss b/app/javascript/stylesheets/gobierto-plans.scss index 0fd8b2b53b..5801c192c5 100644 --- a/app/javascript/stylesheets/gobierto-plans.scss +++ b/app/javascript/stylesheets/gobierto-plans.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-user.scss b/app/javascript/stylesheets/gobierto-user.scss index f77a683f64..6c957b4bbd 100644 --- a/app/javascript/stylesheets/gobierto-user.scss +++ b/app/javascript/stylesheets/gobierto-user.scss @@ -14,7 +14,6 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; diff --git a/app/javascript/stylesheets/gobierto-visualizations.scss b/app/javascript/stylesheets/gobierto-visualizations.scss index dd0efaa7dd..1f1a637304 100644 --- a/app/javascript/stylesheets/gobierto-visualizations.scss +++ b/app/javascript/stylesheets/gobierto-visualizations.scss @@ -9,12 +9,11 @@ @import "css-conf"; @import "populities"; @import "mixins"; -@import "comp-breadcrumbs"; +// @import "comp-breadcrumbs"; @import "comp-forms"; @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-search"; @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; From e944e61cc482c28499182172bd8ca2457afb6fd1 Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Mon, 22 Nov 2021 17:40:23 +0100 Subject: [PATCH 02/18] remove consultations --- .../stylesheets/gobierto-consultations.scss | 966 ------------------ 1 file changed, 966 deletions(-) delete mode 100644 app/javascript/stylesheets/gobierto-consultations.scss diff --git a/app/javascript/stylesheets/gobierto-consultations.scss b/app/javascript/stylesheets/gobierto-consultations.scss deleted file mode 100644 index 2027a4e8a1..0000000000 --- a/app/javascript/stylesheets/gobierto-consultations.scss +++ /dev/null @@ -1,966 +0,0 @@ -@import "normalize.css"; -@import "purecss/build/pure-nr"; -@import "purecss/build/grids-responsive"; -@import "@fortawesome/fontawesome-free/css/all"; - -@import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); - -// TODO: revisar cuáles sobran -@import "css-conf"; -@import "populities"; -@import "mixins"; -@import "comp-breadcrumbs"; -@import "comp-forms"; -@import "comp-headings_blocks"; -@import "comp-layout"; -@import "comp-site_header"; -@import "comp-tables"; -@import "comp-header_block_inline"; -@import "comp-social_buttons"; -@import "comp-tipsy"; -@import "comp-flash_messages"; -@import "css-print"; -@import "defaults"; -@import "responsive"; -// END TODO - -/* Hide header and footer */ -.consultations.show, -.consultations.budget_summary, -.consultation_items.index, -.consultation_responses.new { - header.meta { - margin: 0 0 0; - } - - .header.meta .slim_nav_bar { - display: none; - } - - nav { - display: none; - } - - header.meta .site_header .logo { - margin-top: 1.5rem; - padding-bottom: 1rem; - text-align: left; - border-bottom: 1px solid $separator; - } - - footer { - display: none; - } -} - -/* Share buttons */ -.gobierto_budget_consultations header.meta .site_header menu.nav .social_links_container { - top: 11px; - right: 11px; - bottom: inherit; - left: inherit; - - @include min-screen(768) { - top: inherit; - right: 11px; - bottom: 11px; - } -} - -/* - * Consultations - * - */ -.active-consultations h3, -.past-consultations h3 { - font-weight: 400; -} - -img.side_50 { - width: 100%; - height: auto; -} - -.consultation_cont { - margin: 3em 0; - - /* width: 85%; */ - margin: auto; - - @include border-radius(6px); - - background: rgba(var(--color-base-string), 0.06); -} - -/* Consultation intro */ -.inline-block { - display: inline-block; -} - -.column.consultation { - max-width: 960px; - position: relative; -} - -.consultation-intro-wrapper { - .consultation-intro-header { - margin: 0 0 2em 0; - - h2 { - font-size: 2.2em; - margin: 0; - } - } - - @include min-screen(768) { - position: relative; - padding: 0 10rem; - margin-bottom: 3em; - - img.consultation-decoration { - position: absolute; - top: -1em; - left: 0; - } - } -} - -.consultation-intro-wrapper p { - @include min-screen(768) { - font-weight: 300; - font-size: 1.25rem; - } -} - -.consultation-intro-wrapper img { - display: block; -} - -.consultation-link { - text-decoration: none; - display: block; - margin-bottom: 0.5rem; -} - -.consultation-link:hover, -.consultation-link:active, -.consultation-link:focus { - text-decoration: none; -} - -.consultation-lead { - font-weight: 400; - line-height: 1.3; - - @include min-screen(768) { - margin-top: 0; - font-size: 2rem; - } -} - -.consultation_responses .mobile .consultation-lead { - margin: 1rem; - margin-bottom: 2rem; -} - -.bottom-info { - padding: 1rem; - background: var(--color-base); - color: $color_main_negative; - - @include min-screen(768) { - position: relative; - padding: 2rem 10rem; - height: 10rem; - font-weight: 300; - font-size: 1.25rem; - } -} - -.teaser { - margin: 0.25rem 0; - - @include min-screen(768) { - margin: 1.5rem 0; - } -} - -.consultation-q { - color: $color_main_negative; - margin: 0; - font-weight: 600; -} - -.arrow-right { - font-size: 2.5rem; - float: right; -} - -.arrow-right .fas { - margin: 0; -} - -.consultation-deadline { - text-decoration: none; - margin: 0 1rem; - - @include min-screen(768) { - margin: 2rem 10rem; - } -} - -.consultation-faq { - padding: 0 1rem; - - @include min-screen(768) { - padding: 0; - } -} - -.arrow-left { - padding: 1rem; - border-radius: 50%; - background: #cde9ec; - color: #1d909d; - - @include min-screen(768) { - position: absolute; - left: -5rem; - } -} - -.consultation-faq-q { - font-weight: 600; -} - -.consultation-faq-q.active { - text-decoration: none; -} - -.consultation-faq .consultation-text { - padding: 0; -} - -.consultation-faq .consultation-text p { - padding: 0; -} - -/* Budget preview (desktop only) */ -.column.consultation.desktop { - max-width: 1440px; - margin: 0 auto; -} - -.consultation-img-side { - position: absolute; - left: 0; -} - -.consultation-text, -.bottom-info-small { - padding: 0 2rem; - position: relative; -} - -.consultation-text p { - font-weight: 300; - padding: 0 2rem 0 4rem; - line-height: 1.2; - font-size: 1.5rem; -} - -.bottom-info-small { - padding: 1rem 2rem; - background: var(--color-base); - color: $color_main_negative; - max-width: 25rem; - margin: 0 auto; -} - -.consultation-group { - margin: 0 auto; - max-width: 30rem; -} - -.intro-arrow { - text-align: right; -} - -.card-header { - position: relative; -} - -/* Cards */ -.consultation-box { - margin: 0.9375rem; - margin-bottom: 6rem; -} - -.consultation-card { - position: relative; - box-shadow: 0 0 11px 0 rgba(0, 0, 0, 0.26); - border-top-right-radius: 8px; - border-top-left-radius: 8px; - margin-top: -0.75rem; - background: #dfeff0; - - /* Desktop */ - @include min-screen(768) { - box-shadow: none; - border-top-right-radius: 0; - border-top-left-radius: 0; - margin: 0; - margin-bottom: 0.25rem; - } -} - -.consultation-card.active { - /* Desktop */ - @include min-screen(768) { - background-color: #0f5e66; - } -} - -.consultation-card.active::after { - /* Desktop */ - @include min-screen(768) { - font-family: "FontAwesome", sans-serif; - content: "\f105"; - position: absolute; - z-index: 1; - right: -2rem; - top: 0.75rem; - color: #1d909d; - font-size: 2.5rem; - } -} - -.consultation-card.active .card-title { - padding: 1rem 1rem 0 1rem; - - @include min-screen(768) { - padding: 0.5rem; - } -} - -.card-title { - padding: 1rem; - - @include min-screen(768) { - padding: 0.5rem; - } -} - -.consultation_responses .card-title { - cursor: pointer; -} - -.card-content { - position: relative; -} - -.consultation-title { - margin: 0; - font-weight: 600; - display: inline-block; - font-size: 1rem; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - color: $color_dark; - width: 65%; - vertical-align: middle; - - @include min-screen(768) { - font-size: 1.15rem; - width: 22rem; - } -} - -.active .consultation-title { - white-space: normal; -} - -.consultation_responses .consultation-title { - @include min-screen(768) { - width: 70%; - } - - @include min-screen(1200) { - width: 80%; - } -} - -.consultation-figure { - font-weight: 300; - float: right; - width: 5rem; -} - -.consultation-figure span { - float: right; -} - -.consultation-figure .fa-arrow-up { - color: var(--color-base); -} - -.consultation-figure .fa-arrow-down { - color: var(--color-base); -} - -.consultation-figure .fa-circle { - color: var(--color-base); -} - -.desktop .consultation-card.active .consultation-title, -.desktop .consultation-card.active .consultation-figure { - color: $color_main_negative; -} - -.mobile .consultation-card.active .consultation-title { - font-size: 1.25rem; - white-space: normal; -} - -.mobile .consultation-card.active .consultation-figure { - font-size: 1.5rem; -} - -/* Warnings */ -#errors { - color: $color_main_negative; - background-color: $color_warn; - border: 1px solid transparent; - border-radius: 4px; - margin: 1rem 1rem 2rem 1rem; - padding: 0.5rem; - - @include min-screen(768) { - margin: 1rem 0 2rem 0; - } -} - -#notice { - color: #fff; - background-color: var(--color-base); - border: 1px solid transparent; - border-radius: 4px; - margin: 1rem 1rem 2rem 1rem; - padding: 0.5rem; - - @include min-screen(768) { - margin: 1rem 0 2rem 0; - } -} - -/* Card content (desktop only) */ -.card-wrapper { - padding: 0 0 0 3rem; -} - -.card-headline { - font-size: 1.5em; - margin-top: 0; - margin-bottom: 1rem; - padding-right: 6rem; -} - -.card-figure { - text-align: right; - color: #9b9b9b; - position: absolute; - right: 0; - top: 0; -} - -.card-figure h4 { - color: #9b9b9b; - font-weight: 400; - margin: 0; - margin-top: 0.35rem; -} - -.card-figure p { - margin-top: 0; -} - -/* Card content */ -.card-description .sep { - border-top: 1px solid $color_dark_sep; - margin-bottom: 1rem; - - @include min-screen(768) { - border-top: 0; - margin-bottom: 0; - } -} - -.card-description { - color: $color_dark; - padding: 1rem; - padding-top: 0.5rem; - - @include min-screen(768) { - padding: 0; - padding-bottom: 1rem; - } -} - -.card-description.absolute { - margin-bottom: 2rem; - max-height: 250px; - overflow: hidden; -} - -.card-description .overlay { - position: absolute; - bottom: 2rem; - left: 0; - width: 100%; - height: 55%; - background: -moz-linear-gradient(top, rgba(137, 255, 241, 0) 0%, rgba(0, 0, 0, 1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(137, 255, 241, 0)), color-stop(100%, rgba(0, 0, 0, 1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(137, 255, 241, 0) 0%, rgba(0, 0, 0, 1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(137, 255, 241, 0) 0%, rgba(0, 0, 0, 1) 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, rgba(137, 255, 241, 0) 0%, rgba(0, 0, 0, 1) 100%); /* IE10+ */ - background: linear-gradient(to bottom, rgba(137, 255, 241, 0) 0%, rgba(0, 0, 0, 1) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0089fff1', endColorstr='#000000', GradientType=0); /* IE6-9 */ -} - -/* Budget change selector */ -.budget-ask { - text-align: center; - margin-bottom: 2rem; - background: #6dbfc6; -} - -.mobile .budget-ask { - box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.3); -} - -.budget-ask.absolute { - margin-bottom: 0; - position: absolute; - bottom: 0; -} - -.budget-ask .read-more { - position: absolute; - right: 0.25rem; - top: -2.5rem; - width: 2rem; - height: 2rem; - border-radius: 50%; - background: #6dbfc6; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.2); - line-height: 1.5rem; - color: $color_main_negative; -} - -.select-lead { - padding: 0.25rem; - color: $color_main_negative; - background: #1d9eab; - font-weight: 600; -} - -.select-info { - color: $color_main_negative; - font-weight: 300; - padding-top: 0.5rem; -} - -.select-info .pure-g { - padding: 0 1rem; -} - -.select-pct { - color: $color_main_negative; - padding: 0.5rem 0.25rem; -} - -.border { - margin: 0.15rem 0.1rem 0.15rem 0.1rem; - - @include min-screen(768) { - margin: 0.15rem 1.1rem 0.15rem 1.1rem; - } -} - -.pct { - margin-bottom: 0; - background: #6dbfc6; - text-transform: capitalize; - padding: 0.75rem 0.25rem; - font-size: 1rem; - font-weight: 400; - border-radius: 6px; - border: 1px solid transparentize($color_main_negative, 0.5); - - @include min-screen(1024) { - font-size: 1.25rem; - padding: 0.75rem 1rem; - } -} - -.pct:focus { - border-color: inherit; - box-shadow: none; - background: #00626b; -} - -.border .active { - border-radius: 6px; - background: #00626b; -} - -.select-pct .pure-u-1-5:not(:first-child) .border { - margin-left: 0.5rem; -} - -/* Fixed stuff */ -.consultation-info { - background: var(--color-base); - position: fixed; - width: 100%; - bottom: 0; - - @include min-screen(768) { - position: relative; - margin-bottom: 0.25rem; - } -} - -.surplus-1 .budget-status { - background: #dec; - color: #55a900; -} - -.surplus-2 .budget-status { - background: #bbdc99; -} - -.surplus-3 .budget-status { - background: #99cb66; -} - -.surplus-4 .budget-status { - background: #55a900; -} - -.deficit-1 .budget-status { - background: #eed1cc; - color: #a91900; -} - -.deficit-2 .budget-status { - background: #dda399; -} - -.deficit-3 .budget-status { - background: #cb7566; -} - -.deficit-4 .budget-status { - background: #a91900; -} - -.consultation-info h3 { - text-align: center; - font-size: 0.9rem; - font-weight: 400; - color: $color_main_negative; - - @include min-screen(768) { - padding: 1rem; - margin-bottom: 0; - } -} - -.consultation-info.active { - @include min-screen(768) { - height: 84px; - z-index: 100000001; - } -} - -.consultation-info .wrapper { - color: $color_main_negative; -} - -.consultation-info .wrapper .budget-base, -.consultation-info .wrapper .budget-status { - width: 40%; - margin-right: -3px; - display: inline-block; - padding: 0.25rem 0.75rem 0.5rem 0.75rem; - border-right: 1px solid transparentize($color_main_negative, 0.2); - - @include min-screen(768) { - padding: 1rem 0.75rem 1.25rem 0.75rem; - } - - @include min-screen(1200) { - width: 44%; - } - - @include min-screen(1400) { - width: 45%; - } -} - -.budget-lead { - font-size: 0.85rem; - font-weight: 300; -} - -.budget-figure { - font-size: 1.5rem; - - @include min-screen(768) { - font-size: 1.75rem; - } -} - -.consultation-info .wrapper .pure-u-1-6 { - text-align: center; -} - -.budget-next { - color: $color_main_negative; - text-decoration: none; - font-size: 2rem; - line-height: 3.75rem; - - @include min-screen(768) { - line-height: 5.25rem; - } -} - -.budget-next:hover, -.budget-next:focus, -.budget-next:active { - text-decoration: none; -} - -.budget-next .fas { - margin: 0; -} - -/* Tooltips */ -.not-allowed { - cursor: pointer; -} - -.budget-status { - cursor: pointer; -} - -.tip-warning .tipsy-inner { - background: #d85b5b; - overflow: hidden; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); -} - -.tip-warning .tipsy-arrow { - position: absolute; - background: url(image_path('tipsy')) no-repeat top left; - background: url(image_path('tipsy_warning')); - width: 9px; - height: 5px; - margin-left: -4px; - background-position: bottom left; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); -} - -.tip-warning .tip-headline, -.tip-info .tip-headline { - color: $color_main_negative; - font-weight: 600; - text-align: left; - margin: 0; - margin-top: 0.5rem; -} - -.tip-warning p, -.tip-info p { - font-weight: 300; - margin: 0.5rem 0; - margin-bottom: 1rem; - text-align: left; -} - -.tip-warning .tip-button { - padding: 0.25em 1em; - background: #a72929; - float: right; - width: auto; -} - -.tip-info .tipsy-arrow { - position: absolute; - background: url(image_path('tipsy')) no-repeat top left; - background: url(image_path('tipsy_info')); - width: 9px; - height: 5px; - bottom: 0; - left: 50%; - margin-left: -4px; - background-position: bottom left; - - @include min-screen(768) { - transform: rotate(180deg); - } -} - -.tip-info .tipsy-inner { - background: var(--color-base); - overflow: hidden; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); -} - -.tip-info .tip-button { - width: auto; - padding: 0.25em 1em; - float: right; - background: $color_dark; -} - -/* Modal */ -.modal-mask { - position: fixed; - z-index: 999; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: rgba(0, 0, 0, 0.5); - display: table; - transition: opacity 0.3s ease; -} - -.modal-wrapper { - display: table-cell; - vertical-align: middle; -} - -.modal-container { - text-align: right; - background: #249eab; - width: 250px; - margin: 0 auto; - padding: 1rem; - border-radius: 6px; - box-shadow: 0 2px 8px rgba(0, 0, 0, 0.33); - color: $color_main_negative; - transition: all 0.3s ease; -} - -.modal-header { - color: $color_main_negative; - text-align: left; - font-size: 1.15rem; - margin-top: 0.25rem; - margin-bottom: 0.75rem; - font-weight: 600; -} - -.modal-body { - text-align: left; - margin-bottom: 0.25rem; -} - -.modal-container .modal-button { - width: auto; - padding: 0.25em 1em; - background: #056172; - margin-bottom: 0; -} - -.modal-enter { - opacity: 0; -} - -.modal-leave-active { - opacity: 0; -} - -.modal-enter .modal-container, -.modal-leave-active .modal-container { - -webkit-transform: scale(1.1); - transform: scale(1.1); -} - -/* Confirmation */ -.description { - position: relative; -} - -.consultation-confirm { - width: 320px; - border: 1px solid var(--color-base); - border-radius: 4px; - padding: 0.9375rem; - position: absolute; - margin-left: 3rem; - text-align: center; - top: 20px; -} - -.consultation-confirm h3 { - text-align: left; - display: inline-block; - margin-top: 0.5rem; -} - -.consultation-confirm button { - display: block; - margin: 0 auto; - padding: 0.75rem 2rem; -} - -.consultation-confirm.deficit { - background: #a91900; - border: 0; - text-align: left; - top: 0; -} - -.consultation-confirm.deficit h3 { - max-width: 400px; - color: white; - text-align: left; - font-weight: 400; - margin-top: 0; - margin-bottom: 1rem; -} - -.consultation-confirm.deficit .fas { - color: white; -} - -.consultation-confirm.slim { - text-align: left; - margin-bottom: 3rem; -} - -.consultation-confirm.slim img { - display: none; -} - -.consultation-confirm.slim button { - margin: initial; -} - -.consultation_thanks .wrapper { - padding: 0.75rem; - - @include min-screen(768) { - padding: 3rem; - } -} - -.consultation_thanks h1 { - margin-top: 0; -} From 6dd80edc972d2a694eb4e94c65fd4794360a3c1c Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Mon, 22 Nov 2021 17:42:52 +0100 Subject: [PATCH 03/18] remove obsolete print --- app/javascript/stylesheets/_css-print.scss | 201 ------------------ .../stylesheets/gobierto-admin.scss | 2 +- .../stylesheets/gobierto-budgets.scss | 2 +- app/javascript/stylesheets/gobierto-cms.scss | 2 +- .../gobierto-dashboards-maker.scss | 2 +- .../gobierto-dashboards-viewer.scss | 2 +- app/javascript/stylesheets/gobierto-data.scss | 2 +- .../stylesheets/gobierto-exports.scss | 2 +- .../stylesheets/gobierto-indicators.scss | 2 +- .../stylesheets/gobierto-investments.scss | 2 +- .../stylesheets/gobierto-observatory.scss | 2 +- .../stylesheets/gobierto-people.scss | 2 +- .../stylesheets/gobierto-plans.scss | 2 +- app/javascript/stylesheets/gobierto-user.scss | 2 +- .../stylesheets/gobierto-visualizations.scss | 4 +- 15 files changed, 15 insertions(+), 216 deletions(-) delete mode 100644 app/javascript/stylesheets/_css-print.scss diff --git a/app/javascript/stylesheets/_css-print.scss b/app/javascript/stylesheets/_css-print.scss deleted file mode 100644 index 8463cae3d3..0000000000 --- a/app/javascript/stylesheets/_css-print.scss +++ /dev/null @@ -1,201 +0,0 @@ -@media print { - /* General reset */ - body { - counter-reset: section; - } - - @page { - margin: 1.5cm 0.7cm; - } - - header.meta { - display: none; - } - - .column.consultation { - max-width: none; - float: left; - } - - .consultation-info { - display: none; - } - - footer { - display: none; - } - - #consultation-desktop-app .pure-g { - flex-flow: column wrap; - -webkit-flex-flow: column wrap; - -ms-flex-flow: column wrap; - } - - .consultation-info, - .consultation-card { - display: none; - } - - .consultation-box { - margin: 0; - } - - .consultation-lead { - font-size: 16pt; - color: #111; - margin: 0; - margin-bottom: 5pt; - } - - /* Cards */ - .card-content { - padding: 0; - margin-bottom: 0.25cm; - padding-bottom: 0.25cm; - border-bottom: 1px solid #ccc; - margin-top: 0; - min-height: 80px; - page-break-inside: avoid; - display: block !important; - } - - .card-headline { - line-height: 1; - margin-bottom: 0; - padding: 0; - font-size: 12pt; - margin-right: 5pt; - color: #333; - display: inline-block; - } - - .card-headline::before { - counter-increment: section; - content: counter(section) ". "; - } - - .card-figure { - position: relative; - float: none; - display: inline-block; - color: #333; - font-weight: 400; - } - - .card-figure h2 { - display: inline-block; - color: #333; - } - - .card-figure::before { - content: "("; - font-size: 1.5em; - color: #333; - } - - .card-figure::after { - font-size: 1.5em; - color: #333; - content: ")"; - } - - .card-description { - padding: 0; - font-size: 9pt; - line-height: 1.5; - margin-bottom: 0; - color: #333; - width: 83%; - display: inline-block; - } - - .budget-ask { - box-shadow: none; - width: 15%; - padding: 0; - margin-bottom: 0; - float: right; - } - - .select-lead { - display: none; - } - - .desktop .pct { - padding: 0; - font-size: 11pt; - background: none; - margin-bottom: 0; - width: 105px; - position: relative; - text-align: left; - } - - .pct { - color: #111; - } - - .pct::after { - position: absolute; - right: 0; - content: ""; - border: 2px solid #111; - margin-left: 0.5rem; - padding: 0.25cm 0.4cm; - } - - .select-pct { - padding: 0; - background: white; - flex-flow: column wrap; - -webkit-flex-flow: column wrap; - -ms-flex-flow: column wrap; - } - - .border { - margin: 0; - } - - /* Admin */ - header.main, - menu.main, - .tabs { - display: none; - } - - .admin_content_column { - padding-top: none; - float: none; - } - - .card_container { - width: 20%; - display: inline-block; - min-height: auto; - margin-bottom: 2.5rem; - - .front { - position: relative; - padding: 0; - } - - .widget_figure { - font-size: 1.5rem; - } - } - - #table_report { - page-break-inside: avoid; - - tr td, - tr th { - color: #111 !important; - } - - .bg-scale--3, - .bg-scale--5, - .bg-scale--4 { - text-shadow: none; - } - } -} diff --git a/app/javascript/stylesheets/gobierto-admin.scss b/app/javascript/stylesheets/gobierto-admin.scss index 9473dce895..324fc6c42e 100644 --- a/app/javascript/stylesheets/gobierto-admin.scss +++ b/app/javascript/stylesheets/gobierto-admin.scss @@ -22,7 +22,7 @@ $font_serif: 'Georgia, serif'; @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults-admin"; @import "responsive"; diff --git a/app/javascript/stylesheets/gobierto-budgets.scss b/app/javascript/stylesheets/gobierto-budgets.scss index 1132e443f9..623baddf88 100644 --- a/app/javascript/stylesheets/gobierto-budgets.scss +++ b/app/javascript/stylesheets/gobierto-budgets.scss @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-cms.scss b/app/javascript/stylesheets/gobierto-cms.scss index 74d92a14d8..2b7e5e0d64 100644 --- a/app/javascript/stylesheets/gobierto-cms.scss +++ b/app/javascript/stylesheets/gobierto-cms.scss @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-dashboards-maker.scss b/app/javascript/stylesheets/gobierto-dashboards-maker.scss index 09cfa14a21..6647abee98 100644 --- a/app/javascript/stylesheets/gobierto-dashboards-maker.scss +++ b/app/javascript/stylesheets/gobierto-dashboards-maker.scss @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-dashboards-viewer.scss b/app/javascript/stylesheets/gobierto-dashboards-viewer.scss index 96ebd2d284..b9be453321 100644 --- a/app/javascript/stylesheets/gobierto-dashboards-viewer.scss +++ b/app/javascript/stylesheets/gobierto-dashboards-viewer.scss @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-data.scss b/app/javascript/stylesheets/gobierto-data.scss index a020011f47..d88d025d4d 100644 --- a/app/javascript/stylesheets/gobierto-data.scss +++ b/app/javascript/stylesheets/gobierto-data.scss @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-exports.scss b/app/javascript/stylesheets/gobierto-exports.scss index f466d45b01..91b4ccda54 100644 --- a/app/javascript/stylesheets/gobierto-exports.scss +++ b/app/javascript/stylesheets/gobierto-exports.scss @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-indicators.scss b/app/javascript/stylesheets/gobierto-indicators.scss index 1faa3cd003..2cfdb3ab5a 100644 --- a/app/javascript/stylesheets/gobierto-indicators.scss +++ b/app/javascript/stylesheets/gobierto-indicators.scss @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-investments.scss b/app/javascript/stylesheets/gobierto-investments.scss index 656302f4ab..8505743726 100644 --- a/app/javascript/stylesheets/gobierto-investments.scss +++ b/app/javascript/stylesheets/gobierto-investments.scss @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-observatory.scss b/app/javascript/stylesheets/gobierto-observatory.scss index 762da5d93d..0a7726798d 100644 --- a/app/javascript/stylesheets/gobierto-observatory.scss +++ b/app/javascript/stylesheets/gobierto-observatory.scss @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-people.scss b/app/javascript/stylesheets/gobierto-people.scss index 56ad079921..c91efab80c 100644 --- a/app/javascript/stylesheets/gobierto-people.scss +++ b/app/javascript/stylesheets/gobierto-people.scss @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-plans.scss b/app/javascript/stylesheets/gobierto-plans.scss index 5801c192c5..faa4a365c7 100644 --- a/app/javascript/stylesheets/gobierto-plans.scss +++ b/app/javascript/stylesheets/gobierto-plans.scss @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-user.scss b/app/javascript/stylesheets/gobierto-user.scss index 6c957b4bbd..b2e73f9c2e 100644 --- a/app/javascript/stylesheets/gobierto-user.scss +++ b/app/javascript/stylesheets/gobierto-user.scss @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-visualizations.scss b/app/javascript/stylesheets/gobierto-visualizations.scss index 1f1a637304..d7c7c532ff 100644 --- a/app/javascript/stylesheets/gobierto-visualizations.scss +++ b/app/javascript/stylesheets/gobierto-visualizations.scss @@ -9,7 +9,7 @@ @import "css-conf"; @import "populities"; @import "mixins"; -// @import "comp-breadcrumbs"; +@import "comp-breadcrumbs"; @import "comp-forms"; @import "comp-headings_blocks"; @import "comp-layout"; @@ -19,7 +19,7 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -@import "css-print"; +// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO From d69324a51ba086d3f408a61aa539da596016d2c7 Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Mon, 22 Nov 2021 17:44:04 +0100 Subject: [PATCH 04/18] remove comment --- app/javascript/stylesheets/gobierto-admin.scss | 1 - app/javascript/stylesheets/gobierto-budgets.scss | 1 - app/javascript/stylesheets/gobierto-cms.scss | 1 - app/javascript/stylesheets/gobierto-dashboards-maker.scss | 1 - app/javascript/stylesheets/gobierto-dashboards-viewer.scss | 1 - app/javascript/stylesheets/gobierto-data.scss | 1 - app/javascript/stylesheets/gobierto-exports.scss | 1 - app/javascript/stylesheets/gobierto-indicators.scss | 1 - app/javascript/stylesheets/gobierto-investments.scss | 1 - app/javascript/stylesheets/gobierto-observatory.scss | 1 - app/javascript/stylesheets/gobierto-people.scss | 1 - app/javascript/stylesheets/gobierto-plans.scss | 1 - app/javascript/stylesheets/gobierto-user.scss | 1 - app/javascript/stylesheets/gobierto-visualizations.scss | 3 +-- 14 files changed, 1 insertion(+), 15 deletions(-) diff --git a/app/javascript/stylesheets/gobierto-admin.scss b/app/javascript/stylesheets/gobierto-admin.scss index 324fc6c42e..879b09687a 100644 --- a/app/javascript/stylesheets/gobierto-admin.scss +++ b/app/javascript/stylesheets/gobierto-admin.scss @@ -22,7 +22,6 @@ $font_serif: 'Georgia, serif'; @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults-admin"; @import "responsive"; diff --git a/app/javascript/stylesheets/gobierto-budgets.scss b/app/javascript/stylesheets/gobierto-budgets.scss index 623baddf88..15bf1de368 100644 --- a/app/javascript/stylesheets/gobierto-budgets.scss +++ b/app/javascript/stylesheets/gobierto-budgets.scss @@ -19,7 +19,6 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-cms.scss b/app/javascript/stylesheets/gobierto-cms.scss index 2b7e5e0d64..065a720efe 100644 --- a/app/javascript/stylesheets/gobierto-cms.scss +++ b/app/javascript/stylesheets/gobierto-cms.scss @@ -19,7 +19,6 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-dashboards-maker.scss b/app/javascript/stylesheets/gobierto-dashboards-maker.scss index 6647abee98..ad66ad1f64 100644 --- a/app/javascript/stylesheets/gobierto-dashboards-maker.scss +++ b/app/javascript/stylesheets/gobierto-dashboards-maker.scss @@ -19,7 +19,6 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-dashboards-viewer.scss b/app/javascript/stylesheets/gobierto-dashboards-viewer.scss index b9be453321..6617e2d04e 100644 --- a/app/javascript/stylesheets/gobierto-dashboards-viewer.scss +++ b/app/javascript/stylesheets/gobierto-dashboards-viewer.scss @@ -19,7 +19,6 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-data.scss b/app/javascript/stylesheets/gobierto-data.scss index d88d025d4d..05221b14d4 100644 --- a/app/javascript/stylesheets/gobierto-data.scss +++ b/app/javascript/stylesheets/gobierto-data.scss @@ -19,7 +19,6 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-exports.scss b/app/javascript/stylesheets/gobierto-exports.scss index 91b4ccda54..52910a755f 100644 --- a/app/javascript/stylesheets/gobierto-exports.scss +++ b/app/javascript/stylesheets/gobierto-exports.scss @@ -19,7 +19,6 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-indicators.scss b/app/javascript/stylesheets/gobierto-indicators.scss index 2cfdb3ab5a..c78a204585 100644 --- a/app/javascript/stylesheets/gobierto-indicators.scss +++ b/app/javascript/stylesheets/gobierto-indicators.scss @@ -19,7 +19,6 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-investments.scss b/app/javascript/stylesheets/gobierto-investments.scss index 8505743726..978cfef9eb 100644 --- a/app/javascript/stylesheets/gobierto-investments.scss +++ b/app/javascript/stylesheets/gobierto-investments.scss @@ -19,7 +19,6 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-observatory.scss b/app/javascript/stylesheets/gobierto-observatory.scss index 0a7726798d..6109565e75 100644 --- a/app/javascript/stylesheets/gobierto-observatory.scss +++ b/app/javascript/stylesheets/gobierto-observatory.scss @@ -19,7 +19,6 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-people.scss b/app/javascript/stylesheets/gobierto-people.scss index c91efab80c..49a21f2625 100644 --- a/app/javascript/stylesheets/gobierto-people.scss +++ b/app/javascript/stylesheets/gobierto-people.scss @@ -19,7 +19,6 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-plans.scss b/app/javascript/stylesheets/gobierto-plans.scss index faa4a365c7..cfda60c823 100644 --- a/app/javascript/stylesheets/gobierto-plans.scss +++ b/app/javascript/stylesheets/gobierto-plans.scss @@ -19,7 +19,6 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-user.scss b/app/javascript/stylesheets/gobierto-user.scss index b2e73f9c2e..d7dd47f7fe 100644 --- a/app/javascript/stylesheets/gobierto-user.scss +++ b/app/javascript/stylesheets/gobierto-user.scss @@ -19,7 +19,6 @@ @import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-visualizations.scss b/app/javascript/stylesheets/gobierto-visualizations.scss index d7c7c532ff..b5d148b229 100644 --- a/app/javascript/stylesheets/gobierto-visualizations.scss +++ b/app/javascript/stylesheets/gobierto-visualizations.scss @@ -17,9 +17,8 @@ @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; -@import "comp-tipsy"; +// @import "comp-tipsy"; @import "comp-flash_messages"; -// @import "css-print"; @import "defaults"; @import "responsive"; // END TODO From 1ed452d3b938cbeda65f44b327acf2c81d1ce9bf Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Mon, 22 Nov 2021 18:27:16 +0100 Subject: [PATCH 05/18] remove responsive file all styles merges into their respectives merge dc with the related file --- .../stylesheets/_comp-breadcrumbs.scss | 10 + .../stylesheets/_comp-budget_vis.scss | 44 ++++- app/javascript/stylesheets/_comp-forms.scss | 10 + .../stylesheets/_comp-graph-dc.scss | 2 + .../stylesheets/_comp-headings_blocks.scss | 11 ++ app/javascript/stylesheets/_comp-layout.scss | 9 + .../stylesheets/_comp-metric_boxes.scss | 59 ++++++ .../stylesheets/_comp-social_buttons.scss | 6 + app/javascript/stylesheets/_comp-tables.scss | 23 +++ app/javascript/stylesheets/_comp-tabs.scss | 9 + app/javascript/stylesheets/_responsive.scss | 177 ------------------ .../stylesheets/gobierto-admin.scss | 1 - .../stylesheets/gobierto-budgets.scss | 2 - app/javascript/stylesheets/gobierto-cms.scss | 1 - .../gobierto-dashboards-maker.scss | 1 - .../gobierto-dashboards-viewer.scss | 1 - app/javascript/stylesheets/gobierto-data.scss | 1 - .../stylesheets/gobierto-exports.scss | 1 - .../stylesheets/gobierto-indicators.scss | 1 - .../stylesheets/gobierto-investments.scss | 1 - .../stylesheets/gobierto-observatory.scss | 2 - .../stylesheets/gobierto-people.scss | 1 - .../stylesheets/gobierto-plans.scss | 1 - app/javascript/stylesheets/gobierto-user.scss | 1 - .../stylesheets/gobierto-visualizations.scss | 7 - 25 files changed, 182 insertions(+), 200 deletions(-) delete mode 100644 app/javascript/stylesheets/_responsive.scss diff --git a/app/javascript/stylesheets/_comp-breadcrumbs.scss b/app/javascript/stylesheets/_comp-breadcrumbs.scss index edc717bffa..46227587bd 100644 --- a/app/javascript/stylesheets/_comp-breadcrumbs.scss +++ b/app/javascript/stylesheets/_comp-breadcrumbs.scss @@ -17,6 +17,16 @@ a:first-child { margin-left: 0; } + + @include screen(740) { + padding: 0.75em 0; + margin: 0 0 0.5em 0; + + .bread_links { + line-height: 1.3em; + font-size: 0.75em; + } + } } .breadcrumb.is_stuck { diff --git a/app/javascript/stylesheets/_comp-budget_vis.scss b/app/javascript/stylesheets/_comp-budget_vis.scss index bfc4f698f7..83d0e44a1c 100644 --- a/app/javascript/stylesheets/_comp-budget_vis.scss +++ b/app/javascript/stylesheets/_comp-budget_vis.scss @@ -46,6 +46,34 @@ small { line-height: 0.5em; } + + @include screen(740) { + .cont { + padding: 2em 1em; + text-align: center; + } + + .title { + padding: 0; + border: 0; + text-align: center; + margin: 0 0 1em 0; + font-size: 1.1em; + } + + .ic { + margin: 0 0 0.5em 0; + + label { + height: initial; + display: block; + } + } + + .highlight { + margin: 0.25em 0; + } + } } .explore_detail { @@ -98,6 +126,12 @@ } } } + + @include screen(740) { + [data-budget-lines] { + padding: 0; + } + } } /* @@ -125,6 +159,15 @@ } } + @include screen(740) { + .line_description { + p { + font-size: 0.85em; + line-height: 1.3em; + } + } + } + .metric_boxes { margin-bottom: 2em; } @@ -517,4 +560,3 @@ margin-top: 20px; } } - diff --git a/app/javascript/stylesheets/_comp-forms.scss b/app/javascript/stylesheets/_comp-forms.scss index cf4ed7d31d..c15b936b7d 100644 --- a/app/javascript/stylesheets/_comp-forms.scss +++ b/app/javascript/stylesheets/_comp-forms.scss @@ -862,6 +862,16 @@ select { height: 40px; width: 300px; } + + @include screen(740) { + text-align: center; + margin: 0 0 1em 0; + + input[type=text] { + width: calc(100%); + margin: 0; + } + } } .attach_file input[type=file] { diff --git a/app/javascript/stylesheets/_comp-graph-dc.scss b/app/javascript/stylesheets/_comp-graph-dc.scss index 0aa4616b1e..e8c527e9ea 100644 --- a/app/javascript/stylesheets/_comp-graph-dc.scss +++ b/app/javascript/stylesheets/_comp-graph-dc.scss @@ -1,3 +1,5 @@ +@import "dc/dist/style/dc.css"; + .graph-title { text-transform: uppercase; border-bottom: 2px solid $color_main_soft; diff --git a/app/javascript/stylesheets/_comp-headings_blocks.scss b/app/javascript/stylesheets/_comp-headings_blocks.scss index 72e7946b74..1e7960da7c 100644 --- a/app/javascript/stylesheets/_comp-headings_blocks.scss +++ b/app/javascript/stylesheets/_comp-headings_blocks.scss @@ -110,6 +110,17 @@ h4 { top: -0.5em; } } + + @include screen(740) { + h2 { + margin: 0.5em 0; + } + + .description { + width: 100%; + margin: 0 0 1em 0; + } + } } .with_separator { diff --git a/app/javascript/stylesheets/_comp-layout.scss b/app/javascript/stylesheets/_comp-layout.scss index b59ffa08eb..525fb04ff1 100644 --- a/app/javascript/stylesheets/_comp-layout.scss +++ b/app/javascript/stylesheets/_comp-layout.scss @@ -6,6 +6,11 @@ width: calc(100% - 6rem); max-width: 1400px; margin: auto; + + @include screen(740) { + width: initial; + margin: auto 1em; + } } .main_content { @@ -35,6 +40,10 @@ footer { .logo { max-width: 275px; + + @include screen(740) { + max-width: 100%; + } } ul { diff --git a/app/javascript/stylesheets/_comp-metric_boxes.scss b/app/javascript/stylesheets/_comp-metric_boxes.scss index a2d4dd5f40..adfa5a81f8 100644 --- a/app/javascript/stylesheets/_comp-metric_boxes.scss +++ b/app/javascript/stylesheets/_comp-metric_boxes.scss @@ -161,3 +161,62 @@ } } } + +@include screen(740) { + .metric_boxes { + margin: 0 0 2em 0; + + .metric_box { + .inner { + margin: 0; + min-height: initial; + padding: 0.5em; + } + + h3 { + font-size: 0.85em; + min-height: initial; + line-height: 1em; + } + + .metric { + font-size: 1.6em; + } + + .explanation { + bottom: 0.2em; + } + + span.not_av { + font-size: 0.6em; + } + } + + .metric_box:nth-child(1n) { + .inner { + margin: 0 0.5em 1em 0; + } + } + + .metric_box:nth-child(2n) { + .inner { + margin: 0 0 1em 0.5em; + } + } + + .metric_box:last-child { + width: 100%; + + .inner { + margin: 0; + min-height: initial; + } + } + + .metric_box.cta { + a { + padding: 0.5em; + } + } + } +} diff --git a/app/javascript/stylesheets/_comp-social_buttons.scss b/app/javascript/stylesheets/_comp-social_buttons.scss index 6c758603df..35a67da662 100644 --- a/app/javascript/stylesheets/_comp-social_buttons.scss +++ b/app/javascript/stylesheets/_comp-social_buttons.scss @@ -118,6 +118,12 @@ box-sizing: border-box; text-align: center; } + + @include screen(740) { + position: fixed; + bottom: 1em; + left: 1em; + } } @include min-screen(740) { diff --git a/app/javascript/stylesheets/_comp-tables.scss b/app/javascript/stylesheets/_comp-tables.scss index b049d400d1..d97253c950 100644 --- a/app/javascript/stylesheets/_comp-tables.scss +++ b/app/javascript/stylesheets/_comp-tables.scss @@ -44,6 +44,21 @@ table { padding-bottom: 1em; } } + + @include screen(740) { + td, + th { + padding: 0.25em 0.4em; + line-height: 1.2em; + } + + td.bar, + th.bar { + display: none; + padding: 0; + width: 30px; + } + } } tr { @@ -128,6 +143,14 @@ table.explore_slow { } } + @include screen(740) { + td { + padding: 0.5em 0.5em 0.5em 0; + font-size: 0.7em; + line-height: 1.2em; + } + } + td.level_1 { font-size: 0.75em; padding-left: 0; diff --git a/app/javascript/stylesheets/_comp-tabs.scss b/app/javascript/stylesheets/_comp-tabs.scss index b1175d18e4..021c64d840 100644 --- a/app/javascript/stylesheets/_comp-tabs.scss +++ b/app/javascript/stylesheets/_comp-tabs.scss @@ -49,6 +49,15 @@ margin-bottom: -1px; } } + + @include screen(740) { + li { + a { + padding: 0.75em 1.5em 0.25em; + margin: 0 0.2em; + } + } + } } } diff --git a/app/javascript/stylesheets/_responsive.scss b/app/javascript/stylesheets/_responsive.scss deleted file mode 100644 index 2a8812f54e..0000000000 --- a/app/javascript/stylesheets/_responsive.scss +++ /dev/null @@ -1,177 +0,0 @@ -@include screen(740) { - .column { - width: initial; - margin: auto 1em; - } - - .block { - h2 { - margin: 0.5em 0; - } - - .description { - width: 100%; - margin: 0 0 1em 0; - } - } - - .metric_boxes { - margin: 0 0 2em 0; - - .metric_box { - .inner { - margin: 0; - min-height: initial; - padding: 0.5em; - } - - h3 { - font-size: 0.85em; - min-height: initial; - line-height: 1em; - } - - .metric { - font-size: 1.6em; - } - - .explanation { - bottom: 0.2em; - } - - span.not_av { - font-size: 0.6em; - } - } - - .metric_box:nth-child(1n) { - .inner { - margin: 0 0.5em 1em 0; - } - } - - .metric_box:nth-child(2n) { - .inner { - margin: 0 0 1em 0.5em; - } - } - - .metric_box:last-child { - width: 100%; - - .inner { - margin: 0; - min-height: initial; - } - } - - .metric_box.cta { - a { - padding: 0.5em; - } - } - } - - table { - td, - th { - padding: 0.25em 0.4em; - line-height: 1.2em; - } - - td.bar, - th.bar { - display: none; - padding: 0; - width: 30px; - } - } - - table.explore_slow { - td { - padding: 0.5em 0.5em 0.5em 0; - font-size: 0.7em; - line-height: 1.2em; - } - } - - .slim_search { - text-align: center; - margin: 0 0 1em 0; - - input[type=text] { - width: calc(100%); - margin: 0; - } - } - - .featured_b_l { - .cont { - padding: 2em 1em; - text-align: center; - } - - .title { - padding: 0; - border: 0; - text-align: center; - margin: 0 0 1em 0; - font-size: 1.1em; - } - - .ic { - margin: 0 0 0.5em 0; - - label { - height: initial; - display: block; - } - } - - .highlight { - margin: 0.25em 0; - } - } - - .table.p_h_r_3 { - padding: 0; - } - - .tabs { - li { - a { - padding: 0.75em 1.5em 0.25em; - margin: 0 0.2em; - } - } - } - - .social_links_container { - position: fixed; - bottom: 1em; - left: 1em; - } - - .budget_line { - .line_description { - p { - font-size: 0.85em; - line-height: 1.3em; - } - } - } - - .breadcrumb { - padding: 0.75em 0; - margin: 0 0 0.5em 0; - - .bread_links { - line-height: 1.3em; - font-size: 0.75em; - } - } - - footer .logo { - max-width: 100%; - } -} diff --git a/app/javascript/stylesheets/gobierto-admin.scss b/app/javascript/stylesheets/gobierto-admin.scss index 879b09687a..2642d8277c 100644 --- a/app/javascript/stylesheets/gobierto-admin.scss +++ b/app/javascript/stylesheets/gobierto-admin.scss @@ -23,7 +23,6 @@ $font_serif: 'Georgia, serif'; @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults-admin"; -@import "responsive"; @import url("https://fonts.googleapis.com/css?family=Libre+Franklin:200,400,700,600"); diff --git a/app/javascript/stylesheets/gobierto-budgets.scss b/app/javascript/stylesheets/gobierto-budgets.scss index 15bf1de368..b0df4e7bd4 100644 --- a/app/javascript/stylesheets/gobierto-budgets.scss +++ b/app/javascript/stylesheets/gobierto-budgets.scss @@ -20,12 +20,10 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; // END TODO @import "comp-metric_boxes"; @import "comp-indicator_widget"; -@import "dc/dist/style/dc.css"; @import "comp-graph-dc"; @import "comp-graph-vis_bubbles"; @import "comp-filters"; diff --git a/app/javascript/stylesheets/gobierto-cms.scss b/app/javascript/stylesheets/gobierto-cms.scss index 065a720efe..52bf16af00 100644 --- a/app/javascript/stylesheets/gobierto-cms.scss +++ b/app/javascript/stylesheets/gobierto-cms.scss @@ -20,7 +20,6 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; // END TODO @import "comp-text_content"; diff --git a/app/javascript/stylesheets/gobierto-dashboards-maker.scss b/app/javascript/stylesheets/gobierto-dashboards-maker.scss index ad66ad1f64..c89b2f8e88 100644 --- a/app/javascript/stylesheets/gobierto-dashboards-maker.scss +++ b/app/javascript/stylesheets/gobierto-dashboards-maker.scss @@ -20,7 +20,6 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; // END TODO @import "comp-vue-transitions"; diff --git a/app/javascript/stylesheets/gobierto-dashboards-viewer.scss b/app/javascript/stylesheets/gobierto-dashboards-viewer.scss index 6617e2d04e..b0bd9a1c89 100644 --- a/app/javascript/stylesheets/gobierto-dashboards-viewer.scss +++ b/app/javascript/stylesheets/gobierto-dashboards-viewer.scss @@ -20,7 +20,6 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; // END TODO @import "comp-vue-transitions"; diff --git a/app/javascript/stylesheets/gobierto-data.scss b/app/javascript/stylesheets/gobierto-data.scss index 05221b14d4..61d7158bcc 100644 --- a/app/javascript/stylesheets/gobierto-data.scss +++ b/app/javascript/stylesheets/gobierto-data.scss @@ -20,7 +20,6 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; // END TODO @import "comp-vue-filters"; diff --git a/app/javascript/stylesheets/gobierto-exports.scss b/app/javascript/stylesheets/gobierto-exports.scss index 52910a755f..d711aed6de 100644 --- a/app/javascript/stylesheets/gobierto-exports.scss +++ b/app/javascript/stylesheets/gobierto-exports.scss @@ -20,7 +20,6 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; // END TODO @import "comp-text_content"; diff --git a/app/javascript/stylesheets/gobierto-indicators.scss b/app/javascript/stylesheets/gobierto-indicators.scss index c78a204585..2d63ea2b75 100644 --- a/app/javascript/stylesheets/gobierto-indicators.scss +++ b/app/javascript/stylesheets/gobierto-indicators.scss @@ -20,7 +20,6 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; // END TODO @import "comp-tree"; diff --git a/app/javascript/stylesheets/gobierto-investments.scss b/app/javascript/stylesheets/gobierto-investments.scss index 978cfef9eb..c5b40b5cef 100644 --- a/app/javascript/stylesheets/gobierto-investments.scss +++ b/app/javascript/stylesheets/gobierto-investments.scss @@ -20,7 +20,6 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; // END TODO @import "comp-vue-table"; diff --git a/app/javascript/stylesheets/gobierto-observatory.scss b/app/javascript/stylesheets/gobierto-observatory.scss index 6109565e75..280005e267 100644 --- a/app/javascript/stylesheets/gobierto-observatory.scss +++ b/app/javascript/stylesheets/gobierto-observatory.scss @@ -20,10 +20,8 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; // END TODO -@import "dc/dist/style/dc.css"; @import "comp-graph-dc"; @import "comp-graph-vis_population_pyramid"; @import "comp-indicator_widget"; diff --git a/app/javascript/stylesheets/gobierto-people.scss b/app/javascript/stylesheets/gobierto-people.scss index 49a21f2625..a34f713502 100644 --- a/app/javascript/stylesheets/gobierto-people.scss +++ b/app/javascript/stylesheets/gobierto-people.scss @@ -20,7 +20,6 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; // END TODO @import "comp-tabs"; diff --git a/app/javascript/stylesheets/gobierto-plans.scss b/app/javascript/stylesheets/gobierto-plans.scss index cfda60c823..618c1f0961 100644 --- a/app/javascript/stylesheets/gobierto-plans.scss +++ b/app/javascript/stylesheets/gobierto-plans.scss @@ -20,7 +20,6 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; // END TODO @import "comp-plans-custom"; diff --git a/app/javascript/stylesheets/gobierto-user.scss b/app/javascript/stylesheets/gobierto-user.scss index d7dd47f7fe..41439f7858 100644 --- a/app/javascript/stylesheets/gobierto-user.scss +++ b/app/javascript/stylesheets/gobierto-user.scss @@ -20,5 +20,4 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; // END TODO diff --git a/app/javascript/stylesheets/gobierto-visualizations.scss b/app/javascript/stylesheets/gobierto-visualizations.scss index b5d148b229..8c61c86edf 100644 --- a/app/javascript/stylesheets/gobierto-visualizations.scss +++ b/app/javascript/stylesheets/gobierto-visualizations.scss @@ -5,25 +5,18 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; -@import "comp-breadcrumbs"; @import "comp-forms"; @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; @import "comp-tables"; @import "comp-header_block_inline"; -@import "comp-social_buttons"; -// @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -@import "responsive"; -// END TODO -@import "dc/dist/style/dc.css"; @import "comp-metric_boxes"; @import "comp-graph-dc"; @import "comp-vue-block-checkbox"; From 4942d3202487ad2a69cac6101684243bc4fa4244 Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Mon, 22 Nov 2021 18:30:14 +0100 Subject: [PATCH 06/18] remove old files citizen-charters --- app/javascript/gobierto_charters/.eslintrc | 5 -- app/javascript/gobierto_charters/index.js | 2 - .../modules/charters_controller.js | 53 ------------------- .../gobierto_charters/modules/init.js | 7 --- app/javascript/packs/charters.js | 12 ----- app/javascript/stylesheets/_mixins.scss | 30 ----------- 6 files changed, 109 deletions(-) delete mode 100644 app/javascript/gobierto_charters/.eslintrc delete mode 100644 app/javascript/gobierto_charters/index.js delete mode 100644 app/javascript/gobierto_charters/modules/charters_controller.js delete mode 100644 app/javascript/gobierto_charters/modules/init.js delete mode 100644 app/javascript/packs/charters.js diff --git a/app/javascript/gobierto_charters/.eslintrc b/app/javascript/gobierto_charters/.eslintrc deleted file mode 100644 index a3e800722c..0000000000 --- a/app/javascript/gobierto_charters/.eslintrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "globals": { - "GobiertoCharters": true, - }, -} diff --git a/app/javascript/gobierto_charters/index.js b/app/javascript/gobierto_charters/index.js deleted file mode 100644 index 37ffd2f148..0000000000 --- a/app/javascript/gobierto_charters/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import './modules/init.js' -import './modules/charters_controller.js' diff --git a/app/javascript/gobierto_charters/modules/charters_controller.js b/app/javascript/gobierto_charters/modules/charters_controller.js deleted file mode 100644 index a5ea74936f..0000000000 --- a/app/javascript/gobierto_charters/modules/charters_controller.js +++ /dev/null @@ -1,53 +0,0 @@ -import { Sparkline } from 'lib/visualizations' - -window.GobiertoCharters.ChartersController = (function() { - - function ChartersController() {} - - ChartersController.prototype.show = function(opts){ - - // DEBUG: Esta funcion DEBE ser eliminada cuando se obtengan datos verdaderos - function mock(length = 2) { - let json = []; - for (var i = 0; i < length; i++) { - json.push({ - date: new Date().getFullYear() - i, - value: Math.floor(Math.random() * Math.floor(100)) - }) - } - return json - } - - function _parseNumericStrings(data) { - for (let i in data) { - data[i].value = parseFloat(data[i].value) - } - return data - } - - const $sparklines = $('.sparkline') - - $sparklines.each((i, container) => { - let options = { - axes: true, - aspectRatio: 3, - margins: { - top: 0, - bottom: 0, - left: 0, - right: 0 - }, - freq: opts.freq - } - - if (opts.sparklinesData[container.id] && opts.sparklinesData[container.id].length > 1 && $(`#${container.id} svg`).length === 0) { - let chart = new Sparkline(`#${container.id}`, _parseNumericStrings(opts.sparklinesData[container.id]), options) - chart.render() - } - }) - }; - - return ChartersController; -})(); - -window.GobiertoCharters.charters_controller = new GobiertoCharters.ChartersController; diff --git a/app/javascript/gobierto_charters/modules/init.js b/app/javascript/gobierto_charters/modules/init.js deleted file mode 100644 index d78492486f..0000000000 --- a/app/javascript/gobierto_charters/modules/init.js +++ /dev/null @@ -1,7 +0,0 @@ -window.GobiertoCharters = { - init: function() {} -}; - -$(document).ready(function() { - return GobiertoCharters.init(); -}); diff --git a/app/javascript/packs/charters.js b/app/javascript/packs/charters.js deleted file mode 100644 index f4485320bf..0000000000 --- a/app/javascript/packs/charters.js +++ /dev/null @@ -1,12 +0,0 @@ -/* eslint no-console:0 */ -// This file is automatically compiled by Webpack, along with any other files -// present in this directory. You're encouraged to place your actual application logic in -// a relevant structure within app/javascript and only use these pack files to reference -// that code so it'll be compiled. -// -// To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate -// layout file, like app/views/layouts/application.html.erb - -import 'lib/commons' -import 'gobierto_charters' -import 'lib/i18n' diff --git a/app/javascript/stylesheets/_mixins.scss b/app/javascript/stylesheets/_mixins.scss index 49b8170ea1..3cd1398019 100644 --- a/app/javascript/stylesheets/_mixins.scss +++ b/app/javascript/stylesheets/_mixins.scss @@ -197,33 +197,3 @@ $units: 1px !default; -khtml-border-radius: $radius; border-radius: $radius; } - -// LEGACY, better use grid() -// (still used in citizen-charters) -@mixin flexgrid($gap: 0, $columns: 3) { - $unit: 1rem !default; - $gutter: if(unitless($gap), $gap * $unit, $gap); - - flex: 1 0 calc((100% / #{$columns}) - #{$gutter}); - margin: $gap * 0.5; - box-sizing: border-box; - - &:nth-of-type(#{$columns}n + 1) { - margin-left: 0; - } - - &:nth-of-type(#{$columns}n), - &:nth-last-of-type(1) { - margin-right: 0; - } - - &:nth-of-type(-n + #{$columns}) { - margin-top: 0; - } - - // targets to the last row items - &:nth-of-type(#{$columns}n + 1):nth-last-of-type(-n + #{$columns}), - &:nth-of-type(#{$columns}n + 1):nth-last-of-type(-n + #{$columns}) ~ * { - margin-bottom: 0; - } -} From 8224d0f7527b330220b8abf35b9d63ba735e67e4 Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Mon, 22 Nov 2021 18:32:37 +0100 Subject: [PATCH 07/18] non-required stuff for exports --- app/javascript/gobierto_exports/.eslintrc | 5 ----- app/javascript/gobierto_exports/index.js | 1 - app/javascript/gobierto_exports/modules/application.js | 3 --- 3 files changed, 9 deletions(-) delete mode 100644 app/javascript/gobierto_exports/.eslintrc delete mode 100644 app/javascript/gobierto_exports/modules/application.js diff --git a/app/javascript/gobierto_exports/.eslintrc b/app/javascript/gobierto_exports/.eslintrc deleted file mode 100644 index 1c847ea991..0000000000 --- a/app/javascript/gobierto_exports/.eslintrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "globals": { - "GobiertoBudgets": true, - }, -} \ No newline at end of file diff --git a/app/javascript/gobierto_exports/index.js b/app/javascript/gobierto_exports/index.js index 7059facddd..a8b1da9247 100644 --- a/app/javascript/gobierto_exports/index.js +++ b/app/javascript/gobierto_exports/index.js @@ -1,2 +1 @@ import "../stylesheets/gobierto-exports.scss" -import './modules/application.js' diff --git a/app/javascript/gobierto_exports/modules/application.js b/app/javascript/gobierto_exports/modules/application.js deleted file mode 100644 index 3ff9ad1213..0000000000 --- a/app/javascript/gobierto_exports/modules/application.js +++ /dev/null @@ -1,3 +0,0 @@ -import { isDesktop, AUTOCOMPLETE_DEFAULTS } from 'lib/shared' -import Turbolinks from 'turbolinks' -import 'tipsy-1a' From e5e411a74b0b4ba5fb26d5ae4af031670fb824c3 Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Mon, 22 Nov 2021 18:38:11 +0100 Subject: [PATCH 08/18] barely used functions --- app/javascript/gobierto_budgets/modules/application.js | 4 ++-- app/javascript/lib/shared/index.js | 3 --- app/javascript/lib/shared/modules/globals.js | 9 --------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/javascript/gobierto_budgets/modules/application.js b/app/javascript/gobierto_budgets/modules/application.js index fd925d83f7..1c1d934f14 100644 --- a/app/javascript/gobierto_budgets/modules/application.js +++ b/app/javascript/gobierto_budgets/modules/application.js @@ -1,5 +1,5 @@ import "devbridge-autocomplete"; -import { AUTOCOMPLETE_DEFAULTS, isDesktop } from "lib/shared"; +import { AUTOCOMPLETE_DEFAULTS } from "lib/shared"; import { VisBubbleLegend, VisBubbles, @@ -45,7 +45,7 @@ $(document).on("turbolinks:load ajax:complete ajaxSuccess", function() { }); $(document).on("turbolinks:load", function() { - if (!isDesktop()) { + if (!($(window).width() > 740)) { $(".open_line_browser").hide(); } diff --git a/app/javascript/lib/shared/index.js b/app/javascript/lib/shared/index.js index d3707c7d49..9d15963ef4 100644 --- a/app/javascript/lib/shared/index.js +++ b/app/javascript/lib/shared/index.js @@ -2,7 +2,6 @@ import { AUTOCOMPLETE_DEFAULTS } from "./modules/autocomplete_settings.js"; import { URLParams } from "./modules/URLParams.js"; import d3locale from "./modules/d3-locale.js"; -import { isDesktop, isMobile } from "./modules/globals.js"; import { createScaleColors } from "./modules/createScaleColors.js"; import { slugString } from "./modules/slugString.js"; import accounting from "accounting"; @@ -24,8 +23,6 @@ export { accounting, createScaleColors, d3locale, - isDesktop, - isMobile, URLParams, RangeSlider, Datepicker, diff --git a/app/javascript/lib/shared/modules/globals.js b/app/javascript/lib/shared/modules/globals.js index 61320f29d6..d119d97a38 100644 --- a/app/javascript/lib/shared/modules/globals.js +++ b/app/javascript/lib/shared/modules/globals.js @@ -1,14 +1,5 @@ import "tipsy-1a"; -// Global util functions -export function isDesktop() { - return $(window).width() > 740; -} - -export function isMobile() { - return !isDesktop(); -} - /* Toggle text method */ $.fn.extend({ toggleText: function(a, b) { From 7f1c17349ae743db8bd3a730f753b00b6bba44a7 Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Tue, 23 Nov 2021 10:29:03 +0100 Subject: [PATCH 09/18] Update gobierto-user.scss --- app/javascript/stylesheets/gobierto-user.scss | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/javascript/stylesheets/gobierto-user.scss b/app/javascript/stylesheets/gobierto-user.scss index 41439f7858..de7b156b77 100644 --- a/app/javascript/stylesheets/gobierto-user.scss +++ b/app/javascript/stylesheets/gobierto-user.scss @@ -5,19 +5,12 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; -@import "comp-breadcrumbs"; @import "comp-forms"; @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-tables"; -@import "comp-header_block_inline"; -@import "comp-social_buttons"; -@import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -// END TODO From 01e44777ba4f915517fd3e2f8355c40a409a6c5d Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Tue, 23 Nov 2021 10:33:48 +0100 Subject: [PATCH 10/18] datepicker styles are called in javascript --- app/javascript/stylesheets/gobierto-admin.scss | 1 - app/javascript/stylesheets/gobierto-people.scss | 1 - app/javascript/stylesheets/gobierto-plans.scss | 1 - 3 files changed, 3 deletions(-) diff --git a/app/javascript/stylesheets/gobierto-admin.scss b/app/javascript/stylesheets/gobierto-admin.scss index 2642d8277c..e673bbb733 100644 --- a/app/javascript/stylesheets/gobierto-admin.scss +++ b/app/javascript/stylesheets/gobierto-admin.scss @@ -36,7 +36,6 @@ $font_serif: 'Georgia, serif'; @import "comp-modals"; @import "magnific-popup/dist/magnific-popup.css"; @import "comp-magnific-popup-animations"; -@import "air-datepicker/dist/css/datepicker.css"; @import "cropperjs/dist/cropper.css"; @import "comp-simplemde_editor"; @import "simplemde/src/css/simplemde.css"; diff --git a/app/javascript/stylesheets/gobierto-people.scss b/app/javascript/stylesheets/gobierto-people.scss index a34f713502..c8ca8dd017 100644 --- a/app/javascript/stylesheets/gobierto-people.scss +++ b/app/javascript/stylesheets/gobierto-people.scss @@ -27,7 +27,6 @@ @import "comp-agenda"; @import "comp-modals"; @import "fullcalendar/dist/fullcalendar.css"; -@import "air-datepicker/dist/css/datepicker.css"; body.gobierto_people { .block + .person-item { diff --git a/app/javascript/stylesheets/gobierto-plans.scss b/app/javascript/stylesheets/gobierto-plans.scss index 618c1f0961..8567272afa 100644 --- a/app/javascript/stylesheets/gobierto-plans.scss +++ b/app/javascript/stylesheets/gobierto-plans.scss @@ -26,7 +26,6 @@ @import "comp-vue-block-checkbox"; @import "comp-vue-transitions"; @import "comp-sdg"; -@import "air-datepicker/dist/css/datepicker.css"; // Vars $nodeLevel1IllustrationWidth: 33%; From 3c598e25fd1e351b7afb39fa26e2b12cc93bbf74 Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Tue, 23 Nov 2021 11:02:14 +0100 Subject: [PATCH 11/18] dashboards must not interfere with entrypoints --- .../stylesheets/gobierto-dashboards-maker.scss | 13 ------------- .../stylesheets/gobierto-dashboards-viewer.scss | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/app/javascript/stylesheets/gobierto-dashboards-maker.scss b/app/javascript/stylesheets/gobierto-dashboards-maker.scss index c89b2f8e88..df58401da8 100644 --- a/app/javascript/stylesheets/gobierto-dashboards-maker.scss +++ b/app/javascript/stylesheets/gobierto-dashboards-maker.scss @@ -5,22 +5,9 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; -@import "comp-breadcrumbs"; -@import "comp-forms"; -@import "comp-headings_blocks"; -@import "comp-layout"; -@import "comp-site_header"; -@import "comp-tables"; -@import "comp-header_block_inline"; -@import "comp-social_buttons"; -@import "comp-tipsy"; -@import "comp-flash_messages"; -@import "defaults"; -// END TODO @import "comp-vue-transitions"; @import "comp-vue-text-editable"; diff --git a/app/javascript/stylesheets/gobierto-dashboards-viewer.scss b/app/javascript/stylesheets/gobierto-dashboards-viewer.scss index b0bd9a1c89..ac84d0ea44 100644 --- a/app/javascript/stylesheets/gobierto-dashboards-viewer.scss +++ b/app/javascript/stylesheets/gobierto-dashboards-viewer.scss @@ -5,22 +5,9 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; -@import "comp-breadcrumbs"; -@import "comp-forms"; -@import "comp-headings_blocks"; -@import "comp-layout"; -@import "comp-site_header"; -@import "comp-tables"; -@import "comp-header_block_inline"; -@import "comp-social_buttons"; -@import "comp-tipsy"; -@import "comp-flash_messages"; -@import "defaults"; -// END TODO @import "comp-vue-transitions"; From 68dfca435eeebfb65e3afe328c6b5870a408f111 Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Tue, 23 Nov 2021 11:06:20 +0100 Subject: [PATCH 12/18] plans clean code --- app/javascript/stylesheets/gobierto-plans.scss | 6 ------ app/javascript/stylesheets/gobierto-visualizations.scss | 1 - 2 files changed, 7 deletions(-) diff --git a/app/javascript/stylesheets/gobierto-plans.scss b/app/javascript/stylesheets/gobierto-plans.scss index 8567272afa..894d7798f0 100644 --- a/app/javascript/stylesheets/gobierto-plans.scss +++ b/app/javascript/stylesheets/gobierto-plans.scss @@ -5,22 +5,16 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; @import "comp-breadcrumbs"; -@import "comp-forms"; @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; @import "comp-tables"; @import "comp-header_block_inline"; -@import "comp-social_buttons"; -@import "comp-tipsy"; -@import "comp-flash_messages"; @import "defaults"; -// END TODO @import "comp-plans-custom"; @import "comp-vue-block-checkbox"; diff --git a/app/javascript/stylesheets/gobierto-visualizations.scss b/app/javascript/stylesheets/gobierto-visualizations.scss index 8c61c86edf..4d7174d533 100644 --- a/app/javascript/stylesheets/gobierto-visualizations.scss +++ b/app/javascript/stylesheets/gobierto-visualizations.scss @@ -14,7 +14,6 @@ @import "comp-site_header"; @import "comp-tables"; @import "comp-header_block_inline"; -@import "comp-flash_messages"; @import "defaults"; @import "comp-metric_boxes"; From 5d757790974c9516fb80f31edf41bc037d0970f8 Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Tue, 23 Nov 2021 11:32:59 +0100 Subject: [PATCH 13/18] fix people add social & forms for others --- app/javascript/stylesheets/gobierto-people.scss | 5 ----- app/javascript/stylesheets/gobierto-plans.scss | 2 ++ app/javascript/stylesheets/gobierto-visualizations.scss | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/javascript/stylesheets/gobierto-people.scss b/app/javascript/stylesheets/gobierto-people.scss index c8ca8dd017..e193c0526c 100644 --- a/app/javascript/stylesheets/gobierto-people.scss +++ b/app/javascript/stylesheets/gobierto-people.scss @@ -5,22 +5,17 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; -@import "comp-breadcrumbs"; @import "comp-forms"; @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; @import "comp-tables"; -@import "comp-header_block_inline"; @import "comp-social_buttons"; -@import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -// END TODO @import "comp-tabs"; @import "comp-lists"; diff --git a/app/javascript/stylesheets/gobierto-plans.scss b/app/javascript/stylesheets/gobierto-plans.scss index 894d7798f0..b0b5140709 100644 --- a/app/javascript/stylesheets/gobierto-plans.scss +++ b/app/javascript/stylesheets/gobierto-plans.scss @@ -9,11 +9,13 @@ @import "populities"; @import "mixins"; @import "comp-breadcrumbs"; +@import "comp-forms"; @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; @import "comp-tables"; @import "comp-header_block_inline"; +@import "comp-social_buttons"; @import "defaults"; @import "comp-plans-custom"; diff --git a/app/javascript/stylesheets/gobierto-visualizations.scss b/app/javascript/stylesheets/gobierto-visualizations.scss index 4d7174d533..d68891d7a3 100644 --- a/app/javascript/stylesheets/gobierto-visualizations.scss +++ b/app/javascript/stylesheets/gobierto-visualizations.scss @@ -14,6 +14,7 @@ @import "comp-site_header"; @import "comp-tables"; @import "comp-header_block_inline"; +@import "comp-social_buttons"; @import "defaults"; @import "comp-metric_boxes"; From 46f2dc9d9593ab320527989adb4836e51b870002 Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Tue, 23 Nov 2021 11:42:29 +0100 Subject: [PATCH 14/18] Update gobierto-observatory.scss --- app/javascript/stylesheets/gobierto-observatory.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/javascript/stylesheets/gobierto-observatory.scss b/app/javascript/stylesheets/gobierto-observatory.scss index 280005e267..981f155f73 100644 --- a/app/javascript/stylesheets/gobierto-observatory.scss +++ b/app/javascript/stylesheets/gobierto-observatory.scss @@ -5,11 +5,9 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; -@import "comp-breadcrumbs"; @import "comp-forms"; @import "comp-headings_blocks"; @import "comp-layout"; @@ -17,10 +15,7 @@ @import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; -@import "comp-tipsy"; -@import "comp-flash_messages"; @import "defaults"; -// END TODO @import "comp-graph-dc"; @import "comp-graph-vis_population_pyramid"; From bac1de86adb719e487f19bf442748cfcf722192b Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Tue, 23 Nov 2021 11:45:48 +0100 Subject: [PATCH 15/18] Update gobierto-investments.scss --- app/javascript/stylesheets/gobierto-investments.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/javascript/stylesheets/gobierto-investments.scss b/app/javascript/stylesheets/gobierto-investments.scss index c5b40b5cef..d723696aef 100644 --- a/app/javascript/stylesheets/gobierto-investments.scss +++ b/app/javascript/stylesheets/gobierto-investments.scss @@ -5,22 +5,16 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; -@import "comp-breadcrumbs"; @import "comp-forms"; @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; -@import "comp-tipsy"; -@import "comp-flash_messages"; @import "defaults"; -// END TODO @import "comp-vue-table"; @import "comp-horizontal-carousel.scss"; From 2eaa397567448c3e6ec51d7890100e3adc67b438 Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Tue, 23 Nov 2021 11:57:18 +0100 Subject: [PATCH 16/18] indicators, exports & data --- app/javascript/stylesheets/gobierto-data.scss | 7 ------- app/javascript/stylesheets/gobierto-exports.scss | 7 ------- app/javascript/stylesheets/gobierto-indicators.scss | 5 ----- 3 files changed, 19 deletions(-) diff --git a/app/javascript/stylesheets/gobierto-data.scss b/app/javascript/stylesheets/gobierto-data.scss index 61d7158bcc..6fbb423713 100644 --- a/app/javascript/stylesheets/gobierto-data.scss +++ b/app/javascript/stylesheets/gobierto-data.scss @@ -5,22 +5,15 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; -@import "comp-breadcrumbs"; @import "comp-forms"; @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-tables"; -@import "comp-header_block_inline"; @import "comp-social_buttons"; -@import "comp-tipsy"; -@import "comp-flash_messages"; @import "defaults"; -// END TODO @import "comp-vue-filters"; @import "comp-perspective-viewer"; diff --git a/app/javascript/stylesheets/gobierto-exports.scss b/app/javascript/stylesheets/gobierto-exports.scss index d711aed6de..849adc2ac6 100644 --- a/app/javascript/stylesheets/gobierto-exports.scss +++ b/app/javascript/stylesheets/gobierto-exports.scss @@ -5,21 +5,14 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; -@import "comp-breadcrumbs"; @import "comp-forms"; @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-tables"; -@import "comp-header_block_inline"; @import "comp-social_buttons"; -@import "comp-tipsy"; -@import "comp-flash_messages"; @import "defaults"; -// END TODO @import "comp-text_content"; diff --git a/app/javascript/stylesheets/gobierto-indicators.scss b/app/javascript/stylesheets/gobierto-indicators.scss index 2d63ea2b75..1d6d33a7cc 100644 --- a/app/javascript/stylesheets/gobierto-indicators.scss +++ b/app/javascript/stylesheets/gobierto-indicators.scss @@ -5,7 +5,6 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; @@ -14,12 +13,8 @@ @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-tables"; @import "comp-header_block_inline"; @import "comp-social_buttons"; -@import "comp-tipsy"; -@import "comp-flash_messages"; @import "defaults"; -// END TODO @import "comp-tree"; From 331f1de64c462d960044ef6fe29916f97dfe15fe Mon Sep 17 00:00:00 2001 From: Hugoren Martinako Date: Tue, 23 Nov 2021 12:05:27 +0100 Subject: [PATCH 17/18] admin, budgets & cms --- app/javascript/stylesheets/gobierto-admin.scss | 5 ----- app/javascript/stylesheets/gobierto-budgets.scss | 2 -- app/javascript/stylesheets/gobierto-cms.scss | 7 ------- 3 files changed, 14 deletions(-) diff --git a/app/javascript/stylesheets/gobierto-admin.scss b/app/javascript/stylesheets/gobierto-admin.scss index e673bbb733..c8755e1750 100644 --- a/app/javascript/stylesheets/gobierto-admin.scss +++ b/app/javascript/stylesheets/gobierto-admin.scss @@ -12,14 +12,9 @@ $font_serif: 'Georgia, serif'; @import "populities"; @import "mixins"; -@import "comp-breadcrumbs"; @import "comp-forms"; @import "comp-headings_blocks"; -@import "comp-layout"; -@import "comp-site_header"; @import "comp-tables"; -@import "comp-header_block_inline"; -@import "comp-social_buttons"; @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults-admin"; diff --git a/app/javascript/stylesheets/gobierto-budgets.scss b/app/javascript/stylesheets/gobierto-budgets.scss index b0df4e7bd4..728739cf48 100644 --- a/app/javascript/stylesheets/gobierto-budgets.scss +++ b/app/javascript/stylesheets/gobierto-budgets.scss @@ -5,7 +5,6 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; @@ -20,7 +19,6 @@ @import "comp-tipsy"; @import "comp-flash_messages"; @import "defaults"; -// END TODO @import "comp-metric_boxes"; @import "comp-indicator_widget"; diff --git a/app/javascript/stylesheets/gobierto-cms.scss b/app/javascript/stylesheets/gobierto-cms.scss index 52bf16af00..c48dd02acc 100644 --- a/app/javascript/stylesheets/gobierto-cms.scss +++ b/app/javascript/stylesheets/gobierto-cms.scss @@ -5,22 +5,15 @@ @import url("https://fonts.googleapis.com/css?family=Work+Sans:200,400,700,600|Source+Sans+Pro:200,400,700,600"); -// TODO: revisar cuáles sobran @import "css-conf"; @import "populities"; @import "mixins"; -@import "comp-breadcrumbs"; @import "comp-forms"; @import "comp-headings_blocks"; @import "comp-layout"; @import "comp-site_header"; -@import "comp-tables"; -@import "comp-header_block_inline"; @import "comp-social_buttons"; -@import "comp-tipsy"; -@import "comp-flash_messages"; @import "defaults"; -// END TODO @import "comp-text_content"; From 7b34d2444f6427d6a928aac70993a8922c679ee7 Mon Sep 17 00:00:00 2001 From: Jorge Date: Wed, 24 Nov 2021 10:44:17 +0100 Subject: [PATCH 18/18] add border-collapse to comp-table and import _comp-table in gobierto-data module --- app/javascript/stylesheets/_comp-tables.scss | 2 ++ app/javascript/stylesheets/gobierto-data.scss | 1 + 2 files changed, 3 insertions(+) diff --git a/app/javascript/stylesheets/_comp-tables.scss b/app/javascript/stylesheets/_comp-tables.scss index d97253c950..45bf3fa877 100644 --- a/app/javascript/stylesheets/_comp-tables.scss +++ b/app/javascript/stylesheets/_comp-tables.scss @@ -4,6 +4,8 @@ */ table { width: 100%; + border-collapse: collapse; + border-spacing: 0; td, th { diff --git a/app/javascript/stylesheets/gobierto-data.scss b/app/javascript/stylesheets/gobierto-data.scss index 6fbb423713..2b67269a43 100644 --- a/app/javascript/stylesheets/gobierto-data.scss +++ b/app/javascript/stylesheets/gobierto-data.scss @@ -13,6 +13,7 @@ @import "comp-layout"; @import "comp-site_header"; @import "comp-social_buttons"; +@import "comp-tables"; @import "defaults"; @import "comp-vue-filters";