Merge branch 'dz-improve-content-list' into 'master'
Set consistency in list text height css Fix line height of list row. Now its 42px everywhere. Before this merge request certain row height varied from 40 to 45px. Sometimes even inside one list. cc @jschatz1 @connorshea See merge request !5666
This commit is contained in:
commit
6df51b35d5
|
@ -114,6 +114,12 @@ ul.content-list {
|
||||||
font-size: $list-font-size;
|
font-size: $list-font-size;
|
||||||
color: $list-text-color;
|
color: $list-text-color;
|
||||||
|
|
||||||
|
&.no-description {
|
||||||
|
.title {
|
||||||
|
line-height: $list-text-height;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
|
@ -134,12 +140,11 @@ ul.content-list {
|
||||||
}
|
}
|
||||||
|
|
||||||
.controls {
|
.controls {
|
||||||
padding-top: 1px;
|
|
||||||
float: right;
|
float: right;
|
||||||
|
|
||||||
> .control-text {
|
> .control-text {
|
||||||
margin-right: $gl-padding-top;
|
margin-right: $gl-padding-top;
|
||||||
line-height: 40px;
|
line-height: $list-text-height;
|
||||||
|
|
||||||
&:last-child {
|
&:last-child {
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
|
@ -150,7 +155,7 @@ ul.content-list {
|
||||||
> .btn-group {
|
> .btn-group {
|
||||||
margin-right: $gl-padding-top;
|
margin-right: $gl-padding-top;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin-top: 4px;
|
margin-top: 3px;
|
||||||
margin-bottom: 4px;
|
margin-bottom: 4px;
|
||||||
|
|
||||||
&:last-child {
|
&:last-child {
|
||||||
|
|
|
@ -43,6 +43,7 @@ $gl-header-color: $gl-title-color;
|
||||||
$list-font-size: $gl-font-size;
|
$list-font-size: $gl-font-size;
|
||||||
$list-title-color: $gl-title-color;
|
$list-title-color: $gl-title-color;
|
||||||
$list-text-color: $gl-text-color;
|
$list-text-color: $gl-text-color;
|
||||||
|
$list-text-height: 42px;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Markdown
|
* Markdown
|
||||||
|
|
|
@ -23,15 +23,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.group-row {
|
.group-row {
|
||||||
&.no-description {
|
|
||||||
.group-name {
|
|
||||||
line-height: 44px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.stats {
|
.stats {
|
||||||
float: right;
|
float: right;
|
||||||
line-height: 44px;
|
line-height: $list-text-height;
|
||||||
color: $gl-gray;
|
color: $gl-gray;
|
||||||
|
|
||||||
span {
|
span {
|
||||||
|
|
|
@ -512,18 +512,12 @@ pre.light-well {
|
||||||
.project-row {
|
.project-row {
|
||||||
border-color: $table-border-color;
|
border-color: $table-border-color;
|
||||||
|
|
||||||
&.no-description {
|
|
||||||
.project {
|
|
||||||
line-height: 40px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.project-full-name {
|
.project-full-name {
|
||||||
@include str-truncated;
|
@include str-truncated;
|
||||||
}
|
}
|
||||||
|
|
||||||
.controls {
|
.controls {
|
||||||
line-height: 40px;
|
line-height: $list-text-height;
|
||||||
|
|
||||||
a:hover {
|
a:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
|
Loading…
Reference in New Issue