Merge branch 'develop' into feature-add-principals

2020-08-31 16:36:57 -04:00
commit 147aa1780d
@@ -7,7 +7,7 @@
  box-sizing: border-box;
  width: 100%;
  // Targeting min-width of ~200
-  min-width: (sizing.rems(m) + sizing.rems(xs)) * 10;
+  min-width: (sizing.rems(m)) * 10;
  border: 0;
  padding: 0 sizing.rems(s);
  text-decoration: none;
@@ -43,8 +43,8 @@ $chevron: "data:image/svg+xml;utf-8,<svg viewBox='0 0 24 24' fill='%231b1f26' xm
    }

    &.has-icon-only {
-      padding-right: sizing.rems(l);
      padding-left: sizing.rems(s);
+      padding-right: sizing.rems(s);
      background-position: right sizing.rems(xs) center;

      .rose-dropdown-trigger-text {
@@ -7,7 +7,7 @@
  box-sizing: border-box;
  width: 100%;
  // Targeting min-width of ~200
-  min-width: (sizing.rems(m) + sizing.rems(xs)) * 10;
+  min-width: (sizing.rems(m)) * 10;
  border: 0;
  padding: 0 sizing.rems(s);
  text-decoration: none;
@@ -62,7 +62,6 @@ export default class ScopesScopeProjectsProjectTargetsTargetHostSetsRoute extend
      await target.removeHostSet(hostSet.id);
      this.refresh();
      this.notify.success(this.intl.t('notify.delete-success'));
-      this.transitionTo('scopes.scope.projects.project.targets.target.host-sets');
    } catch (error) {
      // TODO: replace with translated strings
      this.notify.error(error.message, { closeAfter: null });
@@ -54,7 +54,6 @@ export default class ScopesScopeRolesRolePrincipalsRoute extends Route {
      await role.removePrincipal(principal.id);
      this.refresh();
      this.notify.success(this.intl.t('notify.delete-success'));
-      this.transitionTo('scopes.scope.roles.role.principals');
    } catch (error) {
      // TODO: replace with translated strings
      this.notify.error(error.message, { closeAfter: null });
@@ -28,11 +28,11 @@
            <Rose::Dropdown
              @icon="more-horizontal"
              @iconOnly={{true}}
+              @showCaret={{false}}
              @dropdownRight={{true}}
              @text="{{t "actions.manage"}}" as |dropdown|
            >
              <dropdown.button
-                name="{{t "actions.remove"}}"
                @style="danger"
                {{on "click" (route-action "removeHostSet" @model hostSet.model)}}
              >
@@ -27,11 +27,11 @@
            <Rose::Dropdown
              @icon="more-horizontal"
              @iconOnly={{true}}
+              @showCaret={{false}}
              @dropdownRight={{true}}
              @text="{{t "actions.manage"}}" as |dropdown|
            >
              <dropdown.button
-                name="{{t "actions.remove"}}"
                @style="danger"
                {{on "click" (route-action "removePrincipal" principal.model)}}
              >