Commit daeff71b authored by Curtis Adam's avatar Curtis Adam

Apply hint style to cardset header

parent 8f1cd339
......@@ -175,6 +175,12 @@ $themes: (
$background_difficulty1_lines: map-get($map, "background_difficulty1_lines");
$background_difficulty2_lines: map-get($map, "background_difficulty2_lines");
$background_difficulty3_lines: map-get($map, "background_difficulty3_lines");
//cardset colors
$cardset_markdeep_background: map-get($map, "cardset_markdeep_background");
$cardset_markdeep_header_border: map-get($map, "cardset_markdeep_header_border");
$cardset_markdeep_text: map-get($map, "cardset_markdeep_text");
$cardset_markdeep_link: map-get($map, "cardset_markdeep_link");
$cardset_markdeep_placeholder: map-get($map, "cardset_markdeep_placeholder");
//card colors
$background_lecture: map-get($map, "background_lecture");
$background_hint: map-get($map, "background_hint");
......@@ -1161,6 +1167,23 @@ $themes: (
}
//cardset
.markdeepCardset {
background-color: $cardset_markdeep_background !important;
}
.markdeepCardsetContent {
color: $cardset_markdeep_text !important;
a {
color: $cardset_markdeep_link !important;
}
.placeholder {
color: $cardset_markdeep_placeholder !important;
}
hr {
border-color: $cardset_markdeep_header_border !important;
}
}
.cardListName {
color: $white !important;
}
......
......@@ -212,6 +212,12 @@
"card_header_first_row": $thm_gray,
"card_header_second_row": $thm_gray,
"card_header_subject": $thm_gray,
//cardset colors
"cardset_markdeep_background": LightGoldenRodYellow,
"cardset_markdeep_header_border": $thm_orange,
"cardset_markdeep_text": $thm_gray,
"cardset_markdeep_link": $thm_orange,
"cardset_markdeep_placeholder": $thm_green,
//markdeep editor
"markdeep_help_text": $white,
"markdeep_help_background": $thm_orange,
......
......@@ -214,6 +214,12 @@
"card_header_first_row": $thm_gray,
"card_header_second_row": $thm_gray,
"card_header_subject": $thm_gray,
//cardset colors
"cardset_markdeep_background": LightGoldenRodYellow,
"cardset_markdeep_header_border": $thm_orange,
"cardset_markdeep_text": $thm_gray,
"cardset_markdeep_link": $thm_orange,
"cardset_markdeep_placeholder": $thm_green,
//markdeep editor
"markdeep_help_text": $white,
"markdeep_help_background": $thm_orange,
......
......@@ -308,12 +308,11 @@
<div id="cardsetInfoDetail" class="col-md-12">
<div class="panel panel-default cardsetInfo">
<div class="panel-body">
<div class="row">
<div class="col-sm-6 col-md-8">
<div class="">
<h4 id="cardsetTitle">{{{getKind}}} {{name}}</h4>
<hr> {{#mathjax}}{{description}}{{/mathjax}}
</div>
<div class="row markdeepCardset">
<div class="col-sm-6 col-md-8 markdeepCardsetContent">
<h4 id="cardsetTitle">{{{getKind}}} {{name}}</h4>
<hr>
{{#mathjax}}{{description}}{{/mathjax}}
</div>
<div class="col-sm-6 col-md-4 infoBox">
<span class="collapseCardsetInfoContainer">
......
......@@ -287,25 +287,11 @@
#collapseCardsetInfoButton {
float: none;
z-index: 50;
-webkit-box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 -4px 20px 0 rgba(0, 0, 0, 0.19);
box-shadow: 0 -4px 17px 0 rgba(0, 0, 0, 0.2), 0 -4px 20px 0 rgba(0, 0, 0, 0.19);
}
#collapseCardsetInfo {
-webkit-box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 -4px 20px 0 rgba(0, 0, 0, 0.19);
box-shadow: 0 -4px 17px 0 rgba(0, 0, 0, 0.2), 0 -4px 20px 0 rgba(0, 0, 0, 0.19);
}
#collapseLearningPhaseInfoButton {
float: none;
z-index: 50;
-webkit-box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 -4px 20px 0 rgba(0, 0, 0, 0.19);
box-shadow: 0 -4px 17px 0 rgba(0, 0, 0, 0.2), 0 -4px 20px 0 rgba(0, 0, 0, 0.19);
}
#collapseLearningPhaseInfo {
-webkit-box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 -4px 20px 0 rgba(0, 0, 0, 0.19);
box-shadow: 0 -4px 17px 0 rgba(0, 0, 0, 0.2), 0 -4px 20px 0 rgba(0, 0, 0, 0.19);
}
.collapseCardsetInfoContainer {
......@@ -385,6 +371,13 @@ th .field-tip {
margin-top: 2px;
margin-right: 0;
}
.panel-body {
padding-top: 0;
padding-bottom: 0;
}
.panel-footer {
margin-top: 0;
}
}
#showHintLearning, #showHintManage, #showIntervalHelp, #showPreviewHelp, .fa-trophy {
......@@ -406,4 +399,13 @@ th .field-tip {
.cardset-list-badge {
float:right;
}
\ No newline at end of file
}
.markdeepCardset {
padding-bottom: 15px;
}
.markdeepCardsetContent {
padding: $padding_cardset_content_vertical$padding_cardset_content_horizontal !important;
font-size: $font_size_cardset_content !important;
}
......@@ -33,6 +33,11 @@ $font_weight_card_header_subject: bold;
$hint_link_decoration: underline;
$hint_link_alternative_decoration: underline;
//cardset
$font_size_cardset_content: 12pt;
$padding_cardset_content_horizontal: 10pt;
$padding_cardset_content_vertical: 10pt;
//markdeep editor
$font_family_markdeep_help: $default_font;
$font_size_markdeep_help: 12pt;
......
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