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
Jérome Perrin
gitlab-ce
Commits
cc971f03
Commit
cc971f03
authored
Jun 06, 2016
by
Phil Hughes
Committed by
Jacob Schatz
Jun 09, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved the UX of issue & milestone date picker
Closes #18198
parent
787b73f5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
19 deletions
+34
-19
app/assets/stylesheets/framework/jquery.scss
app/assets/stylesheets/framework/jquery.scss
+30
-13
app/views/groups/milestones/new.html.haml
app/views/groups/milestones/new.html.haml
+1
-2
app/views/projects/milestones/_form.html.haml
app/views/projects/milestones/_form.html.haml
+1
-2
app/views/shared/issuable/_form.html.haml
app/views/shared/issuable/_form.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/jquery.scss
View file @
cc971f03
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
font-family
:
$regular_font
;
font-family
:
$regular_font
;
font-size
:
$font-size-base
;
font-size
:
$font-size-base
;
&
.ui-datepicker
,
&
.ui-datepicker-inline
{
&
.ui-datepicker-inline
{
border
:
1px
solid
#ddd
;
border
:
1px
solid
#ddd
;
padding
:
10px
;
padding
:
10px
;
...
@@ -10,6 +11,25 @@
...
@@ -10,6 +11,25 @@
.ui-datepicker-header
{
.ui-datepicker-header
{
background
:
#fff
;
background
:
#fff
;
border-color
:
#ddd
;
border-color
:
#ddd
;
.ui-datepicker-prev
,
.ui-datepicker-next
{
top
:
4px
;
}
.ui-datepicker-prev
{
left
:
2px
;
}
.ui-datepicker-next
{
right
:
2px
;
}
.ui-state-hover
{
background
:
transparent
;
border
:
0
;
cursor
:
pointer
;
}
}
}
.ui-datepicker-calendar
td
a
{
.ui-datepicker-calendar
td
a
{
...
@@ -36,21 +56,18 @@
...
@@ -36,21 +56,18 @@
}
}
.ui-state-highlight
{
.ui-state-highlight
{
border
:
1px
solid
#eee
;
border
:
0
;
background
:
#eee
;
background
:
transparent
;
}
}
.ui-state-active
{
.ui-datepicker-calendar
{
border
:
1px
solid
$gl-primary
;
.ui-state-active
,
background
:
$gl-primary
;
.ui-state-hover
,
color
:
#fff
;
.ui-state-focus
{
}
border
:
1px
solid
$gl-primary
;
background
:
$gl-primary
;
.ui-state-hover
,
color
:
#fff
;
.ui-state-focus
{
}
border
:
1px
solid
$row-hover
;
background
:
$row-hover
;
color
:
#333
;
}
}
}
}
...
...
app/views/groups/milestones/new.html.haml
View file @
cc971f03
...
@@ -39,9 +39,8 @@
...
@@ -39,9 +39,8 @@
.col-md-6
.col-md-6
.form-group
.form-group
=
f
.
label
:due_date
,
"Due Date"
,
class:
"control-label"
=
f
.
label
:due_date
,
"Due Date"
,
class:
"control-label"
.col-sm-10
=
f
.
hidden_field
:due_date
.col-sm-10
.col-sm-10
.datepicker
=
f
.
text_field
:due_date
,
class:
"datepicker form-control"
,
placeholder:
"Select due date"
.form-actions
.form-actions
=
f
.
submit
'Create Milestone'
,
class:
"btn-create btn"
=
f
.
submit
'Create Milestone'
,
class:
"btn-create btn"
...
...
app/views/projects/milestones/_form.html.haml
View file @
cc971f03
...
@@ -17,9 +17,8 @@
...
@@ -17,9 +17,8 @@
.col-md-6
.col-md-6
.form-group
.form-group
=
f
.
label
:due_date
,
"Due Date"
,
class:
"control-label"
=
f
.
label
:due_date
,
"Due Date"
,
class:
"control-label"
.col-sm-10
=
f
.
hidden_field
:due_date
.col-sm-10
.col-sm-10
.datepicker
=
f
.
text_field
:due_date
,
class:
"datepicker form-control"
,
placeholder:
"Select due date"
.form-actions
.form-actions
-
if
@milestone
.
new_record?
-
if
@milestone
.
new_record?
...
...
app/views/shared/issuable/_form.html.haml
View file @
cc971f03
...
@@ -88,9 +88,9 @@
...
@@ -88,9 +88,9 @@
.col-lg-6
.col-lg-6
.form-group
.form-group
=
f
.
label
:due_date
,
"Due date"
,
class:
"control-label"
=
f
.
label
:due_date
,
"Due date"
,
class:
"control-label"
=
f
.
hidden_field
:due_date
,
id:
"issuable-due-date"
.col-sm-10
.col-sm-10
.datepicker
.issuable-form-select-holder
=
f
.
text_field
:due_date
,
id:
"issuable-due-date"
,
class:
"datepicker form-control"
,
placeholder:
"Select due date"
-
if
issuable
.
can_move?
(
current_user
)
-
if
issuable
.
can_move?
(
current_user
)
%hr
%hr
...
...
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