Commit f8401de4 authored by Michał 'rysiek' Woźniak's avatar Michał 'rysiek' Woźniak
Browse files

merged

parent c3fe51db
......@@ -2,36 +2,60 @@
.marka > input {
display:none;
}
.marka > .marka-results {
.marka > .marka-dropdown {
visibility:hidden;
opacity:0;
}
.marka > .marka-toggle:checked + .marka-results {
visibility:visible !important;
opacity:1 !important;
}
.marka > .marka-results > .marka-result {
.marka > .marka-dropdown > .marka-result {
display:block;
}
.marka:hover > .marka-results {
.marka:hover > .marka-dropdown {
visibility:visible;
opacity:1;
transition:opacity 0.2s ease-out, visibility 0s linear 0s;
top:0px;
left:0px;
}
/* info text when empty */
.marka-results:empty {
/*.marka-dropdown:empty {
display:none !important;
}
.marka-results:empty::before {
content:"no results yet";
}*/
.marka-dropdown::before,
.marka-dropdown::after {
font-size:80%;
text-align:center;
font-style:italic;
color:#999;
text-shadow:0px 0px 3px #999;
text-shadow:0px 0px 1px #999;
white-space:nowrap;
}
.marka-dropdown::after {
border-bottom:1px dotted #aaa;
}
.marka-dropdown:hover::after {
color:black;
}
.marka-dropdown::before {
content:"in original currency:";
}
.marka-dropdown:empty::before {
content:"no conversion currency selected";
}
.marka-dropdown::after {
content:"convert to other currency";
}
.marka-dropdown:empty::after {
content:"select currency to convert to";
}
/* dropdown styling */
......@@ -41,7 +65,7 @@
border-bottom:1px dotted black;
}
.marka > .marka-results {
.marka > .marka-dropdown {
min-width:6em;
text-align:center;
position:absolute;
......@@ -53,6 +77,6 @@
z-index:1000;
border:none;
}
.marka > .marka-results > .marka-result {
.marka > .marka-dropdown > .marka-result {
padding:0.1em;
}
......@@ -81,7 +81,7 @@ Marka.prototype.doConversions = function() {
node.text(node.data("original_value"))
}
node.append(children);
node.children(".marka-results").html("<span class=\"marka-result\">" + node.data("original_value") + "</span>")
node.children(".marka-dropdown").html("<span class=\"marka-result\">" + node.data("original_value") + "</span>")
})
}
});
......@@ -160,7 +160,7 @@ Marka.prototype.findSymbol = function(text) {
}
Marka.prototype.wrapNode = function() {
var markaDropdownHTML = $('<label class="marka"><input type="checkbox" class="marka-toggle"/><span class="marka-results"></span></label>');
var markaDropdownHTML = $('<span class="marka"><span class="marka-dropdown"></span></span>');
return markaDropdownHTML.get(0);
}
......
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