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
0392669c
Commit
0392669c
authored
Dec 31, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some css after bootstrap 3
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
010a770b
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
31 additions
and
16 deletions
+31
-16
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/assets/stylesheets/gitlab_bootstrap/common.scss
+7
-0
app/assets/stylesheets/gitlab_bootstrap/files.scss
app/assets/stylesheets/gitlab_bootstrap/files.scss
+0
-1
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+4
-0
app/assets/stylesheets/gitlab_bootstrap/typography.scss
app/assets/stylesheets/gitlab_bootstrap/typography.scss
+1
-5
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+15
-4
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+1
-1
app/assets/stylesheets/selects.scss
app/assets/stylesheets/selects.scss
+1
-0
app/views/projects/blob/_blob.html.haml
app/views/projects/blob/_blob.html.haml
+0
-1
app/views/projects/commits/_head.html.haml
app/views/projects/commits/_head.html.haml
+1
-1
app/views/projects/issues/_head.html.haml
app/views/projects/issues/_head.html.haml
+1
-1
app/views/projects/tree/_tree.html.haml
app/views/projects/tree/_tree.html.haml
+0
-2
No files found.
app/assets/stylesheets/gitlab_bootstrap/common.scss
View file @
0392669c
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
.append-right-10
{
margin-right
:
10px
}
.append-right-10
{
margin-right
:
10px
}
.append-right-20
{
margin-right
:
20px
}
.append-right-20
{
margin-right
:
20px
}
.append-bottom-10
{
margin-bottom
:
10px
}
.append-bottom-10
{
margin-bottom
:
10px
}
.append-bottom-15
{
margin-bottom
:
15px
}
.append-bottom-20
{
margin-bottom
:
20px
}
.append-bottom-20
{
margin-bottom
:
20px
}
.inline
{
display
:
inline-block
}
.inline
{
display
:
inline-block
}
...
@@ -129,3 +130,9 @@ pre.well-pre {
...
@@ -129,3 +130,9 @@ pre.well-pre {
.gl-hide
{
.gl-hide
{
display
:
none
;
display
:
none
;
}
}
.breadcrumb
>
li
+
li
:before
{
content
:
"/"
;
padding
:
0
;
color
:
#666
;
}
app/assets/stylesheets/gitlab_bootstrap/files.scss
View file @
0392669c
...
@@ -20,7 +20,6 @@
...
@@ -20,7 +20,6 @@
text-align
:
left
;
text-align
:
left
;
color
:
$style_color
;
color
:
$style_color
;
padding
:
9px
10px
;
padding
:
9px
10px
;
height
:
18px
;
.options
{
.options
{
float
:
right
;
float
:
right
;
...
...
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
View file @
0392669c
...
@@ -84,6 +84,10 @@
...
@@ -84,6 +84,10 @@
}
}
@mixin
md-typography
{
@mixin
md-typography
{
img
{
max-width
:
100%
;
}
*
:first-child
{
*
:first-child
{
margin-top
:
0
;
margin-top
:
0
;
}
}
...
...
app/assets/stylesheets/gitlab_bootstrap/typography.scss
View file @
0392669c
...
@@ -2,11 +2,6 @@
...
@@ -2,11 +2,6 @@
* Headers
* Headers
*
*
*/
*/
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
font-weight
:
500
;
line-height
:
1
.1
;
}
h1
.page-title
{
h1
.page-title
{
@include
page-title
;
@include
page-title
;
font-size
:
28px
;
font-size
:
28px
;
...
@@ -99,6 +94,7 @@ a:focus {
...
@@ -99,6 +94,7 @@ a:focus {
background
:
#f5f5f5
;
background
:
#f5f5f5
;
}
}
ul
{
ul
{
padding
:
0
;
margin
:
0
0
9px
25px
!
important
;
margin
:
0
0
9px
25px
!
important
;
}
}
}
}
...
...
app/assets/stylesheets/sections/header.scss
View file @
0392669c
...
@@ -103,7 +103,6 @@ header {
...
@@ -103,7 +103,6 @@ header {
}
}
.search-input
{
.search-input
{
width
:
300px
;
background-image
:
url("icon-search.png")
;
background-image
:
url("icon-search.png")
;
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
background-position
:
10px
;
background-position
:
10px
;
...
@@ -115,9 +114,6 @@ header {
...
@@ -115,9 +114,6 @@ header {
border
:
1px
solid
#c6c6c6
;
border
:
1px
solid
#c6c6c6
;
box-shadow
:
none
;
box-shadow
:
none
;
@include
transition
(
all
0
.15s
ease-in
0s
);
@include
transition
(
all
0
.15s
ease-in
0s
);
&
:focus
{
width
:
400px
;
}
}
}
}
}
...
@@ -201,3 +197,18 @@ header {
...
@@ -201,3 +197,18 @@ header {
}
}
}
}
.search
.search-input
{
width
:
300px
;
&
:focus
{
width
:
400px
;
}
}
@media
(
max-width
:
1200px
)
{
.search
.search-input
{
width
:
200px
;
&
:focus
{
width
:
300px
;
}
}
}
app/assets/stylesheets/sections/tree.scss
View file @
0392669c
...
@@ -111,7 +111,7 @@
...
@@ -111,7 +111,7 @@
.tree-ref-holder
{
.tree-ref-holder
{
float
:
left
;
float
:
left
;
margin-top
:
5
px
;
margin-top
:
8
px
;
}
}
.readme-holder
{
.readme-holder
{
...
...
app/assets/stylesheets/selects.scss
View file @
0392669c
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
min-width
:
100px
;
min-width
:
100px
;
.chosen-single
{
.chosen-single
{
height
:
26px
;
background
:
#EEE
!
important
;
background
:
#EEE
!
important
;
border
:
1px
solid
#DDD
!
important
;
border
:
1px
solid
#DDD
!
important
;
@include
box-shadow
(
none
!
important
);
@include
box-shadow
(
none
!
important
);
...
...
app/views/projects/blob/_blob.html.haml
View file @
0392669c
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
=
link_to
project_tree_path
(
@project
,
@ref
)
do
=
link_to
project_tree_path
(
@project
,
@ref
)
do
=
@project
.
path
=
@project
.
path
-
tree_breadcrumbs
(
@tree
,
6
)
do
|
title
,
path
|
-
tree_breadcrumbs
(
@tree
,
6
)
do
|
title
,
path
|
\/
%li
%li
-
if
path
-
if
path
-
if
path
.
end_with?
(
@path
)
-
if
path
.
end_with?
(
@path
)
...
...
app/views/projects/commits/_head.html.haml
View file @
0392669c
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
.append-bottom-15
%li
=
render
partial:
'shared/ref_switcher'
,
locals:
{
destination:
'commits'
}
%li
=
render
partial:
'shared/ref_switcher'
,
locals:
{
destination:
'commits'
}
=
nav_link
(
controller:
[
:commit
,
:commits
])
do
=
nav_link
(
controller:
[
:commit
,
:commits
])
do
...
...
app/views/projects/issues/_head.html.haml
View file @
0392669c
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
.append-bottom-15
=
nav_link
(
controller: :issues
)
do
=
nav_link
(
controller: :issues
)
do
=
link_to
project_issues_path
(
@project
),
class:
"tab"
do
=
link_to
project_issues_path
(
@project
),
class:
"tab"
do
Browse Issues
Browse Issues
...
...
app/views/projects/tree/_tree.html.haml
View file @
0392669c
...
@@ -4,14 +4,12 @@
...
@@ -4,14 +4,12 @@
=
link_to
project_tree_path
(
@project
,
@ref
)
do
=
link_to
project_tree_path
(
@project
,
@ref
)
do
=
@project
.
path
=
@project
.
path
-
tree_breadcrumbs
(
tree
,
6
)
do
|
title
,
path
|
-
tree_breadcrumbs
(
tree
,
6
)
do
|
title
,
path
|
\/
%li
%li
-
if
path
-
if
path
=
link_to
truncate
(
title
,
length:
40
),
project_tree_path
(
@project
,
path
)
=
link_to
truncate
(
title
,
length:
40
),
project_tree_path
(
@project
,
path
)
-
else
-
else
=
link_to
title
,
'#'
=
link_to
title
,
'#'
-
if
@repository
.
branch_names
.
include?
(
@ref
)
-
if
@repository
.
branch_names
.
include?
(
@ref
)
\/
%li
%li
=
link_to
project_new_tree_path
(
@project
,
@id
),
title:
'New file'
,
id:
'new-file-link'
do
=
link_to
project_new_tree_path
(
@project
,
@id
),
title:
'New file'
,
id:
'new-file-link'
do
%small
%small
...
...
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