BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
be3edeb6
Commit
be3edeb6
authored
Mar 07, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small UI improvements after css refactoring
parent
e2b8025a
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
19 deletions
+15
-19
gl_bootstrap.scss
app/assets/stylesheets/base/gl_bootstrap.scss
+1
-1
buttons.scss
app/assets/stylesheets/generic/buttons.scss
+0
-7
gfm.scss
app/assets/stylesheets/generic/gfm.scss
+1
-1
selects.scss
app/assets/stylesheets/generic/selects.scss
+2
-1
issues.scss
app/assets/stylesheets/pages/issues.scss
+1
-1
index.html.haml
app/views/admin/projects/index.html.haml
+2
-2
index.html.haml
app/views/admin/users/index.html.haml
+2
-2
projects.html.haml
app/views/groups/projects.html.haml
+1
-1
show.html.haml
app/views/profiles/show.html.haml
+5
-3
No files found.
app/assets/stylesheets/base/gl_bootstrap.scss
View file @
be3edeb6
...
...
@@ -157,7 +157,7 @@
.panel-head-actions
{
position
:
relative
;
top
:
-
7
px
;
top
:
-
6
px
;
float
:
right
;
}
}
...
...
app/assets/stylesheets/generic/buttons.scss
View file @
be3edeb6
...
...
@@ -6,12 +6,10 @@
}
&
.btn-create
{
@extend
.wide
;
@extend
.btn-success
;
}
&
.btn-save
{
@extend
.wide
;
@extend
.btn-primary
;
}
...
...
@@ -23,11 +21,6 @@
float
:
right
;
}
&
.wide
{
padding-left
:
20px
;
padding-right
:
20px
;
}
&
.btn-small
{
padding
:
2px
10px
;
font-size
:
12px
;
...
...
app/assets/stylesheets/generic/gfm.scss
View file @
be3edeb6
...
...
@@ -3,7 +3,7 @@
*/
.issue-form
,
.merge-request-form
,
.wiki-form
{
.description
{
height
:
1
8
em
;
height
:
1
6
em
;
border-top-left-radius
:
0
;
}
}
...
...
app/assets/stylesheets/generic/selects.scss
View file @
be3edeb6
...
...
@@ -3,10 +3,11 @@
.select2-choice
{
background
:
#FFF
;
border-color
:
#BBB
;
padding
:
8
px
14px
;
padding
:
6
px
14px
;
font-size
:
13px
;
line-height
:
18px
;
height
:
auto
;
margin
:
2px
0
;
.select2-arrow
{
background
:
#FFF
;
...
...
app/assets/stylesheets/pages/issues.scss
View file @
be3edeb6
...
...
@@ -40,7 +40,7 @@
}
.check-all-holder
{
height
:
3
2
px
;
height
:
3
6
px
;
float
:
left
;
margin-right
:
12px
;
padding
:
6px
15px
;
...
...
app/views/admin/projects/index.html.haml
View file @
be3edeb6
...
...
@@ -44,7 +44,7 @@
Projects (
#{
@projects
.
total_count
}
)
.panel-head-actions
.dropdown.inline
%button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%button
.dropdown-toggle.btn
.btn-sm
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.light
sort:
-
if
@sort
.
present?
=
sort_options_hash
[
@sort
]
...
...
@@ -63,7 +63,7 @@
=
sort_title_oldest_updated
=
link_to
admin_namespaces_projects_path
(
sort:
sort_value_largest_repo
)
do
=
sort_title_largest_repo
=
link_to
'New Project'
,
new_project_path
,
class:
"btn btn-
new
"
=
link_to
'New Project'
,
new_project_path
,
class:
"btn btn-
sm btn-success
"
%ul
.well-list
-
@projects
.
each
do
|
project
|
%li
...
...
app/views/admin/users/index.html.haml
View file @
be3edeb6
...
...
@@ -35,7 +35,7 @@
Users (
#{
@users
.
total_count
}
)
.panel-head-actions
.dropdown.inline
%a
.dropdown-toggle.btn
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%a
.dropdown-toggle.btn
.btn-sm
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%span
.light
sort:
-
if
@sort
.
present?
=
sort_options_hash
[
@sort
]
...
...
@@ -59,7 +59,7 @@
=
link_to
admin_users_path
(
sort:
sort_value_oldest_updated
)
do
=
sort_title_oldest_updated
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn btn-new"
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn btn-new
btn-sm
"
%ul
.well-list
-
@users
.
each
do
|
user
|
%li
...
...
app/views/groups/projects.html.haml
View file @
be3edeb6
...
...
@@ -4,7 +4,7 @@
projects:
-
if
can?
current_user
,
:manage_group
,
@group
.panel-head-actions
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
"btn btn-
new
"
do
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
"btn btn-
sm btn-success
"
do
%i
.fa.fa-plus
New Project
%ul
.well-list
...
...
app/views/profiles/show.html.haml
View file @
be3edeb6
...
...
@@ -56,7 +56,7 @@
.form-group
=
f
.
label
:bio
,
class:
"control-label"
.col-sm-10
=
f
.
text_area
:bio
,
rows:
6
,
class:
"form-control"
,
maxlength:
250
=
f
.
text_area
:bio
,
rows:
4
,
class:
"form-control"
,
maxlength:
250
%span
.help-block
Tell us about yourself in fewer than 250 characters.
.col-md-5
...
...
@@ -94,5 +94,7 @@
%p
Your profile is publicly visible because you joined public project(s)
.form-actions
=
f
.
submit
'Save changes'
,
class:
"btn btn-save"
.row
.col-md-7
.col-sm-2
=
f
.
submit
'Save changes'
,
class:
"btn btn-success"
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