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
Kazuhiko Shiozaki
gitlab-ce
Commits
8f22834c
Commit
8f22834c
authored
12 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bootstrap 2 integration complete.
parent
2587de74
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
13 deletions
+3
-13
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+2
-2
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+0
-10
app/views/keys/index.html.haml
app/views/keys/index.html.haml
+1
-1
No files found.
app/assets/stylesheets/common.scss
View file @
8f22834c
...
@@ -9,8 +9,8 @@
...
@@ -9,8 +9,8 @@
.container
{
.container
{
padding-top
:
0
;
padding-top
:
0
;
z-index
:
5
;
z-index
:
5
;
min-width
:
$min_app_width
;
padding
:
0
20px
;
padding
:
0
20px
min-width
:
$min_app_width
;
}
}
.container
.content
{
.container
.content
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
8f22834c
...
@@ -118,16 +118,6 @@ table {
...
@@ -118,16 +118,6 @@ table {
&
.primary
{
&
.primary
{
@extend
.btn-primary
;
@extend
.btn-primary
;
}
}
&
.btn-danger
{
background
:
#DD4B39
;
color
:white
;
border-color
:
#990000
;
text-shadow
:
0
0
1px
#111
;
&
:hover
{
color
:white
;
background
:
#DD0000
;
}
}
&
.danger
{
&
.danger
{
@extend
.btn-danger
;
@extend
.btn-danger
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/views/keys/index.html.haml
View file @
8f22834c
...
@@ -4,6 +4,6 @@
...
@@ -4,6 +4,6 @@
%br
%br
%table
#keys-table
%table
#keys-table
.table
-
@keys
.
each
do
|
key
|
-
@keys
.
each
do
|
key
|
=
render
(
:partial
=>
'show'
,
:locals
=>
{
:key
=>
key
})
=
render
(
:partial
=>
'show'
,
:locals
=>
{
:key
=>
key
})
This diff is collapsed.
Click to expand it.
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