From 87fc70f84b5000ad9e96c655e81f407f3aac76f4 Mon Sep 17 00:00:00 2001 From: Zacharie Date: Fri, 24 Apr 2020 15:47:49 +0200 Subject: [PATCH] Implement group's plugin page * Add and remove group functions (in ajax) * Clean up code to comply with W3C (remove labels without input and incorrect ul/li) --- admin/themes/clear/theme.css | 20 +- admin/themes/default/template/group_list.tpl | 700 ++++++------------- admin/themes/default/theme.css | 73 +- admin/themes/roma/theme.css | 30 +- 4 files changed, 273 insertions(+), 550 deletions(-) diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index 626018d1a..dacc008ff 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -313,26 +313,26 @@ UL.thumbnails li.rank-of-image {background-color: #ddd;} p.albumTitle img {margin-bottom:-3px;} -.groups li, -.groups .showCreateAlbum, +.groups .GroupContainer, +.groups .showCreateGroup, .groups .addGroupFormBlock{ font-size: 1.2em; background-color:#fafafa; } -.groups label>p, +.groups .Group-name>p, .addGroupForm .addGroupFormTitle{ color:#3c3c3c; font-size: 1.2em; } -.groups li, -.groups .showCreateAlbum, +.groups .GroupContainer, +.groups .showCreateGroup, .groups .addGroupFormBlock{ box-shadow: -1px 1px 2px #e7e7e7; } -.groups .showCreateAlbum:hover #addGroup, +.groups .showCreateGroup:hover #addGroup, .groups .addGroupFormTitle{ color:#3c3c3c; text-decoration:none; @@ -378,11 +378,11 @@ label>p.group_select { /*Edit group name*/ -.groups label{ +.groups .Group-name{ color:#3c3c3c; } -.groups label .Group-name-container p:focus{ +.groups .Group-name .Group-name-container p:focus{ border:1px solid #3c3c3c!important; background-color:white; } @@ -565,11 +565,11 @@ input:focus + .slider { border:2px solid #ffa646; } -.groups .Group-checkbox-container:hover input ~ .group-checkmark { +.groups .Group-checkbox:hover input ~ .group-checkmark { background-color: #ffa646; } -.groups .Group-checkbox-container input:checked ~ .group-checkmark { +.groups .Group-checkbox input:checked ~ .group-checkmark { background-color: #ffa646; } diff --git a/admin/themes/default/template/group_list.tpl b/admin/themes/default/template/group_list.tpl index ede527b3a..cfc6b61f7 100644 --- a/admin/themes/default/template/group_list.tpl +++ b/admin/themes/default/template/group_list.tpl @@ -1,47 +1,10 @@ {footer_script} + +var pwg_token = "{$PWG_TOKEN}"; +var member_default = "{'member'|@translate}" + {literal} -$(document).ready(function() { - $('.groups input').change(function () { $(this).parent('p').toggleClass('group_select'); }); - $(".grp_action").hide(); - $("input.group_selection").click(function() { - var nbSelected = 0; - nbSelected = $("input.group_selection").filter(':checked').length; - - if (nbSelected == 0) { - $("#permitAction").hide(); - $("#forbidAction").show(); - } - else { - $("#permitAction").show(); - $("#forbidAction").hide(); - } - $("p[group_id="+$(this).prop("value")+"]").each(function () { - $(this).toggle(); - }); - - if (nbSelected2) { - $("#two_to_select").show(); - $("#two_atleast").hide(); - } - else { - $("#two_to_select").hide(); - $("#two_atleast").show(); - } - }); - $("[id^=action_]").hide(); - $("select[name=selectAction]").change(function () { - $("[id^=action_]").hide(); - $("#action_"+$(this).prop("value")).show(); - if ($(this).val() != -1 ) { - $("#applyActionBlock").show(); - } - else { - $("#applyActionBlock").hide(); - } - }); - -}); /*------- Group Popup @@ -63,7 +26,7 @@ Add User toggle and reduces height of user list when add user form is visible $('#form-btn').click(function(){ $('#cancel').show(); $('#addUserLabel').show() - $('#input-user-name').show(); + $('.input-user-name').show(); $('#UserSubmit').show(); $('#form-btn').hide(); $(".groups .list_user").css("max-height","100px"); @@ -72,7 +35,7 @@ $('#form-btn').click(function(){ $('#cancel').click(function(){ $('#cancel').hide(); $('#addUserLabel').hide() - $('#input-user-name').hide(); + $('.input-user-name').hide(); $('#UserSubmit').hide(); $('#form-btn').show(); $(".groups .list_user").css("max-height","200px"); @@ -82,14 +45,52 @@ $('#cancel').click(function(){ Add Group toggle -------*/ -$('#addGroup').click(function(){ +$('#showAddGroup').click(function(){ $('#addGroupForm').css('display', 'inline-block'); $('#showAddGroup').css('display', 'none'); }); -$('#addGroupClose').click(function(){ +var closeAddGroup = function () { $('#addGroupForm').css('display', 'none'); $('#showAddGroup').css('display', 'inline-block'); +} + +$('#addGroupClose').click(closeAddGroup); + +$('.actionButtons input').click(closeAddGroup); + +/*------- +Add Group Submit +-------*/ + +jQuery(document).ready(function() { + $('#addGroupForm form').on("submit", function(e) { + e.preventDefault(); + let name = $('#addGroupForm input[type=text]').val(); + jQuery.ajax({ + url: "ws.php?format=json&method=pwg.groups.add", + type:"POST", + data: "name="+name+"&pwg_token="+pwg_token, + success: function(raw_data) { + data = jQuery.parseJSON(raw_data); + if (data.stat === "ok") { + id = data.result.groups[0].id; + newgroup = $('#group-template').clone().attr('id', "group-"+id); + newgroup.attr("data-id", id); + newgroup.find("#group_name").html(name); + newgroup.find(".Group-checkbox label").attr("for", "Group-Checkbox-selection-"+id) + newgroup.find(".Group-checkbox input").attr("id", "Group-Checkbox-selection-"+id) + newgroup.find(".input-edit-group-name").attr('placeholder', name); + newgroup.find(".group_number_users").html("0 "+member_default); + setupGroupBox(newgroup); + newgroup.appendTo('.groups') + } + }, + error: function(err) { + console.log(err); + } + }); + }); }); /*------- @@ -110,6 +111,68 @@ close.onclick = function() { modalUL.style.visibility = "hidden"; } +/*------- +SETUP JS ON GROUP BOX +-------*/ +jQuery(document).ready(function() { + $(".GroupContainer").each(function () { + setupGroupBox($(this)); + }) +}); + +var setupGroupBox = function (groupBox) { + + var id = groupBox.data('id'); + + /* Change background color of group block if checked in selection mode */ + groupBox.find(".Group-checkbox input[type='checkbox']").change(function(){ + if($(this).is(":checked")){ + groupBox.addClass("OrangeBackground"); + groupBox.find('.icon-users-1').addClass("OrangeIcon"); + groupBox.find('.group_number_users').addClass("OrangeFont"); + + item = $("
" + +"" + +"

"+groupBox.find("#group_name").html()+"

"); + item.appendTo(".DeleteGroupList"); + item.find("a").on('click', function() { + groupBox.find(".Group-checkbox input").attr("checked", false); + groupBox.find(".Group-checkbox input[type='checkbox']").trigger("change"); + }); + }else{ + groupBox.removeClass("OrangeBackground"); + groupBox.find('.icon-users-1').removeClass("OrangeIcon"); + groupBox.find('.group_number_users').removeClass("OrangeFont"); + $(".DeleteGroupList div").each(function(){ + if ($(this).data('id') == id) {$(this).remove()} + }) + } + }); + + /* Display the option on the click on "..." */ + groupBox.find(".group-dropdown-options").click(function GroupOptions(){ + $(this).find("#GroupOptions").toggle(); + }); + + /* Set the delete action */ + groupBox.find("#GroupDelete").on('click', function(){ + jQuery.ajax({ + url: "ws.php?format=json&method=pwg.groups.delete", + type:"POST", + data: "group_id="+id+"&pwg_token="+pwg_token, + success: function(raw_data) { + data = jQuery.parseJSON(raw_data); + if (data.stat === "ok") { + groupBox.remove(); + } + }, + error: function(err) { + console.log(err); + } + }); + }); +} + /*------- Selection mode toggle actions, changes "..." in group block to checkbox, @@ -117,54 +180,27 @@ disables group actions in selection mode -------*/ $(function () { - $("#toggleSelectionMode").click(function () { - if ($(this).is(":checked")) { - $("#selection-mode-block").show(); - $(".group-dropdown-options").css('display', 'none'); - $(".Group-checkbox").css('display','block'); - $(".GroupManagerButtons").addClass("DisableInSelectionMode"); - $("#group_name").attr('contenteditable', false); - $(".icon-pencil").addClass("DisableInSelectionMode"); - $("label").css("cursor","default") - } else { - $("#selection-mode-block").hide(); - $(".group-dropdown-options").css('display', 'block'); - $(".Group-checkbox").css('display','none'); - $(".Group-checkbox-container input").prop("checked", false); - $('#group-1 li').removeClass("OrangeBackground"); - $('.groups .icon-users-1:first-child').removeClass("OrangeIcon"); - $(".GroupManagerButtons").removeClass("DisableInSelectionMode"); - $("#group_name").attr('contenteditable', true); - $(".icon-pencil").removeClass("DisableInSelectionMode"); - $("label").css("cursor","pointer") - $('.groups label').removeClass("BlackFont") - } - }); - }); + $("#toggleSelectionMode").click(function () { + if ($(this).is(":checked")) { + $(".in-selection-mode").fadeIn(); + $(".not-in-selection-mode").fadeOut(); + $("#group_name").attr('contenteditable', false); + } else { + $(".in-selection-mode").fadeOut(); + $(".not-in-selection-mode").fadeIn(); + $(".Group-checkbox input").attr("checked", false); + $(".Group-checkbox input[type='checkbox']").trigger("change"); + $("#group_name").attr('contenteditable', true); + } + }); +}); -/*------- -Change background color of group block if checked in selection mode --------*/ - -$(".Group-checkbox-container input[type='checkbox']").change(function(){ -if($(this).is(":checked")){ - $('#group-1 li').addClass("OrangeBackground"); - $('.groups .icon-users-1:first-child').addClass("OrangeIcon"); - $('.groups .group_number_users').addClass("OrangeFont"); - $('.groups label').addClass("BlackFont") -}else{ - $('#group-1 li').removeClass("OrangeBackground"); - $('.groups .icon-users-1:first-child').removeClass("OrangeIcon"); - $('.groups .group_number_users').removeClass("OrangeFont"); - $('.groups label').removeClass("BlackFont") -} }); - /*------- Display group name in selection list -------*/ /* -$(function () { +jQuery(document).ready(function() { $("#Group-Checkbox-selection").click(function () { if ($(this).is(":checked")) { $('.SelectionModeGroup').show(); @@ -178,39 +214,34 @@ $(function () { */ /*------- -show group options in "..." on click +Hide group options on click on the screen -------*/ -$(".group-dropdown-options").click(function GroupOptions(){ - $("#GroupOptions").toggle(); - }); - $(document).mouseup(function (e) { - if ($(e.target).closest("#GroupOptions").length - === 0) { - $("#GroupOptions").hide(); - } - }); + if ($(e.target).closest("#GroupOptions").length === 0) { + $(".group-dropdown-options #GroupOptions").hide(); + } +}); /*------- Merge Options in selection mode -------*/ function MergeOptions(){ - document.getElementById("MergeOptionsBlock").style.display = "block"; - document.getElementById("DeleteSelectionMode").style.display = "none"; - document.getElementById("MergeSelectionMode").style.display = "none"; + jQuery("#MergeOptionsBlock").show(); + jQuery("#DeleteSelectionMode").hide(); + jQuery("#MergeSelectionMode").hide(); }; /*------- -Cancel Merge options +Cancel Merge options or deletion confirmation -------*/ function CancelAction(){ - document.getElementById("MergeOptionsBlock").style.display = "none"; - document.getElementById("ConfirmGroupAction").style.display = "none"; - document.getElementById("DeleteSelectionMode").style.display = "block"; - document.getElementById("MergeSelectionMode").style.display = "block"; + jQuery("#MergeOptionsBlock").hide(); + jQuery("#ConfirmGroupAction").hide(); + jQuery("#DeleteSelectionMode").show(); + jQuery("#MergeSelectionMode").show(); }; /*------- @@ -218,14 +249,57 @@ Display deletion confirmation -------*/ function DeleteValidation(){ - document.getElementById("ConfirmGroupAction").style.display = "block"; - document.getElementById("DeleteSelectionMode").style.display = "none"; - document.getElementById("MergeSelectionMode").style.display = "none"; + jQuery("#ConfirmGroupAction").show(); + jQuery("#DeleteSelectionMode").hide(); + jQuery("#MergeSelectionMode").hide(); }; + + {/literal} {/footer_script} +{* Define template function for the content of Groups*} +{function name=groupContent} +{function groupContent} +
+
+ +
+
+ + +
+
+ +
+ + + +
+ +
+ +
+

{$grp_name}

+
+
+ +
+ + + {'Cancel'|@translate} +
+ +

{$grp_members}

+ +
+ Manage users + Manage permissions +
+
+{/function} +{/function}
@@ -240,28 +314,15 @@ function DeleteValidation(){

Selection mode

-
+

No selection

Your selection

-
- -

Group

-
-
- -

Group

-
-
- -

Group

-
-
- -

Group

+
{* TODO *} +
@@ -274,22 +335,18 @@ function DeleteValidation(){

The other groups will be removed

- {* TODO *}
- + Cancel

You are about to delete [4] groups, are you sure?

- + No, I have changed my mind
@@ -297,22 +354,20 @@ function DeleteValidation(){
-
- -
    +
    -
    +
    - {'Add group'|translate} +

    {'Add group'|translate}

    - +

    {'Add group'|@translate}

    @@ -320,62 +375,24 @@ function DeleteValidation(){
    - - {'Cancel'|@translate} +
    + {'Cancel'|@translate}
    -
    + {* Template Group (for js application) *} + {groupContent grp_id="template" grp_name="Template" grp_members=0} + {if not empty($groups)} {foreach from=$groups item=group name=group_loop} -
    -
  • -
    - -
    -
    - - -
    -
    - -
    - -
    - - -
    - - - {'Cancel'|@translate} -
    - -

    {$group.MEMBERS}

    - -
    - Manage users - Manage permissions -
    - - -
    • -
    + {groupContent grp_id=$group.ID grp_name=$group.NAME grp_members=$group.MEMBERS} {/foreach} {/if} -
+
@@ -392,7 +409,7 @@ function DeleteValidation(){

Associate User

- +
@@ -401,7 +418,7 @@ function DeleteValidation(){

Filter

- +
@@ -419,318 +436,6 @@ function DeleteValidation(){

User Associated

-
- -

Lexie Driscoll

-
- -

Dissociate user from this group

-
-
-
- -

Kenan Fernandez

-
- -

Dissociate user from this group

-
-
-
- -

Rafi Mccall

-
- -

Dissociate user from this group

-
-
-
- -

Mai Riley

-
- -

Dissociate user from this group

-
-
-
- -

Kim Mckee

-
- -

Dissociate user from this group

-
-
-
- -

Eilidh Galindo

-
- -

Dissociate user from this group

-
-
-
- -

Joann Wilson

-
- -

Dissociate user from this group

-
-
-
- -

Guy Hutchings

-
- -

Dissociate user from this group

-
-
-
- -

Tyrese Levine

-
- -

Dissociate user from this group

-
-
-
- -

Ibrar Gill

-
- -

Dissociate user from this group

-
-
-
- -

Gabrielle Byers

-
- -

Dissociate user from this group

-
-
-
- -

Markus Tapia

-
- -

Dissociate user from this group

-
-
-
- -

Humera Davila

-
- -

Dissociate user from this group

-
-
-
- -

Elaina Carrillo

-
- -

Dissociate user from this group

-
-
-
- -

Glenda Akhtar

-
- -

Dissociate user from this group

-
-
-
- -

Aeryn Wall

-
- -

Dissociate user from this group

-
-
-
- -

Florrie Vu

-
- -

Dissociate user from this group

-
-
-
- -

Paisley Huber

-
- -

Dissociate user from this group

-
-
-
- -

Ishmael Cochran

-
- -

Dissociate user from this group

-
-
-
- -

Lexi-Mai Cullen

-
- -

Dissociate user from this group

-
-
-
- -

Umair Long

-
- -

Dissociate user from this group

-
-
-
- -

Liyana Lawrence

-
- -

Dissociate user from this group

-
-
-
- -

Madeeha Tomlinson

-
- -

Dissociate user from this group

-
-
-
- -

Kadie Schneider

-
- -

Dissociate user from this group

-
-
-
- -

Cassian Mooney

-
- -

Dissociate user from this group

-
-
-
- -

Elsie-Mae Leblanc

-
- -

Dissociate user from this group

-
-
-
- -

Blossom Rollins

-
- -

Dissociate user from this group

-
-
-
- -

Selena Summers

-
- -

Dissociate user from this group

-
-
-
- -

Amari Swanson

-
- -

Dissociate user from this group

-
-
-
- -

Jolie Pearce

-
- -

Dissociate user from this group

-
-
-
- -

Lillie-Rose Wheatley

-
- -

Dissociate user from this group

-
-
-
- -

Buster Howell

-
- -

Dissociate user from this group

-
-
-
- -

Darcey Duarte

-
- -

Dissociate user from this group

-
-
-
- -

Grady Irwin

-
- -

Dissociate user from this group

-
-
-
- -

Dru Wilder

-
- -

Dissociate user from this group

-
-
-
@@ -745,7 +450,4 @@ function DeleteValidation(){
- - - \ No newline at end of file diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 03e76d5db..9963950f1 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -1532,7 +1532,7 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;} margin-left:5px; } -.showCreateAlbum { +.showCreateGroup { text-align: left; margin: 0 1em 25px 20px; line-height: 22px; @@ -1554,11 +1554,18 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;} display:inline-block; } +.remove-item { + flex: 1; + -webkit-animation: flexShrink 500ms ease forwards; + -o-animation: flexShrink 500ms ease forwards; + animation: flexShrink 500ms ease forwards; +} + .groups .list_user #text{ width:100%; } -.groups li, +.groups .GroupContainer, .groups .addGroupFormBlock { vertical-align: middle; position: relative; @@ -1570,14 +1577,14 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;} border-radius: 10px; } -.groups label .Group-name-container p{ +.groups .Group-name .Group-name-container p{ margin: 0; padding: 2px; text-align: center; font-weight:700; } -.groups label .Group-name-container p:focus{ +.groups .Group-name .Group-name-container p:focus{ margin:0 30px; } @@ -1593,12 +1600,13 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;} } .groups .group_number_users{ + text-align: center; font-weight: 700; font-size: 1em; margin:5px; } -.groups .showCreateAlbum{ +.groups .showCreateGroup{ vertical-align: middle; position: relative; display: inline-block; @@ -1609,14 +1617,14 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;} margin-left:15px; } -.groups .showCreateAlbum a:first-child{ +.groups .showCreateGroup a:first-child{ position: absolute; transform:translate(-50%,-50%); top:50%; left:50%; } -.groups .showCreateAlbum .userSeparator{ +.groups .showCreateGroup .userSeparator{ margin:0 5px; } @@ -1639,16 +1647,19 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;} margin:15px auto; } -.groups .showCreateAlbum:hover #addGroup, .groups .addGroupFormTitle{ margin:0; } - FORM.properties .groups LI, + FORM.properties .groups .GroupContainer, .groups FORM#update .groups UL { margin-bottom: 15px; } +#group-template { + display: none; +} + /* Selection mode */ .content div.titrePage{ @@ -1875,11 +1886,11 @@ input:checked + .slider:before { /*Edit group name*/ -.groups label{ +.groups .Group-name{ position:relative; } -.groups label .icon-pencil{ +.groups .Group-name .icon-pencil{ position:absolute; top: 2px; left: 180px; @@ -1891,10 +1902,10 @@ input:checked + .slider:before { } @media (hover: hover){ - .groups label .icon-pencil{ + .groups .Group-name .icon-pencil{ display:none; } - .groups label:hover .icon-pencil{ + .groups .Group-name:hover .icon-pencil{ display:block; } } @@ -1920,6 +1931,10 @@ input:checked + .slider:before { } +.group-dropdown-options { + cursor: pointer; +} + .groups #GroupPermission, .groups #GroupDuplicate, .groups #GroupDelete{ @@ -1931,12 +1946,19 @@ input:checked + .slider:before { .Group-checkbox{ display:none; position: absolute; - top: 15px; - right: 45px; - + top: 0px; + width: 100%; + height: 100%; + z-index: 2; } -.groups .Group-checkbox-container input { +.Group-checkbox-label { + width: 100%; + height: 100%; + display: block; +} + +.groups .Group-checkbox input { position: absolute; opacity: 0; cursor: pointer; @@ -1947,10 +1969,12 @@ input:checked + .slider:before { .groups .group-checkmark { position: absolute; top: 0; - left: 0; + right: 0; + margin: 12px; height: 25px; width: 25px; border-radius:15px; + z-index: -1; } .groups .group-checkmark:after { @@ -1959,11 +1983,11 @@ input:checked + .slider:before { display: none; } -.groups .Group-checkbox-container input:checked ~ .group-checkmark:after { +.groups .Group-checkbox input:checked ~ .group-checkmark:after { display: block; } -.groups .Group-checkbox-container .group-checkmark:after { +.groups .Group-checkbox .group-checkmark:after { left: 9px; top: 5px; width: 5px; @@ -1977,8 +2001,9 @@ input:checked + .slider:before { /* Add group */ -.showCreateAlbum{ +.showCreateGroup{ position:relative; + cursor: pointer; } .addGroupBlock{ @@ -1988,7 +2013,7 @@ input:checked + .slider:before { margin:0 70px; } -.groups .showCreateAlbum .icon-plus-circled{ +.groups .showCreateGroup .icon-plus-circled{ font-size: 19px; color: rgb(44,132,195); background-color: #CDE9FD; @@ -2311,10 +2336,6 @@ input:checked + .slider:before { padding:30px 0; } -.DisableInSelectionMode{ - display:none!important; -} - /********/ p.list_user { diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index eedcbf4dc..c9f0dad05 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -259,7 +259,7 @@ a.stat-box:hover { #helpContent, #pLoaderPage, #ftpPage, #ftpPage LEGEND {color:#aaa;} -.pluginBox, .pluginContent, .pluginMiniBox, .groups li {background-color:#333;color:#999;border-color:#333; box-shadow: none;} +.pluginBox, .pluginContent, .pluginMiniBox, .groups li, .groups .GroupContainer {background-color:#333;color:#999;border-color:#333; box-shadow: none;} .pluginBoxNameCell, .pluginMiniBoxNameCell {color:#ddd;} .pluginBox.incompatible, .pluginMiniBox.incompatible {border-color:#800 !important;} .pluginBoxes .merged, .pluginBoxes .missing {background-color:#422;border:1px solid #800;} @@ -319,7 +319,7 @@ div.token-input-dropdown ul li.token-input-selected-dropdown-item {background-co .selectedComment {background-color:#555; color:#fff;} -.groups label>p { +.groups .Group-name>p { color: #ccc; font-size: 1.2em; background-color:#111; @@ -330,26 +330,26 @@ label>p.group_select { background-color:#555; } -.groups li, -.groups .showCreateAlbum, +.groups .GroupContainer, +.groups .showCreateGroup, .groups .addGroupFormBlock{ font-size: 1.2em; background-color:#333; } -.groups label>p, +.groups .Group-name>p, .addGroupForm .addGroupFormTitle{ color:#3c3c3c; font-size: 1.2em; } -.groups li, -.groups .showCreateAlbum, +.groups .GroupContainer, +.groups .showCreateGroup, .groups .addGroupFormBlock{ box-shadow: -1px 1px 2px #1a1a1a; } -.groups .showCreateAlbum:hover #addGroup, +.groups .showCreateGroup:hover #addGroup, .groups .addGroupFormTitle{ color:#c0c0c0; text-decoration:none; @@ -390,11 +390,11 @@ label>p.group_select { /*Edit group name*/ -.groups label{ +.groups .Group-name{ color:#777; } -.groups label .Group-name-container p:focus{ +.groups .Group-name .Group-name-container p:focus{ border:1px solid #303030!important; background-color:#1a1a1a; } @@ -583,15 +583,15 @@ input:focus + .slider { border:2px solid #c76a23; } -.groups .Group-checkbox-container:hover input ~ .group-checkmark { +.groups .Group-checkbox:hover input ~ .group-checkmark { background-color: #c76a23; } -.groups .Group-checkbox-container input:checked ~ .group-checkmark { +.groups .Group-checkbox input:checked ~ .group-checkmark { background-color: #c76a23; } -.groups .Group-checkbox-container .group-checkmark:after { +.groups .Group-checkbox .group-checkmark:after { border: solid #ebebeb; border-width: 0 3px 3px 0; } @@ -637,10 +637,10 @@ input:focus + .slider { color:#c2f5c2; } -.groups .showCreateAlbum .icon-plus-circled, +.groups .showCreateGroup .icon-plus-circled, #UserList .group-name-block span, .groups .icon-users-1:first-child, -.groups .showCreateAlbum .icon-plus-circled{ +.groups .showCreateGroup .icon-plus-circled{ color:#003751; background-color: #379bbc; }