diff --git a/css/roles-dropdown.css b/css/roles-dropdown.css index b574d35..1e463da 100644 --- a/css/roles-dropdown.css +++ b/css/roles-dropdown.css @@ -167,7 +167,7 @@ button.roles-btn-mini { border-bottom-left-radius: 4px; } .roles-btn-group > .roles-btn:last-child, -.roles-btn-group > .dropdown-toggle { +.roles-btn-group > .roles-dropdown-toggle { -webkit-border-top-right-radius: 4px; -moz-border-radius-topright: 4px; border-top-right-radius: 4px; @@ -181,11 +181,11 @@ button.roles-btn-mini { .roles-btn-group > .roles-btn.active { z-index: 2; } -.roles-btn-group .dropdown-toggle:active, -.roles-btn-group.open .dropdown-toggle { +.roles-btn-group .roles-dropdown-toggle:active, +.roles-btn-group.open .roles-dropdown-toggle { outline: 0; } -.roles-btn-group > .dropdown-toggle { +.roles-btn-group > .roles-dropdown-toggle { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); @@ -194,17 +194,17 @@ button.roles-btn-mini { *padding-top: 4px; *padding-bottom: 4px; } -.roles-btn-group > .roles-btn.dropdown-toggle { +.roles-btn-group > .roles-btn.roles-dropdown-toggle { padding-left: 5px; padding-right: 5px; } -.roles-btn-group.open .dropdown-toggle { +.roles-btn-group.open .roles-dropdown-toggle { background-image: none; -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); } -.roles-btn-group.open .roles-btn.dropdown-toggle { +.roles-btn-group.open .roles-btn.roles-dropdown-toggle { background-color: #e6e6e6; } .roles-btn .caret { @@ -219,14 +219,14 @@ button.roles-btn-mini { .roles-btn .caret { margin-top: 5px; } -.dropdown { +.roles-dropdown { position: relative; } -.dropdown-toggle { +.roles-dropdown-toggle { *margin-bottom: -3px; } -.dropdown-toggle:active, -.open .dropdown-toggle { +.roles-dropdown-toggle:active, +.open .roles-dropdown-toggle { outline: 0; } .caret { @@ -241,16 +241,16 @@ button.roles-btn-mini { opacity: 0.3; filter: alpha(opacity=30); } -.dropdown .caret { +.roles-dropdown .caret { margin-top: 8px; margin-left: 2px; } -.dropdown:hover .caret, +.roles-dropdown:hover .caret, .open .caret { opacity: 1; filter: alpha(opacity=100); } -.dropdown-menu { +.roles-dropdown-menu { position: absolute; top: 100%; left: 0; @@ -276,11 +276,11 @@ button.roles-btn-mini { -moz-background-clip: padding; background-clip: padding-box; } -.dropdown-menu.pull-right { +.roles-dropdown-menu.pull-right { right: 0; left: auto; } -.dropdown-menu .divider { +.roles-dropdown-menu .divider { *width: 100%; height: 1px; margin: 8px 1px; @@ -289,7 +289,7 @@ button.roles-btn-mini { background-color: #e5e5e5; border-bottom: 1px solid #ffffff; } -.dropdown-menu a { +.roles-dropdown-menu a { display: block; padding: 3px 15px; clear: both; @@ -298,9 +298,9 @@ button.roles-btn-mini { color: #333333; white-space: nowrap; } -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.roles-dropdown-menu li > a:hover, +.roles-dropdown-menu .active > a, +.roles-dropdown-menu .active > a:hover { color: #ffffff; text-decoration: none; background-color: #0088cc; @@ -308,10 +308,10 @@ button.roles-btn-mini { .open { *z-index: 1000; } -.open > .dropdown-menu { +.open > .roles-dropdown-menu { display: block; } -.pull-right > .dropdown-menu { +.pull-right > .roles-dropdown-menu { right: 0; left: auto; } diff --git a/formulaires/inc-editer_liens_actions_roles.html b/formulaires/inc-editer_liens_actions_roles.html index 126e841..6653133 100644 --- a/formulaires/inc-editer_liens_actions_roles.html +++ b/formulaires/inc-editer_liens_actions_roles.html @@ -1,12 +1,12 @@ #SET{presents,#ENV{id}|roles_presents_sur_id{#ENV{objet_source},#ENV{objet},#ENV{id_objet},#ENV{_objet_lien}}}
-[(#ENV{libelle,<:roles:modifier_roles:>})] +[(#ENV{libelle,<:roles:modifier_roles:>})] -