Commit f0aaf620 authored by Robert Knight's avatar Robert Knight Committed by Nick Stenning

Use BEM naming consistently for dropdown menu elements

Dropdown menus were using BEM element naming in some
places and tag name selectors in others.

This updates the styling to use BEM element naming
consistently.
parent 8175c629
...@@ -106,6 +106,7 @@ $group-list-width: 270px; ...@@ -106,6 +106,7 @@ $group-list-width: 270px;
.group-item { .group-item {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-grow: 1;
padding: 10px; padding: 10px;
cursor: pointer; cursor: pointer;
......
...@@ -178,26 +178,6 @@ html { ...@@ -178,26 +178,6 @@ html {
position: absolute; position: absolute;
z-index: 2; z-index: 2;
li:not(.ng-hide) {
text-align: left;
&.inactive {
font-weight: 400;
color: $gray-lighter;
cursor: default;
&:hover {
color: $gray-lighter;
}
& * {
cursor: default;
}
}
& + li {
border-top: dotted 1px $gray-lighter;
}
}
&__link { &__link {
color: inherit; color: inherit;
...@@ -332,10 +312,20 @@ html { ...@@ -332,10 +312,20 @@ html {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
height: 40px;
padding-left: 8px; padding-left: 8px;
padding-right: 16px; padding-right: 16px;
min-height: 40px;
min-width: 120px; min-width: 120px;
&:not(:first-child) {
border-top: dotted 1px $gray-lighter;
}
}
.dropdown-menu__row--unpadded {
padding-left: 0px;
padding-right: 0px;
} }
// Radio button in a dropdown menu // Radio button in a dropdown menu
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
</span> </span>
<div class="dropdown-menu__top-arrow"></div> <div class="dropdown-menu__top-arrow"></div>
<ul class="dropdown-menu pull-none" role="menu"> <ul class="dropdown-menu pull-none" role="menu">
<li ng-repeat="group in groups.all()"> <li class="dropdown-menu__row dropdown-menu__row--unpadded "
ng-repeat="group in groups.all()">
<div ng-class="{'group-item': true, selected: group.id == groups.focused().id}" <div ng-class="{'group-item': true, selected: group.id == groups.focused().id}"
ng-click="groups.focus(group.id)"> ng-click="groups.focus(group.id)">
<!-- the group icon !--> <!-- the group icon !-->
...@@ -57,7 +58,7 @@ ...@@ -57,7 +58,7 @@
</div> </div>
</div> </div>
</li> </li>
<li class="new-group-btn"> <li class="dropdown-menu__row dropdown-menu__row--unpadded new-group-btn">
<div class="group-item" ng-click="createNewGroup()"> <div class="group-item" ng-click="createNewGroup()">
<div class="group-icon-container"><i class="h-icon-add"></i></div> <div class="group-icon-container"><i class="h-icon-add"></i></div>
<div class="group-details"> <div class="group-details">
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</dropdown-menu-btn> </dropdown-menu-btn>
<div class="publish-annotation-btn__dropdown-container"> <div class="publish-annotation-btn__dropdown-container">
<ul class="dropdown-menu pull-center group-list publish-annotation-btn__dropdown-menu" role="menu"> <ul class="dropdown-menu pull-center group-list publish-annotation-btn__dropdown-menu" role="menu">
<li ng-click="vm.setPrivacy('shared')"> <li class="dropdown-menu__row" ng-click="vm.setPrivacy('shared')">
<div class="group-item"> <div class="group-item">
<div class="group-icon-container"> <div class="group-icon-container">
<i class="small" ng-class="'h-icon-' + vm.group.type"></i> <i class="small" ng-class="'h-icon-' + vm.group.type"></i>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</div> </div>
</div> </div>
</li> </li>
<li ng-click="vm.setPrivacy('private')"> <li class="dropdown-menu__row" ng-click="vm.setPrivacy('private')">
<div class="group-item"> <div class="group-item">
<div class="group-icon-container"> <div class="group-icon-container">
<i class="small h-icon-lock"></i> <i class="small h-icon-lock"></i>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment