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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5dc41ecd
Commit
5dc41ecd
authored
Jul 22, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Initial issue boards UI
parent
ec106b28
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
154 additions
and
10 deletions
+154
-10
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+2
-0
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+99
-0
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+4
-0
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+2
-3
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+1
-1
app/views/projects/boards/index.html.haml
app/views/projects/boards/index.html.haml
+24
-0
app/views/projects/boards/show.html.haml
app/views/projects/boards/show.html.haml
+22
-6
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
5dc41ecd
...
@@ -276,3 +276,5 @@ $personal-access-tokens-disabled-label-color: #bbb;
...
@@ -276,3 +276,5 @@ $personal-access-tokens-disabled-label-color: #bbb;
$ci-output-bg
:
#1d1f21
;
$ci-output-bg
:
#1d1f21
;
$ci-text-color
:
#c5c8c6
;
$ci-text-color
:
#c5c8c6
;
$issue-boards-font-size
:
15px
;
app/assets/stylesheets/pages/boards.scss
0 → 100644
View file @
5dc41ecd
.issue-boards-page
{
.page-with-sidebar
{
display
:
flex
;
min-height
:
100vh
;
max-height
:
100vh
;
}
.issue-boards-content
{
display
:
flex
;
height
:
100%
;
.content
{
display
:
flex
;
flex-direction
:
column
;
width
:
100%
;
}
}
}
.boards-list
{
display
:
flex
;
height
:
100%
;
padding-top
:
25px
;
padding-right
:
(
$gl-padding
/
2
);
padding-left
:
(
$gl-padding
/
2
);
overflow-x
:
scroll
;
}
.board
{
min-width
:
400px
;
height
:
100%
;
min-height
:
500px
;
padding-right
:
(
$gl-padding
/
2
);
padding-left
:
(
$gl-padding
/
2
);
}
.board-inner
{
display
:
flex
;
flex-direction
:
column
;
height
:
100%
;
width
:
100%
;
font-size
:
$issue-boards-font-size
;
background
:
$background-color
;
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-default
;
}
.board-inner-container
{
border-bottom
:
1px
solid
$border-color
;
padding
:
$gl-padding
;
}
.board-title
{
margin
:
0
;
font-size
:
1em
;
}
.board-search-container
{
background-color
:
#fff
;
}
.board-list
{
flex
:
1
;
margin
:
0
;
padding
:
5px
;
list-style
:
none
;
overflow
:
scroll
;
}
.card
{
width
:
100%
;
padding
:
10px
$gl-padding
;
background
:
#fff
;
border-radius
:
$border-radius-default
;
box-shadow
:
0
1px
2px
rgba
(
186
,
186
,
186
,
0
.5
);
&
:not
(
:last-child
)
{
margin-bottom
:
5px
;
}
}
.card-title
{
margin
:
0
;
font-size
:
1em
;
}
.card-footer
{
margin-top
:
5px
;
.label
{
margin-right
:
4px
;
font-size
:
(
14px
/
$issue-boards-font-size
);
}
}
.card-number
{
margin-right
:
8px
;
font-weight
:
500
;
}
app/helpers/application_helper.rb
View file @
5dc41ecd
...
@@ -320,4 +320,8 @@ module ApplicationHelper
...
@@ -320,4 +320,8 @@ module ApplicationHelper
capture
(
&
block
)
capture
(
&
block
)
end
end
end
end
def
page_class
"issue-boards-page"
if
current_controller?
(
:boards
)
end
end
end
app/views/layouts/_page.html.haml
View file @
5dc41ecd
...
@@ -23,7 +23,6 @@
...
@@ -23,7 +23,6 @@
=
render
"layouts/broadcast"
=
render
"layouts/broadcast"
=
render
"layouts/flash"
=
render
"layouts/flash"
=
yield
:flash_message
=
yield
:flash_message
%div
{
class:
(
container_class
unless
@no_container
)
}
%div
{
class:
"#{(container_class unless @no_container)} #{@content_class}"
}
.content
.content
.clearfix
=
yield
=
yield
app/views/layouts/application.html.haml
View file @
5dc41ecd
!!! 5
!!! 5
%html
{
lang:
"en"
}
%html
{
lang:
"en"
,
class:
"#{page_class}"
}
=
render
"layouts/head"
=
render
"layouts/head"
%body
{
class:
"#{user_application_theme}"
,
data:
{
page:
body_data_page
,
project:
"#{@project.path if @project}"
,
group:
"#{@group.path if @group}"
}}
%body
{
class:
"#{user_application_theme}"
,
data:
{
page:
body_data_page
,
project:
"#{@project.path if @project}"
,
group:
"#{@group.path if @group}"
}}
=
Gon
::
Base
.
render_data
=
Gon
::
Base
.
render_data
...
...
app/views/projects/boards/index.html.haml
0 → 100644
View file @
5dc41ecd
-
@no_container
=
true
-
@content_class
=
"issue-boards-content"
-
page_title
"Boards"
=
render
"projects/issues/head"
.boards-list
.board
.board-inner
%header
.board-inner-container
%h3
.board-title
Backlog
%span
.pull-right
5
.board-inner-container.board-search-container
%input
.form-control
{
type:
"text"
,
placeholder:
"Search issues"
}
%ul
.board-list
%li
.card
%h4
.card-title
Issue title
.card-footer
%span
.card-number
\#288
%span
.label.color-label
{
style:
"background-color: #428bca; color: #FFFFFF"
}
label
app/views/projects/boards/show.html.haml
View file @
5dc41ecd
-
@no_container
=
true
-
@no_container
=
true
-
@content_class
=
'issues-board-content'
-
@content_class
=
"issue-boards-content"
-
page_title
'Board'
-
page_title
"Boards"
=
render
"projects/issues/head"
=
render
'projects/issues/head'
.boards-list
=
render
'shared/issuable/filter'
,
type: :boards
.board
.board-inner
.board-lists
%header
.board-inner-container
%h3
.board-title
Backlog
%span
.pull-right
5
.board-inner-container.board-search-container
%input
.form-control
{
type:
"text"
,
placeholder:
"Search issues"
}
%ul
.board-list
%li
.card
%h4
.card-title
Issue title
.card-footer
%span
.card-number
\#288
%span
.label.color-label
{
style:
"background-color: #428bca; color: #FFFFFF"
}
label
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