Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/css/multilingual.css
Original file line number Diff line number Diff line change
@@ -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),
Expand Down
4 changes: 1 addition & 3 deletions assets/less/multilingual.less
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
.ml-dropdown,
.ml-copy-dropdown {
position: absolute;
height: 100%;
width: 42px;
top: 0;

Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions lang/en/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' => [
Expand Down
6 changes: 5 additions & 1 deletion lang/lv/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -64,4 +69,3 @@
'found_title' => 'Skenēšanas kļūdas',
],
];

2 changes: 1 addition & 1 deletion traits/mlcontrol/partials/_locale_copy.htm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
data-toggle="dropdown"
type="button">
</button>
<ul class="dropdown-menu pull-right ml-copy-dropdown-menu" role="menu">
<ul class="dropdown-menu pull-right ml-copy-dropdown-menu" role="menu" data-dropdown-title="<?= e(trans('winter.translate::lang.locale.copy_from_label')) ?>">
<?php foreach ($locales as $code => $name): ?>
<li role="presentation">
<a
Expand Down
Loading