Commit fcb3c4a1 authored by Curtis Adam's avatar Curtis Adam

Fix more cases in which the button hover color gets ignored

parent 98a425ce
...@@ -207,6 +207,7 @@ $themes: ( ...@@ -207,6 +207,7 @@ $themes: (
$infinite_scroll_text: map-get($map, "infinite_scroll_text"); $infinite_scroll_text: map-get($map, "infinite_scroll_text");
$item_background: map-get($map, "item_background"); $item_background: map-get($map, "item_background");
$item_icon: map-get($map, "item_icon"); $item_icon: map-get($map, "item_icon");
$item_icon_hover: map-get($map, "item_icon_hover");
$item_author_text: map-get($map, "item_author_text"); $item_author_text: map-get($map, "item_author_text");
$item_description_background: map-get($map, "item_description_background"); $item_description_background: map-get($map, "item_description_background");
$item_description_text: map-get($map, "item_description_text"); $item_description_text: map-get($map, "item_description_text");
...@@ -485,8 +486,8 @@ $themes: ( ...@@ -485,8 +486,8 @@ $themes: (
background-image: $background_image !important; background-image: $background_image !important;
button:hover, button:focus, .btn:hover, .btn:focus { button:hover, button:focus, .btn:hover, .btn:focus {
background-color: $button_background_hover; background-color: $button_background_hover !important;
color: $button_text_hover; color: $button_text_hover !important;
} }
.star-ratings .current-rating { .star-ratings .current-rating {
...@@ -522,27 +523,27 @@ $themes: ( ...@@ -522,27 +523,27 @@ $themes: (
} }
.btn-raised.btn-success { .btn-raised.btn-success {
color: $success_text !important; color: $success_text;
background-color: $success_background; background-color: $success_background;
} }
.btn-raised.btn-info { .btn-raised.btn-info {
color: $info_text !important; color: $info_text;
background-color: $info_background !important; background-color: $info_background;
} }
.btn-raised.btn-demo, .btn-demo.active { .btn-raised.btn-demo {
color: $demo_text !important; color: $demo_text;
background-color: $demo_background !important; background-color: $demo_background;
} }
.btn-raised.btn-warning, .btn-warning.active { .btn-raised.btn-warning {
color: $warning_text !important; color: $warning_text;
background-color: $warning_background !important; background-color: $warning_background;
} }
.btn-raised.btn-danger { .btn-raised.btn-danger {
color: $danger_text !important; color: $danger_text;
background-color: $danger_background; background-color: $danger_background;
} }
...@@ -608,7 +609,7 @@ $themes: ( ...@@ -608,7 +609,7 @@ $themes: (
.modal-body .form-group { .modal-body .form-group {
label { label {
color: $form_group_label !important; color: $form_group_label;
} }
.import-type.active { .import-type.active {
color: white !important; color: white !important;
...@@ -669,9 +670,9 @@ $themes: ( ...@@ -669,9 +670,9 @@ $themes: (
} }
#markdeepNavigation .fa, #markdeepNavigation .markdeep-center, #markdeepNavigation .markdeep-fullscreen, .card-button { #markdeepNavigation .fa, #markdeepNavigation .markdeep-center, #markdeepNavigation .markdeep-fullscreen, .card-button {
color: $thm_gray !important; color: $thm_gray ;
border-color: $thm_gray !important; border-color: $thm_gray;
background-color: $white !important; background-color: $white;
} }
#markdeepNavigation .markdeep-help { #markdeepNavigation .markdeep-help {
...@@ -689,29 +690,29 @@ $themes: ( ...@@ -689,29 +690,29 @@ $themes: (
.material-icons.pressed, .fa.pressed, .glyphicon.pressed, .card-button.pressed, .material-icons.pressed:hover, .glyphicon.pressed:hover, .card-button.pressed:hover, .material-icons.pressed, .fa.pressed, .glyphicon.pressed, .card-button.pressed, .material-icons.pressed:hover, .glyphicon.pressed:hover, .card-button.pressed:hover,
.material-icons.pressed:focus, .glyphicon.pressed:focus, .card-button.pressed:focus { .material-icons.pressed:focus, .glyphicon.pressed:focus, .card-button.pressed:focus {
background-color: lighten($thm_gray, 10%) !important; background-color: lighten($thm_gray, 10%);
color: $white !important; color: $white;
} }
.glyphicon-log-out.pressed, .glyphicon-fullscreen.pressed { .glyphicon-log-out.pressed, .glyphicon-fullscreen.pressed {
background-color: $thm_orange !important; background-color: $thm_orange;
border-color: $thm_orange !important; border-color: $thm_orange;
color: $white !important; color: $white;
} }
.glyphicon-log-out.pressed:hover, .glyphicon-fullscreen.pressed:hover, .glyphicon-log-out.pressed:hover, .glyphicon-fullscreen.pressed:hover,
.glyphicon-log-out.pressed:focus, .glyphicon-fullscreen.pressed:focus { .glyphicon-log-out.pressed:focus, .glyphicon-fullscreen.pressed:focus {
background-color: $button_background_hover !important; background-color: $button_background_hover;
border-color: $button_background_hover !important; border-color: $button_background_hover;
color: $button_text_hover !important; color: $button_text_hover;
} }
#markdeepNavigation { #markdeepNavigation {
.material-icons.pressed, .fa.pressed, .glyphicon.pressed, .card-button.pressed, .material-icons.pressed:hover, .glyphicon.pressed:hover, .card-button.pressed:hover, .material-icons.pressed, .fa.pressed, .glyphicon.pressed, .card-button.pressed, .material-icons.pressed:hover, .glyphicon.pressed:hover, .card-button.pressed:hover,
.material-icons.pressed:focus, .glyphicon.pressed:focus, .card-button.pressed:focus { .material-icons.pressed:focus, .glyphicon.pressed:focus, .card-button.pressed:focus {
background-color: $thm_orange !important; background-color: $thm_orange;
border-color: $thm_orange !important; border-color: $thm_orange;
color: $white !important; color: $white;
} }
} }
...@@ -1353,8 +1354,12 @@ $themes: ( ...@@ -1353,8 +1354,12 @@ $themes: (
} }
#collapseLearningPhaseInfoButton, #collapseManageButton { #collapseLearningPhaseInfoButton, #collapseManageButton {
background-color: $bonus_background !important; background-color: $bonus_background ;
color: $bonus_text !important; color: $bonus_text;
}
#collapseLearningPhaseInfoButton:hover i, #collapseLearningPhaseInfoButton:focus i, #collapseManageButton:hover i, #collapseManageButton:focus i, #collapseCardsetInfoButton:hover i, #collapseCardsetInfoButton:focus i {
color: $item_icon_hover !important;
} }
.cardListSubject th { .cardListSubject th {
...@@ -1628,17 +1633,17 @@ $themes: ( ...@@ -1628,17 +1633,17 @@ $themes: (
//card //card
.btn-white.active { .btn-white.active {
color: black !important; color: black;
background-color: white !important; background-color: white;
} }
.btn-orange { .btn-orange {
color: $thm_orange !important; color: $thm_orange;
} }
.btn-orange.active { .btn-orange.active {
color: $white !important; color: $white;
background-color: $thm_orange !important; background-color: $thm_orange;
} }
#cardType .btn-white.active:hover, #learningGoalLevelGroup .btn-primary.active:hover, #cardType .btn-white.active:hover, #learningGoalLevelGroup .btn-primary.active:hover,
...@@ -2102,11 +2107,11 @@ $themes: ( ...@@ -2102,11 +2107,11 @@ $themes: (
#publishKind, #publishKindAdmin { #publishKind, #publishKindAdmin {
.btn-info { .btn-info {
color: $info_background !important; color: $info_background;
} }
.btn-default.active { .btn-default.active {
color: black !important; color: black;
} }
.btn-info.active { .btn-info.active {
...@@ -2116,7 +2121,7 @@ $themes: ( ...@@ -2116,7 +2121,7 @@ $themes: (
} }
.btn-success { .btn-success {
color: $success_background !important; color: $success_background;
} }
.btn-success.active { .btn-success.active {
...@@ -2126,7 +2131,7 @@ $themes: ( ...@@ -2126,7 +2131,7 @@ $themes: (
} }
.btn-danger { .btn-danger {
color: $danger_background !important; color: $danger_background;
} }
.btn-danger.active { .btn-danger.active {
...@@ -2136,7 +2141,7 @@ $themes: ( ...@@ -2136,7 +2141,7 @@ $themes: (
} }
.btn-demo { .btn-demo {
color: $demo_background !important; color: $demo_background;
} }
.btn-demo.active { .btn-demo.active {
color: $demo_text !important; color: $demo_text !important;
...@@ -2145,7 +2150,7 @@ $themes: ( ...@@ -2145,7 +2150,7 @@ $themes: (
} }
.btn-warning { .btn-warning {
color: $warning_background !important; color: $warning_background;
} }
.btn-warning.active { .btn-warning.active {
color: $warning_text !important; color: $warning_text !important;
...@@ -2193,7 +2198,11 @@ $themes: ( ...@@ -2193,7 +2198,11 @@ $themes: (
} }
.resultItemHeaderRightArea i { .resultItemHeaderRightArea i {
color: $item_icon !important; color: $item_icon;
}
.resultItemHeaderRightArea i:hover, .resultItemHeaderRightArea i:focus {
color: $item_icon_hover !important;
} }
.resultTableContent a { .resultTableContent a {
...@@ -2326,7 +2335,7 @@ $themes: ( ...@@ -2326,7 +2335,7 @@ $themes: (
color: $white !important; color: $white !important;
} }
.dropdown-toggle:hover, .navbar-text:hover, .dropdown-toggle:focus, .navbar-text:focus { .dropdown-toggle:hover, a:hover, .dropdown-toggle:focus, a:focus {
background-color: $button_background_hover !important; background-color: $button_background_hover !important;
color: $button_text_hover !important; color: $button_text_hover !important;
} }
...@@ -2401,43 +2410,43 @@ $themes: ( ...@@ -2401,43 +2410,43 @@ $themes: (
} }
//forms - cardsetForm //forms - cardsetForm
#setDifficulty .btn, #cardType .btn { #setDifficulty .btn, #cardType .btn {
background-color: $button_difficulty_inactive !important; background-color: $button_difficulty_inactive;
} }
#setDifficulty .btn-orange { #setDifficulty .btn-orange {
color: $button_difficulty0_note !important; color: $button_difficulty0_note;
} }
#setDifficulty .btn-orange.active, .label-difficulty0 { #setDifficulty .btn-orange.active, .label-difficulty0 {
color: $white !important; color: $white;
background-color: $button_difficulty0_note !important; background-color: $button_difficulty0_note;
} }
#setDifficulty .btn-info { #setDifficulty .btn-info {
color: $button_difficulty1 !important; color: $button_difficulty1;
} }
#setDifficulty .btn-info.active, .label-difficulty1 { #setDifficulty .btn-info.active, .label-difficulty1 {
color: $white !important; color: $white;
background-color: $button_difficulty1 !important; background-color: $button_difficulty1;
} }
#setDifficulty .btn-success { #setDifficulty .btn-success {
color: $button_difficulty2 !important; color: $button_difficulty2;
} }
#setDifficulty .btn-success.active, .label-difficulty2 { #setDifficulty .btn-success.active, .label-difficulty2 {
color: $white !important; color: $white;
background-color: $button_difficulty2 !important; background-color: $button_difficulty2;
} }
#setDifficulty .btn-danger { #setDifficulty .btn-danger {
color: $button_difficulty3 !important; color: $button_difficulty3;
} }
#setDifficulty .btn-danger.active, .label-difficulty3 { #setDifficulty .btn-danger.active, .label-difficulty3 {
color: $white !important; color: $white;
background-color: $button_difficulty3 !important; background-color: $button_difficulty3 ;
} }
#setCardsetFormModal, #showSelectLearningUnitModal, #setLeitnerProgressCardsetFilter { #setCardsetFormModal, #showSelectLearningUnitModal, #setLeitnerProgressCardsetFilter {
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
$background: $mercury_approx; $background: $mercury_approx;
$button_background_hover: black; $button_background_hover: black;
$button_text_hover: white; $button_text_hover: white;
$item_icon_hover: $thm_orange;
@return ( @return (
//background //background
"background_image" : "none", "background_image" : "none",
...@@ -229,6 +230,7 @@ ...@@ -229,6 +230,7 @@
"infinite_scroll_text": white, "infinite_scroll_text": white,
"item_background": $thm_gray, "item_background": $thm_gray,
"item_icon": white, "item_icon": white,
"item_icon_hover": $item_icon_hover,
"item_author_text": black, "item_author_text": black,
"item_description_background": white, "item_description_background": white,
"item_description_text": black, "item_description_text": black,
...@@ -340,7 +342,7 @@ ...@@ -340,7 +342,7 @@
"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": $button_background_hover, "cardset_footer_navigation_learn_list_reset_wozniak_background_hover": $button_background_hover,
"cardset_footer_navigation_learn_list_reset_wozniak_text_hover": $button_text_hover, "cardset_footer_navigation_learn_list_reset_wozniak_text_hover": $button_text_hover,
"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": $button_background_hover, "cardset_footer_navigation_new_card_background_hover": $button_background_hover,
"cardset_footer_navigation_new_card_text_hover": $button_text_hover, "cardset_footer_navigation_new_card_text_hover": $button_text_hover,
...@@ -348,10 +350,10 @@ ...@@ -348,10 +350,10 @@
"cardset_footer_navigation_import_cards_text": black, "cardset_footer_navigation_import_cards_text": black,
"cardset_footer_navigation_import_cards_background_hover": $button_background_hover, "cardset_footer_navigation_import_cards_background_hover": $button_background_hover,
"cardset_footer_navigation_import_cards_text_hover": $button_text_hover, "cardset_footer_navigation_import_cards_text_hover": $button_text_hover,
"cardset_footer_navigation_edit_shuffle_background": none, "cardset_footer_navigation_edit_shuffle_background": $thm_orange,
"cardset_footer_navigation_edit_shuffle_text": black, "cardset_footer_navigation_edit_shuffle_text": white,
"cardset_footer_navigation_edit_shuffle_background_hover": $button_background_hover, "cardset_footer_navigation_edit_shuffle_background_hover": $thm_gray,
"cardset_footer_navigation_edit_shuffle_text_hover": $button_text_hover, "cardset_footer_navigation_edit_shuffle_text_hover": white,
"cardset_footer_navigation_edit_cardset_background": none, "cardset_footer_navigation_edit_cardset_background": none,
"cardset_footer_navigation_edit_cardset_text": black, "cardset_footer_navigation_edit_cardset_text": black,
"cardset_footer_navigation_edit_cardset_background_hover": $button_background_hover, "cardset_footer_navigation_edit_cardset_background_hover": $button_background_hover,
...@@ -412,7 +414,7 @@ ...@@ -412,7 +414,7 @@
"cardset_footer_navigation_export_cards_text": black, "cardset_footer_navigation_export_cards_text": black,
"cardset_footer_navigation_export_cards_background_hover": $button_background_hover, "cardset_footer_navigation_export_cards_background_hover": $button_background_hover,
"cardset_footer_navigation_export_cards_text_hover": $button_text_hover, "cardset_footer_navigation_export_cards_text_hover": $button_text_hover,
"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": $button_background_hover, "cardset_footer_navigation_delete_all_cards_background_hover": $button_background_hover,
"cardset_footer_navigation_delete_all_cards_text_hover": $button_text_hover, "cardset_footer_navigation_delete_all_cards_text_hover": $button_text_hover,
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
$background: yellow; $background: yellow;
$button_background_hover: midnightblue; $button_background_hover: midnightblue;
$button_text_hover: white; $button_text_hover: white;
$item_icon_hover: $thm_orange;
@return ( @return (
//background //background
"background_image" : url('/img/background/zettelkasten_wikipedia_background.jpg'), "background_image" : url('/img/background/zettelkasten_wikipedia_background.jpg'),
...@@ -231,6 +232,7 @@ ...@@ -231,6 +232,7 @@
"infinite_scroll_text": white, "infinite_scroll_text": white,
"item_background": $thm_gray, "item_background": $thm_gray,
"item_icon": white, "item_icon": white,
"item_icon_hover": $item_icon_hover,
"item_author_text": black, "item_author_text": black,
"item_description_background": LightGoldenRodYellow, "item_description_background": LightGoldenRodYellow,
"item_description_text": $thm_gray, "item_description_text": $thm_gray,
...@@ -348,12 +350,12 @@ ...@@ -348,12 +350,12 @@
"cardset_footer_navigation_new_card_text_hover": $button_text_hover, "cardset_footer_navigation_new_card_text_hover": $button_text_hover,
"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,
"cardset_footer_navigation_import_cards_background_hover": none, "cardset_footer_navigation_import_cards_background_hover": $button_background_hover,
"cardset_footer_navigation_import_cards_text_hover": black, "cardset_footer_navigation_import_cards_text_hover": $button_text_hover,
"cardset_footer_navigation_edit_shuffle_background": $thm_orange, "cardset_footer_navigation_edit_shuffle_background": $thm_orange,
"cardset_footer_navigation_edit_shuffle_text": white, "cardset_footer_navigation_edit_shuffle_text": white,
"cardset_footer_navigation_edit_shuffle_background_hover": $thm_gray, "cardset_footer_navigation_edit_shuffle_background_hover": $button_background_hover,
"cardset_footer_navigation_edit_shuffle_text_hover": white, "cardset_footer_navigation_edit_shuffle_text_hover": $button_text_hover,
"cardset_footer_navigation_edit_cardset_background": none, "cardset_footer_navigation_edit_cardset_background": none,
"cardset_footer_navigation_edit_cardset_text": black, "cardset_footer_navigation_edit_cardset_text": black,
"cardset_footer_navigation_edit_cardset_background_hover": $button_background_hover, "cardset_footer_navigation_edit_cardset_background_hover": $button_background_hover,
......
<template name="cardsetInfoBox"> <template name="cardsetInfoBox">
<div id="collapseCardsetInfoButton" <div id="collapseCardsetInfoButton"
class="col-xs-12 card btn-default btn-raised {{getColors}} collapseButton collapsed"> class="col-xs-12 card btn-raised {{getColors}} collapseButton collapsed">
<strong>{{#if this.shuffled}}{{_ "set-list.cardsetInfoRepetitorium"}}{{else}}{{_ <strong>{{#if this.shuffled}}{{_ "set-list.cardsetInfoRepetitorium"}}{{else}}{{_
"set-list.cardsetInfoStatic"}}{{/if}}</strong> "set-list.cardsetInfoStatic"}}{{/if}}</strong>
<i id="collapseCardsetInfoIcon" class="glyphicon glyphicon-collapse-down pull-right"></i> <i id="collapseCardsetInfoIcon" class="glyphicon glyphicon-collapse-down pull-right"></i>
......
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
{{else}} {{else}}
{{username}} ({{_ "admin.deleted"}}) {{username}} ({{_ "admin.deleted"}})
{{/if}} {{/if}}
<a id="cardsetChangeOwnerAdmin" class="btn btn-raised btn-success"> <button id="cardsetChangeOwnerAdmin" class="btn btn-raised btn-success">
{{_ "modal-admin-dialog.owner.button" owner=getAuthorLabel}}</a> {{_ "modal-admin-dialog.owner.button" owner=getAuthorLabel}}</button>
<label id="cardsetChangeOwnerAdminLabel" for="cardsetChangeOwnerAdmin" <label id="cardsetChangeOwnerAdminLabel" for="cardsetChangeOwnerAdmin"
style="visibility: hidden;"></label> style="visibility: hidden;"></label>
</div> </div>
...@@ -69,11 +69,11 @@ ...@@ -69,11 +69,11 @@
"modal-admin-dialog.wordcloud.title"}}</div> "modal-admin-dialog.wordcloud.title"}}</div>
<div class="panel-body"> <div class="panel-body">
{{#if isInWordcloud}} {{#if isInWordcloud}}
<a id="cardsetRemoveFromWordcloude" class="btn btn-raised btn-danger"> <button id="cardsetRemoveFromWordcloude" class="btn btn-raised btn-danger">
{{_ "modal-admin-dialog.wordcloud.button.remove"}}</a> {{_ "modal-admin-dialog.wordcloud.button.remove"}}</button>
{{else}} {{else}}
<a id="cardsetAddToWordcloude" class="btn btn-raised btn-success"> <button id="cardsetAddToWordcloude" class="btn btn-raised btn-success">
{{_ "modal-admin-dialog.wordcloud.button.add"}}</a> {{_ "modal-admin-dialog.wordcloud.button.add"}}</button>
{{/if}} {{/if}}
</div> </div>
</div> </div>
......
...@@ -1005,8 +1005,3 @@ th { ...@@ -1005,8 +1005,3 @@ th {
-ms-filter: blur($blur_hide_answer_question); -ms-filter: blur($blur_hide_answer_question);
filter: blur($blur_hide_answer_question); filter: blur($blur_hide_answer_question);
} }
.btn:focus, .btn:hover {
background: midnightblue !important;
color: white !important;
}
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
{{_ "pomodoro.form.presentation.button.cancel"}} {{_ "pomodoro.form.presentation.button.cancel"}}
</button> </button>
{{else}} {{else}}
<button type="button" id="settingsBtn" class="btn btn-info btn-raised fa fa-gear hvr-bounce-in" <button type="button" id="settingsBtn" class="btn btn-info btn-raised fa fa-gear"
style="float:left;"> style="float:left;">
{{_ "pomodoro.form.user.button.settings"}} {{_ "pomodoro.form.user.button.settings"}}
</button> </button>
......
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