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
43701de5
Commit
43701de5
authored
Sep 22, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Makes Cycle analytics mobile friendly
parent
4d3dde47
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
26 deletions
+44
-26
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+7
-0
app/assets/stylesheets/pages/cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+25
-16
app/views/projects/cycle_analytics/show.html.haml
app/views/projects/cycle_analytics/show.html.haml
+12
-10
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
43701de5
...
@@ -269,6 +269,13 @@ $calendar-hover-bg: #ecf3fe;
...
@@ -269,6 +269,13 @@ $calendar-hover-bg: #ecf3fe;
$calendar-border-color
:
rgba
(
#000
,
.1
);
$calendar-border-color
:
rgba
(
#000
,
.1
);
$calendar-unselectable-bg
:
$gray-light
;
$calendar-unselectable-bg
:
$gray-light
;
/*
* Cycle Analytics
*/
$cycle-analytics-box-padding
:
30px
;
$cycle-analytics-box-margin-bottom
:
16px
;
$cycle-analytics-box-text-color
:
#8c8c8c
;
/*
/*
* Personal Access Tokens
* Personal Access Tokens
*/
*/
...
...
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
43701de5
#cycle-analytics
{
#cycle-analytics
{
margin
:
24px
auto
0
;
margin
:
24px
auto
0
;
width
:
800px
;
max-
width
:
800px
;
position
:
relative
;
position
:
relative
;
.panel
{
.panel
{
...
@@ -32,15 +32,19 @@
...
@@ -32,15 +32,19 @@
}
}
.dropdown
{
.dropdown
{
position
:
relative
;
top
:
13px
;
top
:
13px
;
@media
(
max-width
:
$screen-sm-min
)
{
right
:
15px
;
top
:
30px
;
}
}
}
}
}
.bordered-box
{
.bordered-box
{
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
@include
border-radius
(
$border-radius-default
);
@include
border-radius
(
$border-radius-default
);
position
:
relative
;
}
}
.content-list
{
.content-list
{
...
@@ -62,7 +66,7 @@
...
@@ -62,7 +66,7 @@
font-weight
:
600
;
font-weight
:
600
;
}
}
&
:text
{
&
:text
{
color
:
#8c8c8c
;
color
:
$cycle-analytics-box-text-color
;
}
}
}
}
}
}
...
@@ -77,26 +81,31 @@
...
@@ -77,26 +81,31 @@
}
}
.landing
{
.landing
{
margin-bottom
:
$
gl-padding
;
margin-bottom
:
$
cycle-analytics-box-margin-bottom
;
overflow
:
hidden
;
overflow
:
hidden
;
.dismiss-icon
{
.dismiss-icon
{
position
:
absolute
;
position
:
absolute
;
right
:
$
gl
-padding
;
right
:
$
cycle-analytics-box
-padding
;
cursor
:
pointer
;
cursor
:
pointer
;
color
:
#b2b2b2
;
color
:
#b2b2b2
;
}
}
.svg-container
{
text-align
:
center
;
svg
{
svg
{
margin
:
0
20px
;
float
:
left
;
width
:
136px
;
width
:
136px
;
height
:
136px
;
height
:
136px
;
}
}
}
.inner-content
{
.inner-content
{
width
:
480px
;
text-align
:
center
;
float
:
left
;
@media
(
max-width
:
$screen-sm-min
)
{
padding
:
0
28px
;
}
h4
{
h4
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
...
@@ -104,8 +113,8 @@
...
@@ -104,8 +113,8 @@
}
}
p
{
p
{
color
:
#8c8c8c
;
color
:
$cycle-analytics-box-text-color
;
margin-bottom
:
$
gl-padding
;
margin-bottom
:
$
cycle-analytics-box-margin-bottom
;
}
}
}
}
}
}
...
...
app/views/projects/cycle_analytics/show.html.haml
View file @
43701de5
...
@@ -2,12 +2,14 @@
...
@@ -2,12 +2,14 @@
-
page_title
"Cycle Analytics"
-
page_title
"Cycle Analytics"
=
render
"projects/pipelines/head"
=
render
"projects/pipelines/head"
#cycle-analytics
{
"v-cloak"
=>
"true"
,
data:
{
request_path:
project_cycle_analytics_path
(
@project
)}}
#cycle-analytics
{
class:
container_class
,
"v-cloak"
=>
"true"
,
data:
{
request_path:
project_cycle_analytics_path
(
@project
)}}
.bordered-box.landing.content-block
{
"v-if"
=>
"!isHelpDismissed"
}
.bordered-box.landing.content-block
{
"v-if"
=>
"!isHelpDismissed"
}
=
icon
(
'times'
,
class:
'dismiss-icon'
,
"@click"
:
"dismissLanding()"
)
=
icon
(
'times'
,
class:
'dismiss-icon'
,
"@click"
:
"dismissLanding()"
)
.row
.col-sm-3.col-xs-12.svg-container
=
custom_icon
(
'icon_cycle_analytics_splash'
)
=
custom_icon
(
'icon_cycle_analytics_splash'
)
.inner-content
.col-sm-8.col-xs-12
.inner-content
%h4
%h4
Introducing Cycle Analytics
Introducing Cycle Analytics
%p
%p
...
@@ -25,11 +27,11 @@
...
@@ -25,11 +27,11 @@
.content-block
.content-block
.container-fluid
.container-fluid
.row
.row
.col-
xs-3
.column
{
"v-for"
=>
"item in summary"
}
.col-
sm-3.col-xs-6
.column
{
"v-for"
=>
"item in summary"
}
%h3
.header
{{item.value}}
%h3
.header
{{item.value}}
%p
.text
{{item.title}}
%p
.text
{{item.title}}
.col-
xs-3
.column
.col-
sm-3.col-xs-6
.column
.dropdown.inline.js-ca-dropdown
.dropdown.inline.js-ca-dropdown
%button
.dropdown-menu-toggle
{
"data-toggle"
=>
"dropdown"
,
:type
=>
"button"
}
%button
.dropdown-menu-toggle
{
"data-toggle"
=>
"dropdown"
,
:type
=>
"button"
}
%span
.dropdown-label
Last 30 days
%span
.dropdown-label
Last 30 days
...
...
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