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
Tatuya Kamada
gitlab-ce
Commits
b66d9c4f
Commit
b66d9c4f
authored
May 29, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ui-box css
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
a2b3eb13
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
175 deletions
+19
-175
app/assets/stylesheets/generic/ui_box.scss
app/assets/stylesheets/generic/ui_box.scss
+0
-164
app/assets/stylesheets/gl_bootstrap.scss
app/assets/stylesheets/gl_bootstrap.scss
+10
-1
app/assets/stylesheets/sections/dashboard.scss
app/assets/stylesheets/sections/dashboard.scss
+8
-9
app/views/groups/_projects.html.haml
app/views/groups/_projects.html.haml
+1
-1
No files found.
app/assets/stylesheets/generic/ui_box.scss
deleted
100644 → 0
View file @
a2b3eb13
/**
* UI box:
* Block element for separating information on page.
* Used for storing issues lists, grouped data.
* You can have multiple ui boxes on one page
*
* Classes:
* .ui-box - for any block & widgets
* .ui-box.ui-box-small - same but with smaller title
* .ui-box.ui-box-danger - with red title
*
* Ex. 1: List
* .ui-box
* .title
* # title here
* %ul
* # content here
*
* Ex. 2: Block data
* .ui-box
* .title
* # title here
* .body
* # content here
*
*/
.ui-box
{
background
:
#FFF
;
margin-bottom
:
20px
;
border
:
1px
solid
#DDD
;
word-wrap
:
break-word
;
img
{
max-width
:
100%
;
}
pre
{
code
{
background
:
none
!
important
;
}
}
ul
{
margin
:
0
;
padding
:
0
;
}
.title
{
background-color
:
#EEE
;
border-bottom
:
1px
solid
#DDD
;
color
:
#666
;
font-size
:
16px
;
text-shadow
:
0
1px
1px
#fff
;
padding
:
0
10px
;
font-size
:
14px
;
line-height
:
40px
;
font-weight
:
normal
;
margin
:
0
;
>
a
{
text-shadow
:
0
1px
1px
#fff
;
}
form
{
margin-bottom
:
0
;
margin-top
:
0
;
}
.btn
{
vertical-align
:
middle
;
padding
:
4px
12px
;
@include
box-shadow
(
0
0px
1px
1px
#f2f2f2
);
}
.nav-pills
{
>
li
{
>
a
{
padding
:
13px
;
margin
:
0
;
font-size
:
13px
;
}
&
.active
{
>
a
{
background
:
#D5D5D5
;
color
:
$style_color
;
@include
border-radius
(
0
);
border-radius
:
0
;
border-left
:
1px
solid
#CCC
;
border-right
:
1px
solid
#CCC
;
}
}
}
}
}
.body
{
padding
:
10px
;
}
&
.padded
{
h5
,
.title
{
margin
:
-20px
;
margin-bottom
:
0
;
padding
:
5px
20px
;
}
}
.form-holder
{
padding-top
:
20px
;
form
{
margin-bottom
:
0
;
legend
{
text-indent
:
10px
;
}
.form-actions
{
margin-bottom
:
0
;
}
}
}
}
/*
* Small box
*/
.ui-box.ui-box-small
{
margin-bottom
:
10px
;
.title
{
font-size
:
13px
;
line-height
:
30px
;
a
{
color
:
#666
;
&
:hover
{
text-decoration
:
underline
;
}
}
}
}
/*
* Danger box
*/
.ui-box.ui-box-danger
{
background
:
#f7f7f7
;
border
:
none
;
.title
{
background
:
#D65
;
color
:
#fff
;
text-shadow
:
none
;
font-weight
:
500
;
}
}
/*
* Block under tw-bootstrap tabs
*/
.tab-pane
{
.ui-box
{
margin
:
3px
3px
25px
3px
;
}
}
app/assets/stylesheets/gl_bootstrap.scss
View file @
b66d9c4f
...
@@ -227,5 +227,14 @@ ul.breadcrumb {
...
@@ -227,5 +227,14 @@ ul.breadcrumb {
*
*
*/
*/
.panel
{
.panel
{
.panel-heading
{
font-size
:
14px
;
line-height
:
18px
;
.panel-head-actions
{
position
:
relative
;
top
:
-7px
;
float
:
right
;
}
}
}
}
app/assets/stylesheets/sections/dashboard.scss
View file @
b66d9c4f
.dashboard
{
.dashboard
{
.side
{
.side
{
.ui-box
{
.panel
{
margin
:
0px
;
.panel-heading
{
box-shadow
:
none
;
background
:
#EEE
;
border-top-left-radius
:
0
;
.nav-projects-tabs
li
{
padding
:
0
;
}
}
border-top-left-radius
:
0
;
}
}
}
}
}
}
...
@@ -24,9 +25,7 @@
...
@@ -24,9 +25,7 @@
.dashboard
{
.dashboard
{
.dash-filter
{
.dash-filter
{
margin
:
7px
0
;
width
:
205px
;
padding
:
4px
6px
;
width
:
220px
;
float
:
left
;
float
:
left
;
height
:
inherit
;
height
:
inherit
;
}
}
...
@@ -34,7 +33,7 @@
...
@@ -34,7 +33,7 @@
@media
(
max-width
:
1200px
)
{
@media
(
max-width
:
1200px
)
{
.dashboard
.dash-filter
{
.dashboard
.dash-filter
{
width
:
1
5
0px
;
width
:
1
4
0px
;
}
}
}
}
...
...
app/views/groups/_projects.html.haml
View file @
b66d9c4f
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.panel-heading
.panel-heading
Projects (
#{
projects
.
count
}
)
Projects (
#{
projects
.
count
}
)
-
if
can?
current_user
,
:create_projects
,
@group
-
if
can?
current_user
,
:create_projects
,
@group
%span
.pull-right
.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-new"
do
%i
.icon-plus
%i
.icon-plus
New project
New project
...
...
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