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
46e6be38
Commit
46e6be38
authored
Jun 26, 2017
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port of 32838-admin-panel-spacing to EE
parent
ad8e7eb1
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
232 additions
and
211 deletions
+232
-211
app/assets/stylesheets/framework/wells.scss
app/assets/stylesheets/framework/wells.scss
+14
-0
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+179
-179
app/views/admin/licenses/_breakdown.html.haml
app/views/admin/licenses/_breakdown.html.haml
+35
-32
changelogs/unreleased/32838-admin-panel-spacing.yml
changelogs/unreleased/32838-admin-panel-spacing.yml
+4
-0
No files found.
app/assets/stylesheets/framework/wells.scss
View file @
46e6be38
...
...
@@ -3,6 +3,7 @@
color
:
$gl-text-color
;
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-default
;
margin-bottom
:
$gl-padding
;
.well-segment
{
padding
:
$gl-padding
;
...
...
@@ -21,6 +22,11 @@
font-size
:
12px
;
}
}
&
.admin-well
h4
{
border-bottom
:
1px
solid
$border-color
;
padding-bottom
:
8px
;
}
}
.icon-container
{
...
...
@@ -53,6 +59,14 @@
padding
:
15px
;
}
.dark-well
{
background-color
:
$gray-normal
;
.btn
{
width
:
100%
;
}
}
.well-centered
{
h1
{
font-weight
:
normal
;
...
...
app/views/admin/dashboard/index.html.haml
View file @
46e6be38
This diff is collapsed.
Click to expand it.
app/views/admin/licenses/_breakdown.html.haml
View file @
46e6be38
...
...
@@ -13,37 +13,40 @@
.license-panel.prepend-top-default
.row
.col-sm-4
.light-well
%h4
Users in License
.data
%h1
.center
=
licensed_users
%hr
-
if
@license
.
will_expire?
Your license is valid from
%strong
#{
@license
.
starts_at
}
to
%strong<>
#{
@license
.
expires_at
}
\.
The
%a
{
href:
'https://about.gitlab.com/license-faq/'
}
true-up model
allows having more users, and additional users will incur a retroactive charge on renewal.
.col-sm-4
.light-well
%h4
Maximum Users
.data
%h1
.center
=
number_with_delimiter
historical
%hr
This is the highest peak of users on your installation since the license started, and this is the minimum
number you need to purchase when you renew your license.
.col-sm-4
.light-well
%h4
Users over License
.data
%h1
.center
=
number_with_delimiter
users_over_license
%hr
.info-well.dark-well
.well-segment.well-centered
%h3
.center
Users in License:
=
licensed_users
%hr
-
if
@license
.
will_expire?
Your license is valid from
%strong
#{
@license
.
starts_at
}
to
%strong<>
#{
@license
.
expires_at
}
\.
The
%a
{
href:
'https://about.gitlab.com/license-faq/'
}
true-up model
has a retroactive charge for these users at the next renewal. If you want to update your
license sooner to prevent this, please contact
#{
mail_to
'sales@gitlab.com'
}
.
allows having more users, and additional users will incur a retroactive charge on renewal.
.col-sm-4
.info-well.dark-well
.well-segment.well-centered
%h3
.center
Maximum Users:
=
number_with_delimiter
historical
%hr
This is the highest peak of users on your installation since the license started, and this is the minimum
number you need to purchase when you renew your license.
.col-sm-4
.info-well.dark-well
.well-segment.well-centered
%h3
.center
Users over License:
=
number_with_delimiter
users_over_license
%hr
The
%a
{
href:
'https://about.gitlab.com/license-faq/'
}
true-up model
has a retroactive charge for these users at the next renewal. If you want to update your
license sooner to prevent this, please contact
#{
mail_to
'sales@gitlab.com'
}
.
changelogs/unreleased/32838-admin-panel-spacing.yml
0 → 100644
View file @
46e6be38
---
title
:
Add wells to admin dashboard overview to fix spacing problems
merge_request
:
author
:
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