summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2016-09-29 20:16:28 +0100
committerLuke Bennett <lukeeeebennettplus@gmail.com>2016-09-29 20:16:28 +0100
commitc70db581bfbe241f6d1354a73b671e7453cf19e6 (patch)
tree8d23d65726e5e7cfbe6886f9fe453ac4581b3a04
parent0d1fa878a90026a1724025c97a9484d96f903840 (diff)
downloadgitlab-ce-22221-tags-are-not-available-from-repository-compare-view.tar.gz
-rw-r--r--app/assets/stylesheets/pages/projects.scss59
-rw-r--r--app/views/projects/compare/_form.html.haml9
2 files changed, 56 insertions, 12 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 7c8ab7cb2a2..78bc4b79e86 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -744,18 +744,61 @@ pre.light-well {
width: 300px;
}
- > .input-group > .compare-dropdown-toggle {
- width: 200px;
+ &.from .compare-dropdown-toggle {
+ width: 237px;
+ }
- .dropdown-toggle-text {
- display: block;
- height: 100%;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ &.to .compare-dropdown-toggle {
+ width: 254px;
+ }
+
+ .dropdown-toggle-text {
+ display: block;
+ height: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ width: 100%;
+ }
+}
+
+.compare-ellipsis {
+ display: inline;
+}
+
+@media (max-width: $screen-xs-max) {
+ .compare-form-group {
+ .input-group {
+ width: 100%;
+
+ & > .compare-dropdown-toggle {
+ width: 100%;
+ }
+ }
+
+ .dropdown-menu {
width: 100%;
}
}
+
+ .compare-switch-container {
+ text-align: center;
+ padding: 0 0 $gl-padding;
+
+ .commits-compare-switch {
+ float: none;
+ }
+ }
+
+ .compare-ellipsis {
+ display: block;
+ text-align: center;
+ padding: 0 0 $gl-padding;
+ }
+
+ .commits-compare-btn {
+ width: 100%;
+ }
}
.clearable-input {
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml
index b66027115b2..76b68c544aa 100644
--- a/app/views/projects/compare/_form.html.haml
+++ b/app/views/projects/compare/_form.html.haml
@@ -1,16 +1,17 @@
= form_tag namespace_project_compare_index_path(@project.namespace, @project), method: :post, class: 'form-inline js-requires-input' do
.clearfix
- if params[:to] && params[:from]
- = link_to icon('exchange'), {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has-tooltip', title: 'Switch base of comparison'}
- .form-group.dropdown.compare-form-group.js-compare-from-dropdown
+ .compare-switch-container
+ = link_to icon('exchange'), {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has-tooltip', title: 'Switch base of comparison'}
+ .form-group.dropdown.compare-form-group.from.js-compare-from-dropdown
.input-group.inline-input-group
%span.input-group-addon from
= hidden_field_tag :from, params[:from]
= button_tag type: 'button', class: "form-control compare-dropdown-toggle js-compare-dropdown", required: true, data: { refs_url: refs_namespace_project_path(@project.namespace, @project), toggle: "dropdown", target: ".js-compare-from-dropdown", selected: params[:from], field_name: :from } do
.dropdown-toggle-text= params[:from] || 'Select branch/tag'
= render "ref_dropdown"
- = "..."
- .form-group.dropdown.compare-form-group.js-compare-to-dropdown
+ .compare-ellipsis ...
+ .form-group.dropdown.compare-form-group.to.js-compare-to-dropdown
.input-group.inline-input-group
%span.input-group-addon to
= hidden_field_tag :to, params[:to]