diff --git a/assets/css/multilingual.css b/assets/css/multilingual.css index 71259b4b..cfbbecba 100644 --- a/assets/css/multilingual.css +++ b/assets/css/multilingual.css @@ -1,12 +1,12 @@ .field-multilingual{position:relative} .field-multilingual .form-control:focus{z-index:20} .field-multilingual .ml-btn, -.field-multilingual .ml-copy-btn{z-index:12;position:absolute;top:1px;bottom:1px;right:1px;width:auto;width:44px;height:36px;color:#7b7b7b;background-color:#F8F6F3;box-shadow:none;font-size:11px;letter-spacing:1px;text-transform:uppercase;margin:0 !important;padding:0 12px;border-top-left-radius:0;border-bottom-left-radius:0;transition:color 420ms ease} +.field-multilingual .ml-copy-btn{z-index:12;position:absolute;top:1px;bottom:1px;right:1px;width:44px;height:36px;color:#7b7b7b;background-color:#f8f6f3;box-shadow:none;font-size:11px;letter-spacing:1px;text-transform:uppercase;margin:0 !important;padding:0 12px;border-top-left-radius:0;border-bottom-left-radius:0;transition:color 420ms ease} .field-multilingual .ml-btn:hover, .field-multilingual .ml-copy-btn:hover{color:#555} .field-multilingual .ml-copy-btn{border-radius:0} .field-multilingual .ml-dropdown, -.field-multilingual .ml-copy-dropdown{position:absolute;height:100%;width:42px;top:0} +.field-multilingual .ml-copy-dropdown{position:absolute;width:42px;top:0} .field-multilingual .ml-dropdown.ml-copy-dropdown, .field-multilingual .ml-copy-dropdown.ml-copy-dropdown{right:41px} .field-multilingual .ml-dropdown:not(.ml-copy-dropdown), diff --git a/assets/less/multilingual.less b/assets/less/multilingual.less index b0bba95b..b5634c7f 100644 --- a/assets/less/multilingual.less +++ b/assets/less/multilingual.less @@ -25,7 +25,6 @@ .ml-dropdown, .ml-copy-dropdown { position: absolute; - height: 100%; width: 42px; top: 0; @@ -159,12 +158,11 @@ bottom: 1px; right: 1px; - width: auto; width: 44px; height: 36px; color: lighten(@multilingual-btn-color, 15%); - background-color: #F8F6F3; + background-color: #f8f6f3; box-shadow: none; font-size: 11px; diff --git a/lang/en/lang.php b/lang/en/lang.php index ed25a7ca..8fd16902 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -38,6 +38,7 @@ 'reorder_title' => 'Reorder languages', 'sort_order' => 'Sort Order', 'copy_from' => 'Copy from :locale', + 'copy_from_label' => 'Copy from another locale', 'copy_confirm' => 'Are you sure you want to copy from another locale?', ], 'messages' => [ diff --git a/lang/lv/lang.php b/lang/lv/lang.php index fe5cf9ea..029b281a 100644 --- a/lang/lv/lang.php +++ b/lang/lv/lang.php @@ -17,6 +17,8 @@ 'component_description' => 'Iekļauj valodu alternatīvas kā lapas hreflang elementus' ], 'locale' => [ + 'label' => 'Valoda', + 'label_plural' => 'Valodas', 'title' => 'Pārvaldīt valodas', 'update_title' => 'Atjaunot valodu', 'create_title' => 'Izveidot valodu', @@ -35,6 +37,9 @@ 'hint_locales' => 'Izveidojiet jaunas valodas lapas publiskās daļas satura tulkošanai. Noklusējuma valoda attēlo saturu pirms tas ir ticis tulkots.', 'reorder_title' => 'Pārkārtot valodas', 'sort_order' => 'Kārtošanas secība', + 'copy_from' => 'Kopēt no :locale', + 'copy_from_label' => 'Kopēt no citas valodas', + 'copy_confirm' => 'Vai esat pārliecināts, ka vēlaties kopēt vērtību no citas valodas?', ], 'messages' => [ 'title' => 'Tulkot ziņojumus', @@ -64,4 +69,3 @@ 'found_title' => 'Skenēšanas kļūdas', ], ]; - diff --git a/traits/mlcontrol/partials/_locale_copy.htm b/traits/mlcontrol/partials/_locale_copy.htm index 6fcf62e4..6217775e 100644 --- a/traits/mlcontrol/partials/_locale_copy.htm +++ b/traits/mlcontrol/partials/_locale_copy.htm @@ -6,7 +6,7 @@ data-toggle="dropdown" type="button"> -