Commit b6c900b3 authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel 🏀

Merge branch 'staging' into 'master'

Staging

See merge request arsnova/flashcards!1744
parents 301ba264 be733fea
...@@ -278,11 +278,11 @@ ...@@ -278,11 +278,11 @@
"cardset_footer_navigation_background": $thm_gray, "cardset_footer_navigation_background": $thm_gray,
"cardset_footer_navigation_presentation_background": $thm_dark_blue, "cardset_footer_navigation_presentation_background": $thm_dark_blue,
"cardset_footer_navigation_presentation_text": white, "cardset_footer_navigation_presentation_text": white,
"cardset_footer_navigation_presentation_background_hover": $thm_dark_blue, "cardset_footer_navigation_presentation_background_hover": $thm_gray,
"cardset_footer_navigation_presentation_text_hover": white, "cardset_footer_navigation_presentation_text_hover": white,
"cardset_footer_navigation_learn_background": $thm_green, "cardset_footer_navigation_learn_background": $thm_green,
"cardset_footer_navigation_learn_text": white, "cardset_footer_navigation_learn_text": white,
"cardset_footer_navigation_learn_background_hover": $thm_green, "cardset_footer_navigation_learn_background_hover": $thm_gray,
"cardset_footer_navigation_learn_text_hover": white, "cardset_footer_navigation_learn_text_hover": white,
"cardset_footer_navigation_learn_list_leitner_background": none, "cardset_footer_navigation_learn_list_leitner_background": none,
"cardset_footer_navigation_learn_list_leitner_text": black, "cardset_footer_navigation_learn_list_leitner_text": black,
...@@ -308,9 +308,9 @@ ...@@ -308,9 +308,9 @@
"cardset_footer_navigation_learn_list_reset_wozniak_text": white, "cardset_footer_navigation_learn_list_reset_wozniak_text": white,
"cardset_footer_navigation_learn_list_reset_wozniak_background_hover": white, "cardset_footer_navigation_learn_list_reset_wozniak_background_hover": white,
"cardset_footer_navigation_learn_list_reset_wozniak_text_hover": $thm_orange, "cardset_footer_navigation_learn_list_reset_wozniak_text_hover": $thm_orange,
"cardset_footer_navigation_new_card_background": $thm_green, "cardset_footer_navigation_new_card_background": $thm_orange,
"cardset_footer_navigation_new_card_text": white, "cardset_footer_navigation_new_card_text": white,
"cardset_footer_navigation_new_card_background_hover": $thm_green, "cardset_footer_navigation_new_card_background_hover": $thm_gray,
"cardset_footer_navigation_new_card_text_hover": white, "cardset_footer_navigation_new_card_text_hover": white,
"cardset_footer_navigation_import_cards_background": none, "cardset_footer_navigation_import_cards_background": none,
"cardset_footer_navigation_import_cards_text": black, "cardset_footer_navigation_import_cards_text": black,
...@@ -334,7 +334,7 @@ ...@@ -334,7 +334,7 @@
"cardset_footer_navigation_publish_cardset_text_hover": black, "cardset_footer_navigation_publish_cardset_text_hover": black,
"cardset_footer_navigation_bonus_background": $thm_green, "cardset_footer_navigation_bonus_background": $thm_green,
"cardset_footer_navigation_bonus_text": white, "cardset_footer_navigation_bonus_text": white,
"cardset_footer_navigation_bonus_background_hover": $thm_green, "cardset_footer_navigation_bonus_background_hover": $thm_gray,
"cardset_footer_navigation_bonus_text_hover": white, "cardset_footer_navigation_bonus_text_hover": white,
"cardset_footer_navigation_bonus_list_start_learning_background": $thm_green, "cardset_footer_navigation_bonus_list_start_learning_background": $thm_green,
"cardset_footer_navigation_bonus_list_start_learning_text": white, "cardset_footer_navigation_bonus_list_start_learning_text": white,
...@@ -380,9 +380,9 @@ ...@@ -380,9 +380,9 @@
"cardset_footer_navigation_export_cards_text": black, "cardset_footer_navigation_export_cards_text": black,
"cardset_footer_navigation_export_cards_background_hover": none, "cardset_footer_navigation_export_cards_background_hover": none,
"cardset_footer_navigation_export_cards_text_hover": black, "cardset_footer_navigation_export_cards_text_hover": black,
"cardset_footer_navigation_delete_all_cards_background": $thm_orange, "cardset_footer_navigation_delete_all_cards_background": $thm_red,
"cardset_footer_navigation_delete_all_cards_text": white, "cardset_footer_navigation_delete_all_cards_text": white,
"cardset_footer_navigation_delete_all_cards_background_hover": $thm_orange, "cardset_footer_navigation_delete_all_cards_background_hover": $thm_gray,
"cardset_footer_navigation_delete_all_cards_text_hover": white, "cardset_footer_navigation_delete_all_cards_text_hover": white,
//markdeep colors //markdeep colors
"markdeep_inline_code_background": yellow, "markdeep_inline_code_background": yellow,
......
<template name="cardsetNavigation"> <template name="cardsetNavigation">
<div class="cardsetInfoFooter panel-footer"> <div class="cardsetInfoFooter panel-footer">
{{#if hasCardsetPermission}} {{#if hasCardsetPermission}}
{{> cardsetNavigationBonus}}
{{#unless isInBonusAndNotOwner}} {{#unless isInBonusAndNotOwner}}
{{> cardsetNavigationPresentation}} {{> cardsetNavigationPresentation}}
{{/unless}} {{/unless}}
...@@ -10,15 +11,14 @@ ...@@ -10,15 +11,14 @@
{{> cardsetNavigationWorkload}} {{> cardsetNavigationWorkload}}
{{/if}} {{/if}}
{{> cardsetNavigationNewCard}} {{> cardsetNavigationNewCard}}
{{> cardsetNavigationImport}}
{{> cardsetNavigationEditRepetitorium}} {{> cardsetNavigationEditRepetitorium}}
{{> cardsetNavigationEditCardset}} {{> cardsetNavigationEditCardset}}
{{> cardsetNavigationEditLicense}} {{> cardsetNavigationEditLicense}}
{{> cardsetNavigationPublishCardset}} {{> cardsetNavigationPublishCardset}}
{{> cardsetNavigationBonus}}
{{#unless isInBonusAndNotOwner}} {{#unless isInBonusAndNotOwner}}
{{> cardsetNavigationManage}} {{> cardsetNavigationManage}}
{{/unless}} {{/unless}}
{{> cardsetNavigationImport}}
{{> cardsetNavigationExport}} {{> cardsetNavigationExport}}
{{> cardsetNavigationDeleteAllCards}} {{> cardsetNavigationDeleteAllCards}}
{{else}} {{else}}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.