From 8fee4db3b006fc96a0e6ffed00507eb3101f7bfc Mon Sep 17 00:00:00 2001 From: nicofrand Date: Thu, 23 Aug 2018 23:05:59 +0200 Subject: [PATCH 1/7] Remove bootstrap 'text-nowrap' usage --- client/components/operations/item.js | 6 ++---- client/themes/default/style.css | 8 ++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/client/components/operations/item.js b/client/components/operations/item.js index 768412dc7..ba6705355 100644 --- a/client/components/operations/item.js +++ b/client/components/operations/item.js @@ -70,10 +70,8 @@ class Operation extends React.PureComponent { - - {formatDate.toShortString(op.date)} - {maybeBudgetIcon} - + {formatDate.toShortString(op.date)} + {maybeBudgetIcon} {typeSelect} diff --git a/client/themes/default/style.css b/client/themes/default/style.css index 73bef3184..711299115 100644 --- a/client/themes/default/style.css +++ b/client/themes/default/style.css @@ -728,6 +728,14 @@ form.search p.search-buttons button:last-child { vertical-align: middle; } +.operation-table td.date { + white-space: nowrap; +} + +.operation-table td.date > * { + vertical-align: middle; +} + .operation-table td > * { overflow-y: hidden; } -- GitLab From 9172ad849d92cc6587a9f63a81f94dca5a21cfa1 Mon Sep 17 00:00:00 2001 From: nicofrand Date: Thu, 23 Aug 2018 23:47:54 +0200 Subject: [PATCH 2/7] Add CSS rules for generic tags --- client/themes/default/style.css | 88 +++++++++++++++++++++++++++++++- client/themes/default/tables.css | 1 + 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/client/themes/default/style.css b/client/themes/default/style.css index 711299115..0907f96d6 100644 --- a/client/themes/default/style.css +++ b/client/themes/default/style.css @@ -36,17 +36,102 @@ src: local('Open Sans Bold'), local('OpenSans-Bold'), url('./fonts/opensans/OpenSans-Bold.woff') format('woff'); } +*, +::after, +::before { + box-sizing: border-box; +} + body { + font-size: 14px; + line-height: 1.42857143; font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; color: #717171; background: #3d424c; } -a:hover, a:focus { +h1 { + font-size: 36px; +} + +h2 { + font-size: 30px; +} + +h3 { + font-size: 24px; +} + +h4 { + font-size: 18px; +} + +h5 { + font-size: 14px; +} + +h6 { + font-size: 12px; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + font-weight: 500; + line-height: 1.1em; + margin-bottom: 10px; +} + +h1, +h2, +h3 { + margin-top: 20px; +} + +h4, +h5, +h6 { + margin-top: 10px; +} + +p { + margin: 0 0 10px; +} + +label { + display: inline-block; + font-weight: 700; + margin-bottom: 5px; +} + +small { + font-size: 85%; +} + +a, +a:hover, +a:focus { + color: #337ab7; text-decoration: none; outline: 0; } +button { + color: inherit; + font: inherit; + text-transform: none; +} + +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; +} + ul { padding: 0; margin: 0; @@ -66,6 +151,7 @@ textarea { padding: 6px 12px; transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; box-shadow: none; + text-transform: none; } input[type="checkbox"], diff --git a/client/themes/default/tables.css b/client/themes/default/tables.css index 1425d823d..2f73a47d8 100644 --- a/client/themes/default/tables.css +++ b/client/themes/default/tables.css @@ -8,6 +8,7 @@ table { } table caption { + text-align: left; min-height: 40px; caption-side: top; background-color: #F1F1F1; -- GitLab From b21742c407785c345c60e0eae96ffebfb177988a Mon Sep 17 00:00:00 2001 From: nicofrand Date: Thu, 23 Aug 2018 23:50:53 +0200 Subject: [PATCH 3/7] Fix wells margin & padding --- client/themes/default/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/themes/default/style.css b/client/themes/default/style.css index 0907f96d6..0c06247b3 100644 --- a/client/themes/default/style.css +++ b/client/themes/default/style.css @@ -634,10 +634,12 @@ li.duplicates > a > span:first-of-type { } .operation-wells .well { + padding: 19px; + margin-bottom: 20px; + border-radius: 4px; flex-shrink: 0; width: 24.5%; overflow: hidden; - box-sizing: border-box; color: #fff; text-align: right; border: none; -- GitLab From a897ebb29db94635d7c0892718b7371ae8e5064e Mon Sep 17 00:00:00 2001 From: nicofrand Date: Thu, 23 Aug 2018 23:55:20 +0200 Subject: [PATCH 4/7] Fix foldable panel's title font size --- client/themes/default/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/client/themes/default/style.css b/client/themes/default/style.css index 0c06247b3..d0773ff36 100644 --- a/client/themes/default/style.css +++ b/client/themes/default/style.css @@ -1974,6 +1974,7 @@ span.fa-star { margin: 0; background-color: #f1f1f1; color: #777777; + font-weight: 600; } .foldable-panel > .foldable-panel-body { -- GitLab From 2a305daa4f3c46570d60e8b135c71cf65e52e43d Mon Sep 17 00:00:00 2001 From: nicofrand Date: Fri, 24 Aug 2018 00:04:35 +0200 Subject: [PATCH 5/7] Fix bank selector CSS hack --- client/components/settings/bank-accesses/form.js | 2 +- client/themes/default/style.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/components/settings/bank-accesses/form.js b/client/components/settings/bank-accesses/form.js index 5428c5282..862fa7f91 100644 --- a/client/components/settings/bank-accesses/form.js +++ b/client/components/settings/bank-accesses/form.js @@ -249,7 +249,7 @@ class InitForm extends React.Component { Date: Fri, 24 Aug 2018 00:05:29 +0200 Subject: [PATCH 6/7] Move bank selector CSS with siblings --- client/themes/default/style.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/themes/default/style.css b/client/themes/default/style.css index bb42d4f7c..a220b13e8 100644 --- a/client/themes/default/style.css +++ b/client/themes/default/style.css @@ -196,6 +196,10 @@ button:focus { z-index: 4; } +.Select.is-focused { + z-index: 1000; +} + .Select-menu-outer { z-index: 5; } @@ -282,10 +286,6 @@ button:focus { margin-bottom: 1em; } -.Select.is-focused { - z-index: 1000; -} - .wizard .wizard-menu li { list-style-type: none; font-weight: bold; -- GitLab From ab77d7277738dc558d9cea099a2cd851da4785de Mon Sep 17 00:00:00 2001 From: nicofrand Date: Fri, 24 Aug 2018 00:11:42 +0200 Subject: [PATCH 7/7] =?UTF-8?q?Remove=20bootstrap=20=F0=9F=8E=89(fix=20#76?= =?UTF-8?q?8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 -- scripts/webpack/base.js | 11 +---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/package.json b/package.json index 4aa7d758b..155f15991 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "babel-preset-react": "6.24.1", "babel-preset-stage-2": "6.24.1", "babel-register": "6.26.0", - "bootstrap-kresus": "0.0.5", "bundle-loader": "0.5.6", "c3": "0.4.23", "concurrently": "3.5.1", @@ -57,7 +56,6 @@ "font-awesome": "4.7.0", "generate-json-webpack-plugin": "0.3.1", "image-webpack-loader": "4.3.1", - "jquery": "3.3.1", "json-strip-loader": "1.0.2", "lodash.throttle": "4.1.1", "mocha": "5.2.0", diff --git a/scripts/webpack/base.js b/scripts/webpack/base.js index 70d5dcfc8..226846814 100644 --- a/scripts/webpack/base.js +++ b/scripts/webpack/base.js @@ -24,14 +24,11 @@ let entry = { 'babel-polyfill', './node_modules/normalize.css/normalize.css', './node_modules/font-awesome/css/font-awesome.css', - './node_modules/bootstrap-kresus/css/bootstrap.css', - './node_modules/bootstrap-kresus/css/bootstrap-theme.css', './node_modules/dygraphs/dist/dygraph.css', './node_modules/c3/c3.css', './node_modules/flatpickr/dist/themes/light.css', './node_modules/react-select/dist/react-select.css', './client/css/base.css', - './node_modules/bootstrap-kresus/js/bootstrap.js', './client/init.js' ] }; @@ -175,12 +172,6 @@ const config = { }, plugins: [ - // Add jQuery aliases. - new webpack.ProvidePlugin({ - $: 'jquery', - jQuery: 'jquery' - }), - // Directly copy the static index and robots files. new CopyWebpackPlugin([ { from: './static/index.html' }, @@ -253,7 +244,7 @@ if (process.env.ANALYZE) { // Name of Webpack Stats JSON file that will be generated if `generateStatsFile` is `true`. // Relative to bundles output directory. - statsFilename: '../reports/client.json', + statsFilename: '../reports/client.json' }) ); } -- GitLab