Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
c70db581
Commit
c70db581
authored
Sep 29, 2016
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added temporary responsive design
parent
0d1fa878
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
56 additions
and
12 deletions
+56
-12
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+51
-8
app/views/projects/compare/_form.html.haml
app/views/projects/compare/_form.html.haml
+5
-4
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
c70db581
...
@@ -744,18 +744,61 @@ pre.light-well {
...
@@ -744,18 +744,61 @@ pre.light-well {
width
:
300px
;
width
:
300px
;
}
}
>
.input-group
>
.compare-dropdown-toggle
{
&
.from
.compare-dropdown-toggle
{
width
:
200px
;
width
:
237px
;
}
.dropdown-toggle-text
{
&
.to
.compare-dropdown-toggle
{
display
:
block
;
width
:
254px
;
height
:
100%
;
}
overflow
:
hidden
;
text-overflow
:
ellipsis
;
.dropdown-toggle-text
{
white-space
:
nowrap
;
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%
;
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
{
.clearable-input
{
...
...
app/views/projects/compare/_form.html.haml
View file @
c70db581
=
form_tag
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
),
method: :post
,
class:
'form-inline js-requires-input'
do
=
form_tag
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
),
method: :post
,
class:
'form-inline js-requires-input'
do
.clearfix
.clearfix
-
if
params
[
:to
]
&&
params
[
:from
]
-
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'
}
.compare-switch-container
.form-group.dropdown.compare-form-group.js-compare-from-dropdown
=
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
.input-group.inline-input-group
%span
.input-group-addon
from
%span
.input-group-addon
from
=
hidden_field_tag
:from
,
params
[
: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
=
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'
.dropdown-toggle-text
=
params
[
:from
]
||
'Select branch/tag'
=
render
"ref_dropdown"
=
render
"ref_dropdown"
=
"..."
.compare-ellipsis
...
.form-group.dropdown.compare-form-group.js-compare-to-dropdown
.form-group.dropdown.compare-form-group.
to.
js-compare-to-dropdown
.input-group.inline-input-group
.input-group.inline-input-group
%span
.input-group-addon
to
%span
.input-group-addon
to
=
hidden_field_tag
:to
,
params
[
:to
]
=
hidden_field_tag
:to
,
params
[
:to
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment