From eea7a13a95369737c3e4244495530f78c791c137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Wed, 25 Jul 2018 12:06:46 +0200 Subject: [PATCH 1/5] chore(package): update bootstrap to 4.1.3 --- ui/package-lock.json | 15 ++++++--------- ui/package.json | 4 ++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index 53213a46d..a986757d7 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -1496,17 +1496,14 @@ } }, "bootstrap": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.1.tgz", - "integrity": "sha512-SpiDSOcbg4J/PjVSt4ny5eY6j74VbVSjROY4Fb/WIUXBV9cnb5luyR4KnPvNoXuGnBK1T+nJIWqRsvU3yP8Mcg==" + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.3.tgz", + "integrity": "sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==" }, "bootswatch": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-4.1.1.tgz", - "integrity": "sha1-604FPEadTcjNr/Ef9N2+9j6GpW0=", - "requires": { - "bootstrap": "4.1.1" - } + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-4.1.2.tgz", + "integrity": "sha1-tN+mjN6v5xHlE8UA25A+jvQA4gI=" }, "boxen": { "version": "1.3.0", diff --git a/ui/package.json b/ui/package.json index 489d7f0cb..db166b4b2 100644 --- a/ui/package.json +++ b/ui/package.json @@ -9,8 +9,8 @@ "@fortawesome/free-regular-svg-icons": "^5.2.0", "@fortawesome/free-solid-svg-icons": "^5.2.0", "@fortawesome/react-fontawesome": "0.1.0", - "bootstrap": "^4.1.1", - "bootswatch": "^4.1.1", + "bootstrap": "^4.1.3", + "bootswatch": "^4.1.2", "fast-deep-equal": "^2.0.1", "lodash.debounce": "^4.0.8", "lodash.throttle": "^4.1.1", From 1fc661e593a1c8c96a58fe0bac68e8ada979ecb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Thu, 26 Jul 2018 11:35:40 +0200 Subject: [PATCH 2/5] fix(ui): don't enforce min-height on filter input --- ui/src/Components/NavBar/FilterInput/index.css | 1 - ui/src/Components/NavBar/FilterInput/index.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/src/Components/NavBar/FilterInput/index.css b/ui/src/Components/NavBar/FilterInput/index.css index 527fca8e6..e78a3deb3 100644 --- a/ui/src/Components/NavBar/FilterInput/index.css +++ b/ui/src/Components/NavBar/FilterInput/index.css @@ -1,6 +1,5 @@ .components-filterinput { cursor: text; - min-height: 2.2rem; } .components-filterinput-wrapper > input { diff --git a/ui/src/Components/NavBar/FilterInput/index.js b/ui/src/Components/NavBar/FilterInput/index.js index 8e7199e99..f381e1b0c 100644 --- a/ui/src/Components/NavBar/FilterInput/index.js +++ b/ui/src/Components/NavBar/FilterInput/index.js @@ -113,7 +113,7 @@ const FilterInput = observer( } = inputProps; return ( -
+
From fcd7ac63b1ac2cc9b8d5e0f0008894db77a8f695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Thu, 26 Jul 2018 16:37:42 +0200 Subject: [PATCH 3/5] feat(ui): reduce vertical padding on filter input icons --- ui/src/Components/NavBar/FilterInput/History.js | 2 +- ui/src/Components/NavBar/FilterInput/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/Components/NavBar/FilterInput/History.js b/ui/src/Components/NavBar/FilterInput/History.js index eb2304f42..7977a2d30 100644 --- a/ui/src/Components/NavBar/FilterInput/History.js +++ b/ui/src/Components/NavBar/FilterInput/History.js @@ -236,7 +236,7 @@ const History = observer(