Merge branch 'cleanup-css' into 'master'
Improve css code quality for projects.scss Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1674
This commit is contained in:
commit
1d6358d360
2 changed files with 16 additions and 17 deletions
|
@ -50,7 +50,17 @@
|
|||
}
|
||||
|
||||
.project-home-dropdown {
|
||||
margin: 11px 3px 0;
|
||||
margin: 13px 0px 0;
|
||||
}
|
||||
|
||||
.notifications-btn {
|
||||
.fa-bell {
|
||||
margin-right: 6px;
|
||||
}
|
||||
|
||||
.fa-angle-down {
|
||||
margin-left: 6px;
|
||||
}
|
||||
}
|
||||
|
||||
.project-home-desc {
|
||||
|
@ -85,6 +95,7 @@
|
|||
color: inherit;
|
||||
}
|
||||
}
|
||||
|
||||
.input-group {
|
||||
display: inline-table;
|
||||
position: relative;
|
||||
|
@ -233,23 +244,11 @@
|
|||
}
|
||||
}
|
||||
|
||||
.fa-fw {
|
||||
i {
|
||||
margin-right: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
.fa-bell {
|
||||
margin-right: 6px;
|
||||
}
|
||||
|
||||
.fa-angle-down {
|
||||
margin-left: 6px;
|
||||
}
|
||||
|
||||
.project-home-panel .project-home-dropdown {
|
||||
margin: 13px 0px 0;
|
||||
}
|
||||
|
||||
.project-visibility-level-holder {
|
||||
.radio {
|
||||
margin-bottom: 10px;
|
||||
|
@ -548,7 +547,7 @@ pre.light-well {
|
|||
margin-right: -$gl-padding;
|
||||
padding: $gl-padding;
|
||||
border-top: 0;
|
||||
|
||||
|
||||
.edit-project-readme {
|
||||
z-index: 100;
|
||||
position: relative;
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
= hidden_field_tag :notification_id, @membership.id
|
||||
= hidden_field_tag :notification_level
|
||||
%span.dropdown
|
||||
%a.dropdown-new.btn.btn-new#notifications-button{href: '#', "data-toggle" => "dropdown"}
|
||||
%a.dropdown-new.btn.notifications-btn#notifications-button{href: '#', "data-toggle" => "dropdown"}
|
||||
= icon('bell')
|
||||
= notification_label(@membership)
|
||||
= icon('angle-down')
|
||||
|
@ -14,7 +14,7 @@
|
|||
= notification_list_item(level, @membership)
|
||||
|
||||
- when GroupMember
|
||||
.btn.btn-new.disabled.has_tooltip{title: "To change the notification level, you need to be a member of the project itself, not only its group."}
|
||||
.btn.disabled.notifications-btn.has_tooltip{title: "To change the notification level, you need to be a member of the project itself, not only its group."}
|
||||
= icon('bell')
|
||||
= notification_label(@membership)
|
||||
= icon('angle-down')
|
||||
|
|
Loading…
Reference in a new issue