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
c73a5d59
Commit
c73a5d59
authored
Dec 05, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Truncate fix, remove unneeded admin-specific css
parent
30815a89
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
54 deletions
+28
-54
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+0
-5
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+9
-1
app/assets/stylesheets/framework/wells.scss
app/assets/stylesheets/framework/wells.scss
+13
-0
app/assets/stylesheets/pages/admin.scss
app/assets/stylesheets/pages/admin.scss
+0
-42
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+6
-6
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
c73a5d59
.light-well
{
background-color
:
$background-color
;
padding
:
15px
;
}
.centered-light-block
{
text-align
:
center
;
color
:
$gl-gray
;
...
...
app/assets/stylesheets/framework/common.scss
View file @
c73a5d59
...
...
@@ -379,7 +379,9 @@ table {
border-top
:
1px
solid
$border-color
;
}
.hide-bottom-border
{
border-bottom
:
none
!
important
;
}
.hide-bottom-border
{
border-bottom
:
none
!
important
;
}
.gl-accessibility
{
&
:focus
{
...
...
@@ -396,3 +398,9 @@ table {
z-index
:
1
;
}
}
.str-truncated
{
&
-60
{
@include
str-truncated
(
60%
);
}
}
app/assets/stylesheets/framework/wells.scss
View file @
c73a5d59
...
...
@@ -43,3 +43,16 @@
background-color
:
$well-expand-item
;
}
}
.light-well
{
background-color
:
$background-color
;
padding
:
15px
;
}
.well-centered
{
h1
{
font-weight
:
normal
;
text-align
:
center
;
font-size
:
48px
;
}
}
app/assets/stylesheets/pages/admin.scss
View file @
c73a5d59
...
...
@@ -2,48 +2,6 @@
* Admin area
*
*/
.admin-dashboard
{
.data
{
a
{
h1
{
line-height
:
48px
;
font-size
:
48px
;
padding
:
20px
;
text-align
:
center
;
font-weight
:
normal
;
}
}
}
.str-truncated
{
max-width
:
60%
;
}
}
.admin-filter
form
{
.select2-container
{
width
:
100%
;
}
.controls
{
margin-left
:
130px
;
}
.form-actions
{
padding-left
:
130px
;
background
:
$white-light
;
}
.visibility-levels
{
.controls
{
margin-bottom
:
9px
;
}
i
{
color
:
inherit
;
}
}
}
.broadcast-messages
{
.message
{
...
...
app/views/admin/dashboard/index.html.haml
View file @
c73a5d59
...
...
@@ -113,7 +113,7 @@
%hr
.row
.col-sm-4
.light-well
.light-well
.well-centered
%h4
Projects
.data
=
link_to
admin_namespaces_projects_path
do
...
...
@@ -121,7 +121,7 @@
%hr
=
link_to
(
'New Project'
,
new_project_path
,
class:
"btn btn-new"
)
.col-sm-4
.light-well
.light-well
.well-centered
%h4
Users
.data
=
link_to
admin_users_path
do
...
...
@@ -129,7 +129,7 @@
%hr
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn btn-new"
.col-sm-4
.light-well
.light-well
.well-centered
%h4
Groups
.data
=
link_to
admin_groups_path
do
...
...
@@ -143,7 +143,7 @@
%hr
-
@projects
.
each
do
|
project
|
%p
=
link_to
project
.
name_with_namespace
,
[
:admin
,
project
.
namespace
.
becomes
(
Namespace
),
project
],
class:
'str-truncated'
=
link_to
project
.
name_with_namespace
,
[
:admin
,
project
.
namespace
.
becomes
(
Namespace
),
project
],
class:
'str-truncated
-60
'
%span
.light.pull-right
#{
time_ago_with_tooltip
(
project
.
created_at
)
}
...
...
@@ -152,7 +152,7 @@
%hr
-
@users
.
each
do
|
user
|
%p
=
link_to
[
:admin
,
user
],
class:
'str-truncated'
do
=
link_to
[
:admin
,
user
],
class:
'str-truncated
-60
'
do
=
user
.
name
%span
.light.pull-right
#{
time_ago_with_tooltip
(
user
.
created_at
)
}
...
...
@@ -162,7 +162,7 @@
%hr
-
@groups
.
each
do
|
group
|
%p
=
link_to
[
:admin
,
group
],
class:
'str-truncated'
do
=
link_to
[
:admin
,
group
],
class:
'str-truncated
-60
'
do
=
group
.
name
%span
.light.pull-right
#{
time_ago_with_tooltip
(
group
.
created_at
)
}
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