diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json index 0afdf1f95..2d2ebe9fd 100644 Binary files a/src/FilterLists.Web/package-lock.json and b/src/FilterLists.Web/package-lock.json differ diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json index 07fa0c127..3f4481b7a 100644 --- a/src/FilterLists.Web/package.json +++ b/src/FilterLists.Web/package.json @@ -14,6 +14,7 @@ "es6-promise": "^4.2.8", "moment": "^2.24.0", "react": "^16.8.6", + "react-bootstrap": "^1.0.0-beta.10", "react-dom": "^16.8.6", "react-router-dom": "^5.0.1", "react-scripts": "3.0.1", diff --git a/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButtonGroup.tsx b/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButtonGroup.tsx index 1a9e4604e..af45b3d5f 100644 --- a/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButtonGroup.tsx +++ b/src/FilterLists.Web/src/modules/home/components/linkButtons/SubscribeButtonGroup.tsx @@ -1,4 +1,5 @@ import * as React from "react"; +import { DropdownButton, Dropdown } from "react-bootstrap"; import { SubscribeButton } from "./SubscribeButton"; interface IProps { @@ -30,23 +31,14 @@ const SubscribeButtonGroupDropdown = (props: ISubscribeButtonGroupDropdownProps) mirrorIndex++; } - return
- -
+ return + - {props.urlMirrors.map( - (m: string, i: number) => - )} -
-
; + + {props.urlMirrors.map( + (m: string, i: number) => + + + )} + ; }; - -const BtnGroupDropSubscribe = () => - ; \ No newline at end of file diff --git a/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButtonGroup.tsx b/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButtonGroup.tsx index 51949f317..8f049ab5b 100644 --- a/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButtonGroup.tsx +++ b/src/FilterLists.Web/src/modules/home/components/linkButtons/ViewButtonGroup.tsx @@ -1,4 +1,5 @@ import * as React from "react"; +import { DropdownButton, Dropdown } from "react-bootstrap"; import { ViewButton } from "./ViewButton"; interface IProps { @@ -29,23 +30,14 @@ const ViewButtonGroupDropdown = (props: IViewButtonGroupDropdownProps) => { mirrorIndex++; } - return
- -
+ return + - {props.urlMirrors.map( - (m: string, i: number) => - )} -
-
; -}; - -const BtnGroupDropView = () => - ; \ No newline at end of file + + {props.urlMirrors.map( + (m: string, i: number) => + + + )} + ; +}; \ No newline at end of file diff --git a/src/FilterLists.Web/src/modules/home/components/linkButtons/button.css b/src/FilterLists.Web/src/modules/home/components/linkButtons/button.css index bace69595..58febdf12 100644 --- a/src/FilterLists.Web/src/modules/home/components/linkButtons/button.css +++ b/src/FilterLists.Web/src/modules/home/components/linkButtons/button.css @@ -4,7 +4,7 @@ width: 100px; } -.dropdown-menu { +.dropdown-item { border: 0; min-width: 0; padding: 0;