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

Merge branch 'master' into discussions

Browse source
This commit is contained in:
Riyad Preukschas 2013-01-15 00:53:00 +01:00
commit bda7fe38d0
70 changed files with 571 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/sections/admin.scss Normal file
View file

@ -0,0 +1,5 @@
.admin-filter form {
label { width: 110px; }
.controls { margin-left: 130px; }
.form-actions { padding-left: 130px; background: #fff }
}

24
app/assets/stylesheets/sections/events.scss
View file

@ -132,21 +132,25 @@
.event_filter {
position: absolute;
width: 40px;
margin-left: -50px;
margin-left: -55px;
.filter_icon {
float: left;
border-left: 3px solid #4bc;
padding: 7px;
background: #f9f9f9;
margin-bottom: 10px;
img {
width: 20px;
a {
text-align:center;
border-left: 3px solid #29B;
background: #f9f9f9;
margin-bottom: 10px;
float: left;
padding: 9px 7px;
font-size: 18px;
width: 26px;
}
&.inactive {
border-left: 3px solid #EEE;
opacity: 0.5;
a {
color: #DDD;
border-left: 3px solid #EEE;
}
}
}
}

12
app/assets/stylesheets/sections/tree.scss
View file

@ -80,6 +80,18 @@
margin: 0;
padding: 0;
}
td.blame-commit {
background: #f9f9f9;
min-width: 350px;
}
td.blame-numbers {
pre {
color: #AAA;
white-space: pre;
}
background: #f1f1f1;
border-left: 1px solid #DDD;
}
}
}