Skip to content
Permalink
Browse files

Fix some inconsistencies in themes

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
  • Loading branch information...
mauriciofauth committed Sep 9, 2019
1 parent c534e85 commit fe6a7f754c27740c4defac881cc8c40ac4df155c
@@ -4008,15 +4008,15 @@ Functions.toggleButton = function ($obj) {
var move = $('td.toggleOff', $obj).outerWidth();
// If the switch is initialized to the
// OFF state we need to move it now.
if ($('div.container', $obj).hasClass('off')) {
if ($('div.toggle-container', $obj).hasClass('off')) {
if (right === 'right') {
$('div.container', $obj).animate({ 'left': '-=' + move + 'px' }, 0);
$('div.toggle-container', $obj).animate({ 'left': '-=' + move + 'px' }, 0);
} else {
$('div.container', $obj).animate({ 'left': '+=' + move + 'px' }, 0);
$('div.toggle-container', $obj).animate({ 'left': '+=' + move + 'px' }, 0);
}
}
// Attach an 'onclick' event to the switch
$('div.container', $obj).on('click', function () {
$('div.toggle-container', $obj).on('click', function () {
if ($(this).hasClass('isActive')) {
return false;
} else {
@@ -4074,7 +4074,7 @@ Functions.toggleButton = function ($obj) {
* Unbind all event handlers before tearing down a page
*/
AJAX.registerTeardown('functions.js', function () {
$('div.container').off('click');
$('div.toggle-container').off('click');
});
/**
* Initialise all toggle buttons
@@ -1,5 +1,5 @@
{% if export_method != 'custom-no-form' %}
<div class="exportoptions row" id="quick_or_custom">
<div class="exportoptions" id="quick_or_custom">
<h3>{% trans 'Export method:' %}</h3>
<ul>
<li>
@@ -1,4 +1,4 @@
<div class="exportoptions row" id="format_specific_opts">
<div class="exportoptions" id="format_specific_opts">
<h3>{% trans 'Format-specific options:' %}</h3>
<p class="no_js_msg" id="scroll_to_options_msg">
{% trans 'Scroll down to fill in the options for the selected format and ignore the options for other formats.' %}
@@ -14,7 +14,7 @@
</div>
{% endif %}

<div class="exportoptions row justify-content-end" id="submit">
<div class="exportoptions justify-content-end" id="submit">
<input id="buttonGo" class="btn btn-primary" type="submit" value="{% trans 'Go' %}"
{#- If the time limit set is zero, then time out won't occur so no need
to check for time out. -#}
@@ -1,4 +1,4 @@
<div class="exportoptions row" id="export_templates">
<div class="exportoptions" id="export_templates">
<h3>{% trans 'Export templates:' %}</h3>

<div class="floatleft">
@@ -33,7 +33,7 @@
{% endif %}
<input type="hidden" name="import_type" value="{{ import_type }}">

<div class="exportoptions row" id="header">
<div class="exportoptions" id="header">
<h2>
{{ get_image('b_import', 'Import'|trans) }}
{% if import_type == 'server' %}
@@ -46,7 +46,7 @@
</h2>
</div>

<div class="importoptions row">
<div class="importoptions">
<h3>{% trans 'File to import:' %}</h3>

{# We don't have show anything about compression, when no supported #}
@@ -121,7 +121,7 @@
</div>
</div>

<div class="importoptions row">
<div class="importoptions">
<h3>{% trans 'Partial import:' %}</h3>

{% if timeout_passed is defined and timeout_passed %}
@@ -158,20 +158,20 @@
{% endif %}
</div>

<div class="importoptions row">
<div class="importoptions">
<h3>{% trans 'Other options:' %}</h3>
<div class="formelementrow">
{{ get_fk_checkbox() }}
</div>
</div>

<div class="importoptions row">
<div class="importoptions">
<h3>{% trans 'Format:' %}</h3>
{{ get_choice('Import', 'format', import_list) }}
<div id="import_notification"></div>
</div>

<div class="importoptions row" id="format_specific_opts">
<div class="importoptions" id="format_specific_opts">
<h3>{% trans 'Format-specific options:' %}</h3>
<p class="no_js_msg" id="scroll_to_options_msg">
{% trans 'Scroll down to fill in the options for the selected format and ignore the options for other formats.' %}
@@ -188,7 +188,7 @@
</div>
{% endif %}

<div class="importoptions row justify-content-end" id="submit">
<div class="importoptions justify-content-end" id="submit">
<input id="buttonGo" class="btn btn-primary" type="submit" value="{% trans 'Go' %}">
</div>
</form>
@@ -1,6 +1,6 @@
<div class='wrapper toggleAjax hide'>
<div class='toggleButton'>
<div title="{% trans 'Click to toggle' %}" class='container {{ state }}'>
<div title="{% trans 'Click to toggle' %}" class='toggle-container {{ state }}'>
<img src="{{ pma_theme_image }}toggle-{{ text_dir }}.png">
<table class='nospacing nopadding'>
<tbody>
@@ -163,7 +163,7 @@ public function testGetHtmlForOptions()
$html
);
$this->assertStringContainsString(
'<div class="exportoptions row" id="quick_or_custom">',
'<div class="exportoptions" id="quick_or_custom">',
$html
);
$this->assertStringContainsString(
@@ -2163,14 +2163,24 @@ label.desc {
}
}

code.php {
display: block;
padding-#{$left}: 0.3em;
margin-top: 0;
margin-bottom: 0;
max-height: 10em;
overflow: auto;
direction: ltr;
kbd {
color: $main-color;
background-color: transparent;
box-shadow: none;
}

code {
color: $main-color;

&.php {
display: block;
padding-#{$left}: 0.3em;
margin-top: 0;
margin-bottom: 0;
max-height: 10em;
overflow: auto;
direction: ltr;
}
}

.sqlOuter code.sql,
@@ -2984,7 +2994,7 @@ input#auto_increment_opt {
position: relative;
}

.container {
.toggle-container {
position: absolute;

td {
@@ -1561,7 +1561,15 @@ label.desc {
}
}

kbd {
color: $main-color;
background-color: transparent;
box-shadow: none;
}

code {
color: $main-color;

&.php {
display: block;
padding-#{$left}: 0.3em;
@@ -2329,7 +2337,7 @@ input#auto_increment_opt {
position: relative;
}

.container {
.toggle-container {
position: absolute;

td,
@@ -2002,7 +2002,15 @@ label.desc {
}
}

kbd {
color: $main-color;
background-color: transparent;
box-shadow: none;
}

code {
color: $main-color;

&.php {
display: block;
padding-#{$left}: 1em;
@@ -2834,7 +2842,7 @@ input#auto_increment_opt {
position: relative;
}

.container {
.toggle-container {
position: absolute;

td,

0 comments on commit fe6a7f7

Please sign in to comment.
You can’t perform that action at this time.