summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2017-09-07 22:46:24 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-09-07 22:46:24 +0000
commit129e32178187b1b94c025902d02efbb7748b4571 (patch)
treea043528786c1eb91a8db030b2d266dac7dccda9e
parent3955dcb4cc4cf305282412988751155771bbc036 (diff)
downloadgitlab-ce-129e32178187b1b94c025902d02efbb7748b4571.tar.gz
Normalize styles for empty-state group-level new issue/MR combo button
-rw-r--r--app/assets/stylesheets/framework/nav.scss23
-rw-r--r--app/views/shared/_new_project_item_select.html.haml2
-rw-r--r--changelogs/unreleased/36638-select-project-to-create-issue-button-is-disconnected-from-dropdown-button.yml5
3 files changed, 24 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index e20108b171b..5ffa67a1220 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -288,11 +288,7 @@
display: flex;
max-width: 350px;
overflow: hidden;
-
- @media(max-width: $screen-xs-max) {
- width: 100%;
- max-width: none;
- }
+ float: right;
.new-project-item-link {
white-space: nowrap;
@@ -305,6 +301,23 @@
}
}
+.empty-state .project-item-select-holder.btn-group {
+ float: none;
+ display: inline-block;
+
+ .btn {
+ // overrides styles applied to plain `.empty-state .btn`
+ margin: 10px 0;
+ max-width: 300px;
+ width: auto;
+
+ @media(max-width: $screen-xs-max) {
+ max-width: 250px;
+ }
+
+ }
+}
+
.new-project-item-select-button .fa-caret-down {
margin-left: 2px;
}
diff --git a/app/views/shared/_new_project_item_select.html.haml b/app/views/shared/_new_project_item_select.html.haml
index dc912d800cf..ac2ebb701a5 100644
--- a/app/views/shared/_new_project_item_select.html.haml
+++ b/app/views/shared/_new_project_item_select.html.haml
@@ -1,5 +1,5 @@
- if any_projects?(@projects)
- .project-item-select-holder.btn-group.pull-right
+ .project-item-select-holder.btn-group
%a.btn.btn-new.new-project-item-link{ href: '', data: { label: local_assigns[:label], type: local_assigns[:type] } }
= icon('spinner spin')
= project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at', relative_path: local_assigns[:path] }, with_feature_enabled: local_assigns[:with_feature_enabled]
diff --git a/changelogs/unreleased/36638-select-project-to-create-issue-button-is-disconnected-from-dropdown-button.yml b/changelogs/unreleased/36638-select-project-to-create-issue-button-is-disconnected-from-dropdown-button.yml
new file mode 100644
index 00000000000..76c9c905590
--- /dev/null
+++ b/changelogs/unreleased/36638-select-project-to-create-issue-button-is-disconnected-from-dropdown-button.yml
@@ -0,0 +1,5 @@
+---
+title: Normalize styles for empty state combo button
+merge_request:
+author:
+type: fixed