diff --git a/client/components/operations/item.js b/client/components/operations/item.js index 768412dc73cab89daec9d5d3edfff3c5fa7dc0d6..ba67053552403ffa6f48fd42c1dc22fc72f6c536 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/components/settings/bank-accesses/form.js b/client/components/settings/bank-accesses/form.js index 5428c52824e0e469042ab2aa0734141648d057c4..862fa7f911125820d5b66d37a6d9a93f59a60fd4 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 { 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; @@ -728,6 +816,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; } @@ -1354,7 +1450,7 @@ table.bank-accounts-list { } table.bank-accounts-list td { - vertical-align: middle !important; /* override bootstrap behavior */ + vertical-align: middle; } table.bank-accounts-list td:first-child { @@ -1878,6 +1974,7 @@ span.fa-star { margin: 0; background-color: #f1f1f1; color: #777777; + font-weight: 600; } .foldable-panel > .foldable-panel-body { diff --git a/client/themes/default/tables.css b/client/themes/default/tables.css index 1425d823db4129812bd40936c1887a743dd5ba70..2f73a47d8f98e653ddf553328425df3a50b90c62 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; diff --git a/package.json b/package.json index 4aa7d758b88faa870b085e6b0ebfd50132e30b0b..155f15991011ee4cd9fb5686b08b01b7e16c34be 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 70d5dcfc8123eb0c5556b6126c6171b3c07a705c..22684681469bb5e72b094aef50c17d47a327622b 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' }) ); }