From 8e41d1a6945ff6ec9da0ce00e41aef7209a0657a Mon Sep 17 00:00:00 2001 From: Pierluigi Cau Date: Fri, 19 Feb 2016 11:43:34 +0100 Subject: [PATCH 1/3] Add plugin mount point to navbar --- src/js/components/Marathon.jsx | 4 ++++ src/js/plugin/shared/PluginMountPoints.js | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/js/components/Marathon.jsx b/src/js/components/Marathon.jsx index 0333c0861..14c1a6b04 100644 --- a/src/js/components/Marathon.jsx +++ b/src/js/components/Marathon.jsx @@ -13,6 +13,7 @@ import EditAppModalComponent from "../components/modals/EditAppModalComponent"; import HelpModalComponent from "../components/modals/HelpModalComponent"; import NavTabsComponent from "../components/NavTabsComponent"; import HelpMenuComponent from "./HelpMenuComponent"; +import PluginMountPointComponent from "../components/PluginMountPointComponent"; import AppsActions from "../actions/AppsActions"; import DeploymentActions from "../actions/DeploymentActions"; @@ -23,6 +24,7 @@ import PluginActions from "../actions/PluginActions"; import "../plugin/PluginInterface"; import PluginStore from "../stores/PluginStore"; import PluginEvents from "../events/PluginEvents"; +import PluginMountPoints from "../plugin/shared/PluginMountPoints"; import tabs from "../constants/tabs"; @@ -276,6 +278,8 @@ var Marathon = React.createClass({
+
diff --git a/src/js/plugin/shared/PluginMountPoints.js b/src/js/plugin/shared/PluginMountPoints.js index 4d098a71e..235ce7f10 100644 --- a/src/js/plugin/shared/PluginMountPoints.js +++ b/src/js/plugin/shared/PluginMountPoints.js @@ -1,7 +1,8 @@ import Util from "../../helpers/Util"; const PluginMountPoints = { - "SIDEBAR_BOTTOM": "SIDEBAR_BOTTOM" + "SIDEBAR_BOTTOM": "SIDEBAR_BOTTOM", + "NAVBAR_TOP_RIGHT": "NAVBAR_TOP_RIGHT", }; export default Util.fixObject(PluginMountPoints, "PLUGIN_MOUNT_POINTS_"); From e058c33f141420af123c0583d7d493c208517a01 Mon Sep 17 00:00:00 2001 From: Pierluigi Cau Date: Fri, 19 Feb 2016 11:44:13 +0100 Subject: [PATCH 2/3] Extract text-danger definition to appropriate LESS file --- src/css/components/dropdown.less | 4 ---- src/css/layout/text.less | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/css/components/dropdown.less b/src/css/components/dropdown.less index 823a95494..86c4ea37c 100644 --- a/src/css/components/dropdown.less +++ b/src/css/components/dropdown.less @@ -56,9 +56,5 @@ width: 100%; } } - - .text-danger { - color: @text-color-danger-light; - } } } diff --git a/src/css/layout/text.less b/src/css/layout/text.less index 1b9303788..3acfa395e 100644 --- a/src/css/layout/text.less +++ b/src/css/layout/text.less @@ -2,6 +2,11 @@ * Text * ============== */ + +.text-danger { + color: @text-color-danger-light; +} + .text-warning { color: @starship; } From 33d762215021398b20b2847dfb60323bd73d59de Mon Sep 17 00:00:00 2001 From: Pierluigi Cau Date: Fri, 19 Feb 2016 11:44:24 +0100 Subject: [PATCH 3/3] Override bootstrap default font-size --- src/css/components/dropdown.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/css/components/dropdown.less b/src/css/components/dropdown.less index 86c4ea37c..6f257aab7 100644 --- a/src/css/components/dropdown.less +++ b/src/css/components/dropdown.less @@ -2,6 +2,11 @@ * Dropdown * ============== */ + +.dropdown-header { + font-size: @base-font-size; /* Bootstrap override */ +} + .dropdown { margin: 0 0 @base-spacing-unit*2 0;