deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'dev'

Browse source 
Conflicts:
	app/assets/images/ajax-loader.gif
	public/favicon.ico
This commit is contained in:
Dmitriy Zaporozhets 2011-11-06 21:07:56 +02:00
commit b8ca1d62c4
195 changed files with 6402 additions and 1158 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
public/apple-touch-icon-114x114-precomposed.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
public/apple-touch-icon-57x57-precomposed.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 640 B

BIN
public/apple-touch-icon-72x72-precomposed.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 747 B

BIN
public/apple-touch-icon-precomposed.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 640 B

BIN
public/apple-touch-icon.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 640 B

5
public/index.html.example
View file

@ -25,7 +25,6 @@
text-decoration: none;
}
#page {
background-color: #f0f0f0;
width: 750px;
@ -57,7 +56,6 @@
padding-right: 30px;
}
#header {
background-image: url("/assets/rails.png");
background-repeat: no-repeat;
@ -71,7 +69,6 @@
font-size: 16px;
}
#about h3 {
margin: 0;
margin-bottom: 10px;
@ -112,7 +109,6 @@
padding: 10px;
}
#getting-started {
border-top: 1px solid #ccc;
margin-top: 25px;
@ -149,7 +145,6 @@
font-size: 13px;
}
#sidebar ul {
margin-left: 0;
padding-left: 0;