Merge remote-tracking branch 'origin/developer' into developer
This commit is contained in:
+28
-28
@@ -3929,18 +3929,18 @@ a.tag:hover {
|
||||
display: inline-flex;
|
||||
position: relative;
|
||||
vertical-align: top; }
|
||||
.dropdown.is-active .dropdown-menu, .dropdown.is-hoverable:hover .dropdown-menu {
|
||||
.dropdown.is-active .dropdown-menu-buefy, .dropdown.is-hoverable:hover .dropdown-menu-buefy {
|
||||
display: block; }
|
||||
.dropdown.is-right .dropdown-menu {
|
||||
.dropdown.is-right .dropdown-menu-buefy {
|
||||
left: auto;
|
||||
right: 0; }
|
||||
.dropdown.is-up .dropdown-menu {
|
||||
.dropdown.is-up .dropdown-menu-buefy {
|
||||
bottom: 100%;
|
||||
padding-bottom: 4px;
|
||||
padding-top: initial;
|
||||
top: auto; }
|
||||
|
||||
.dropdown-menu {
|
||||
.dropdown-menu-buefy {
|
||||
display: none;
|
||||
left: 0;
|
||||
min-width: 12rem;
|
||||
@@ -3956,7 +3956,7 @@ a.tag:hover {
|
||||
padding-bottom: 0.5rem;
|
||||
padding-top: 0.5rem; }
|
||||
|
||||
.dropdown-item, .dropdown .dropdown-menu .has-link a {
|
||||
.dropdown-item, .dropdown .dropdown-menu-buefy .has-link a {
|
||||
color: #4a4a4a;
|
||||
display: block;
|
||||
font-size: 0.875rem;
|
||||
@@ -3964,17 +3964,17 @@ a.tag:hover {
|
||||
padding: 0.375rem 1rem;
|
||||
position: relative; }
|
||||
|
||||
a.dropdown-item, .dropdown .dropdown-menu .has-link a,
|
||||
a.dropdown-item, .dropdown .dropdown-menu-buefy .has-link a,
|
||||
button.dropdown-item {
|
||||
padding-right: 3rem;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
width: 100%; }
|
||||
a.dropdown-item:hover, .dropdown .dropdown-menu .has-link a:hover,
|
||||
a.dropdown-item:hover, .dropdown .dropdown-menu-buefy .has-link a:hover,
|
||||
button.dropdown-item:hover {
|
||||
background-color: whitesmoke;
|
||||
color: #0a0a0a; }
|
||||
a.dropdown-item.is-active, .dropdown .dropdown-menu .has-link a.is-active,
|
||||
a.dropdown-item.is-active, .dropdown .dropdown-menu-buefy .has-link a.is-active,
|
||||
button.dropdown-item.is-active {
|
||||
background-color: #0046a0;
|
||||
color: white; }
|
||||
@@ -7225,24 +7225,24 @@ label.panel-block {
|
||||
|
||||
.autocomplete {
|
||||
position: relative; }
|
||||
.autocomplete .dropdown-menu {
|
||||
.autocomplete .dropdown-menu-buefy {
|
||||
display: block;
|
||||
min-width: 100%;
|
||||
max-width: 100%; }
|
||||
.autocomplete .dropdown-menu.is-opened-top {
|
||||
.autocomplete .dropdown-menu-buefy.is-opened-top {
|
||||
top: auto;
|
||||
bottom: 100%; }
|
||||
.autocomplete .dropdown-content {
|
||||
overflow: auto;
|
||||
max-height: 200px; }
|
||||
.autocomplete .dropdown-item, .autocomplete .dropdown .dropdown-menu .has-link a, .dropdown .dropdown-menu .has-link .autocomplete a {
|
||||
.autocomplete .dropdown-item, .autocomplete .dropdown .dropdown-menu-buefy .has-link a, .dropdown .dropdown-menu-buefy .has-link .autocomplete a {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis; }
|
||||
.autocomplete .dropdown-item.is-hovered, .autocomplete .dropdown .dropdown-menu .has-link a.is-hovered, .dropdown .dropdown-menu .has-link .autocomplete a.is-hovered {
|
||||
.autocomplete .dropdown-item.is-hovered, .autocomplete .dropdown .dropdown-menu-buefy .has-link a.is-hovered, .dropdown .dropdown-menu-buefy .has-link .autocomplete a.is-hovered {
|
||||
background: whitesmoke;
|
||||
color: #0a0a0a; }
|
||||
.autocomplete .dropdown-item.is-disabled, .autocomplete .dropdown .dropdown-menu .has-link a.is-disabled, .dropdown .dropdown-menu .has-link .autocomplete a.is-disabled {
|
||||
.autocomplete .dropdown-item.is-disabled, .autocomplete .dropdown .dropdown-menu-buefy .has-link a.is-disabled, .dropdown .dropdown-menu-buefy .has-link .autocomplete a.is-disabled {
|
||||
opacity: 0.5;
|
||||
cursor: not-allowed; }
|
||||
.autocomplete.is-small {
|
||||
@@ -7566,14 +7566,14 @@ label.panel-block {
|
||||
background-color: #ff3860;
|
||||
color: #fff; }
|
||||
|
||||
.b-clockpicker .dropdown-menu {
|
||||
.b-clockpicker .dropdown-menu-buefy {
|
||||
min-width: 0; }
|
||||
|
||||
.b-clockpicker .dropdown,
|
||||
.b-clockpicker .dropdown-trigger {
|
||||
width: 100%; }
|
||||
|
||||
.b-clockpicker .dropdown-item, .b-clockpicker .dropdown .dropdown-menu .has-link a, .dropdown .dropdown-menu .has-link .b-clockpicker a {
|
||||
.b-clockpicker .dropdown-item, .b-clockpicker .dropdown .dropdown-menu-buefy .has-link a, .dropdown .dropdown-menu-buefy .has-link .b-clockpicker a {
|
||||
font-size: inherit;
|
||||
padding: 0; }
|
||||
|
||||
@@ -7738,7 +7738,7 @@ label.panel-block {
|
||||
.datepicker .dropdown,
|
||||
.datepicker .dropdown-trigger {
|
||||
width: 100%; }
|
||||
.datepicker .dropdown-item, .datepicker .dropdown .dropdown-menu .has-link a, .dropdown .dropdown-menu .has-link .datepicker a {
|
||||
.datepicker .dropdown-item, .datepicker .dropdown .dropdown-menu-buefy .has-link a, .dropdown .dropdown-menu-buefy .has-link .datepicker a {
|
||||
font-size: inherit; }
|
||||
.datepicker .datepicker-header {
|
||||
padding-bottom: 0.875rem;
|
||||
@@ -7903,17 +7903,17 @@ label.panel-block {
|
||||
.dropdown .background {
|
||||
display: none; } }
|
||||
|
||||
.dropdown .dropdown-menu .dropdown-item.is-disabled, .dropdown .dropdown-menu .has-link a.is-disabled {
|
||||
.dropdown .dropdown-menu-buefy .dropdown-item.is-disabled, .dropdown .dropdown-menu-buefy .has-link a.is-disabled {
|
||||
cursor: not-allowed; }
|
||||
.dropdown .dropdown-menu .dropdown-item.is-disabled:hover, .dropdown .dropdown-menu .has-link a.is-disabled:hover {
|
||||
.dropdown .dropdown-menu-buefy .dropdown-item.is-disabled:hover, .dropdown .dropdown-menu-buefy .has-link a.is-disabled:hover {
|
||||
background: inherit;
|
||||
color: inherit; }
|
||||
|
||||
.dropdown .dropdown-menu .has-link a {
|
||||
.dropdown .dropdown-menu-buefy .has-link a {
|
||||
padding-right: 3rem;
|
||||
white-space: nowrap; }
|
||||
|
||||
.dropdown:not(.is-disabled) .dropdown-menu .dropdown-item.is-disabled, .dropdown:not(.is-disabled) .dropdown-menu .has-link a.is-disabled {
|
||||
.dropdown:not(.is-disabled) .dropdown-menu-buefy .dropdown-item.is-disabled, .dropdown:not(.is-disabled) .dropdown-menu-buefy .has-link a.is-disabled {
|
||||
opacity: 0.5; }
|
||||
|
||||
.dropdown .navbar-item {
|
||||
@@ -7925,27 +7925,27 @@ label.panel-block {
|
||||
.dropdown.is-disabled .dropdown-trigger {
|
||||
pointer-events: none; }
|
||||
|
||||
.dropdown.is-inline .dropdown-menu {
|
||||
.dropdown.is-inline .dropdown-menu-buefy {
|
||||
position: static;
|
||||
display: inline-block;
|
||||
padding: 0; }
|
||||
|
||||
.dropdown.is-top-right .dropdown-menu {
|
||||
.dropdown.is-top-right .dropdown-menu-buefy {
|
||||
top: auto;
|
||||
bottom: 100%; }
|
||||
|
||||
.dropdown.is-top-left .dropdown-menu {
|
||||
.dropdown.is-top-left .dropdown-menu-buefy {
|
||||
top: auto;
|
||||
bottom: 100%;
|
||||
right: 0;
|
||||
left: auto; }
|
||||
|
||||
.dropdown.is-bottom-left .dropdown-menu {
|
||||
.dropdown.is-bottom-left .dropdown-menu-buefy {
|
||||
right: 0;
|
||||
left: auto; }
|
||||
|
||||
@media screen and (max-width: 1087px) {
|
||||
.dropdown.is-mobile-modal .dropdown-menu {
|
||||
.dropdown.is-mobile-modal .dropdown-menu-buefy {
|
||||
position: fixed;
|
||||
width: calc(100vw - 40px);
|
||||
max-width: 460px;
|
||||
@@ -7957,7 +7957,7 @@ label.panel-block {
|
||||
transform: translate3d(-50%, -25%, 0);
|
||||
white-space: normal;
|
||||
overflow-y: auto; }
|
||||
.dropdown.is-mobile-modal .dropdown-menu .dropdown-item, .dropdown.is-mobile-modal .dropdown-menu .has-link a {
|
||||
.dropdown.is-mobile-modal .dropdown-menu-buefy .dropdown-item, .dropdown.is-mobile-modal .dropdown-menu-buefy .has-link a {
|
||||
padding: 1rem 1.5rem; } }
|
||||
|
||||
.label {
|
||||
@@ -8765,14 +8765,14 @@ label.panel-block {
|
||||
.taginput .taginput-container .autocomplete > .control.is-loading::after {
|
||||
top: 0.375em; }
|
||||
|
||||
.timepicker .dropdown-menu {
|
||||
.timepicker .dropdown-menu-buefy {
|
||||
min-width: 0; }
|
||||
|
||||
.timepicker .dropdown,
|
||||
.timepicker .dropdown-trigger {
|
||||
width: 100%; }
|
||||
|
||||
.timepicker .dropdown-item, .timepicker .dropdown .dropdown-menu .has-link a, .dropdown .dropdown-menu .has-link .timepicker a {
|
||||
.timepicker .dropdown-item, .timepicker .dropdown .dropdown-menu-buefy .has-link a, .dropdown .dropdown-menu-buefy .has-link .timepicker a {
|
||||
font-size: inherit;
|
||||
padding: 0; }
|
||||
|
||||
|
||||
@@ -4835,7 +4835,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
|
||||
expression: "isActive && (data.length > 0 || hasEmptySlot || hasHeaderSlot)"
|
||||
}],
|
||||
ref: "dropdown",
|
||||
staticClass: "dropdown-menu",
|
||||
staticClass: "dropdown-menu-buefy",
|
||||
class: {
|
||||
'is-opened-top': !_vm.isListInViewportVertically
|
||||
}
|
||||
@@ -6034,7 +6034,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
|
||||
expression: "(!disabled && (isActive || hoverable)) || inline"
|
||||
}],
|
||||
ref: "dropdownMenu",
|
||||
staticClass: "dropdown-menu",
|
||||
staticClass: "dropdown-menu-buefy",
|
||||
attrs: {
|
||||
"aria-hidden": !_vm.isActive
|
||||
}
|
||||
|
||||
+25
-4
@@ -31,10 +31,23 @@ const HomeRouter = {
|
||||
_messagelist.push.apply(_messagelist, jd);
|
||||
console.log("jd: "+jd);
|
||||
for (var e in jd) {
|
||||
if (!_messages[jd[e]]) {
|
||||
get_insert_message(jd[e]);
|
||||
}
|
||||
if (!_messages[jd[e]]) {
|
||||
get_insert_message(jd[e]);
|
||||
}
|
||||
}
|
||||
/*if(!($".om-searchbar" = "")){
|
||||
for (var e in jd) {
|
||||
if (!_messages[jd[e]]) {
|
||||
get_insert_message(jd[e]);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
for (var e in jd) {
|
||||
if (!_messages[jd[e]]) {
|
||||
get_search_message(jd[e]);
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}).fail(function (e, f, g) {
|
||||
console.log("err: " + e + f + g);
|
||||
});
|
||||
@@ -54,7 +67,15 @@ function get_insert_message(id) {
|
||||
console.log("cannot load " + id + ".json: " + e + f + g);
|
||||
})
|
||||
}
|
||||
/*$(document).ready(function () {
|
||||
|
||||
/*function get_search_message(phrase) {
|
||||
$.ajax({ url: "api/msg/search/"+phrase, method: "GET" }).done(function (msg) {
|
||||
Vue.set(_messages, id, msg);
|
||||
}).fail(function (e, f, g) {
|
||||
console.log("cannot load " + id + ".json: " + e + f + g);
|
||||
})
|
||||
}
|
||||
$(document).ready(function () {
|
||||
console.log("egal");
|
||||
$.get('list.json').done(function (jd) {
|
||||
// _messagelist = jd;
|
||||
|
||||
Reference in New Issue
Block a user