From 416d8c6b88e0c62e0e4c30ce8ba8e2717c42be85 Mon Sep 17 00:00:00 2001 From: Benoit Podwinski Date: Thu, 7 Sep 2017 15:33:16 +0200 Subject: [PATCH 01/27] Add bootstrap/gulp & style magmi_config_setup.php --- .csscomb.json | 26 ++ .gitignore | 1 + gulpfile.js | 61 +++ magmi/web/css/960.css | 514 ----------------------- magmi/web/css/magmi.css | 680 +++++++++++++++---------------- magmi/web/css/reset.css | 44 -- magmi/web/head.php | 40 +- magmi/web/header.php | 24 +- magmi/web/magmi.php | 24 +- magmi/web/magmi_config_setup.php | 200 ++++----- magmi/web/sass/magmi.scss | 670 ++++++++++++++++++++++++++++++ package.json | 26 ++ 12 files changed, 1236 insertions(+), 1074 deletions(-) create mode 100644 .csscomb.json create mode 100644 gulpfile.js delete mode 100755 magmi/web/css/960.css delete mode 100755 magmi/web/css/reset.css create mode 100644 magmi/web/sass/magmi.scss create mode 100644 package.json diff --git a/.csscomb.json b/.csscomb.json new file mode 100644 index 00000000..5195bcfe --- /dev/null +++ b/.csscomb.json @@ -0,0 +1,26 @@ +{ + "remove-empty-rulesets": true, + "always-semicolon": true, + "color-case": "lower", + "block-indent": " ", + "color-shorthand": false, + "element-case": "lower", + "eof-newline": true, + "leading-zero": true, + "quotes": "single", + "sort-order-fallback": "abc", + "space-before-colon": "", + "space-after-colon": " ", + "space-before-combinator": " ", + "space-after-combinator": " ", + "space-between-declarations": "\n", + "space-before-opening-brace": " ", + "space-after-opening-brace": "\n", + "space-after-selector-delimiter": "\n", + "space-before-selector-delimiter": "", + "space-before-closing-brace": "\n", + "strip-spaces": true, + "tab-size": true, + "unitless-zero": true, + "vendor-prefix-align": true +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 9b3c2ffb..87b6c9dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .idea /magmi/state/* !/magmi/state/dummy.txt +/node_modules/ .php-cs-fixer.cache .php_cs.cache diff --git a/gulpfile.js b/gulpfile.js new file mode 100644 index 00000000..8aa22b88 --- /dev/null +++ b/gulpfile.js @@ -0,0 +1,61 @@ +'use strict'; + +var gulp = require('gulp'); +var plugins = require('gulp-load-plugins')({ + DEBUG: false, + pattern: '*' + }); + +// Variables +var url = 'http://dagoth.bp.local/github/magmi-git/'; +var template = 'magmi/web'; + +var paths = { + img: template + '/' + 'images', + js: template + '/' + 'js', + sass: template + '/' + 'sass', + css: template + '/' + 'css' +}; + +// BrowserSync task +gulp.task('browserSync', ['sass'], function() { + plugins.browserSync.init({ + proxy: url, + reloadOnRestart: true, + open: false + }); + gulp.watch(paths.sass + '/**/*.scss', ['sass']); + gulp.watch(paths.js + '/**/*.js').on('change', plugins.browserSync.reload); + gulp.watch(template + '/**/*.php').on('change', plugins.browserSync.reload); +}); + +// Autoprefixer task +gulp.task('autoprefixer', function () { + gulp.src([paths.css + '/*.css', paths.css + '/**/*.css']) + .pipe(plugins.plumber({ + errorHandler: function (error) { + console.log(error.message); + this.emit('end'); + }})) + .pipe(plugins.postcss([plugins.autoprefixer()])) + .on('error', function(err) {}) + .pipe(gulp.dest(paths.css)); +}); + +// Sass task +gulp.task('sass', function() { + gulp.src([paths.sass + '/*.scss', paths.sass + '/**/*.scss']) + .pipe(plugins.plumber({ + errorHandler: function (error) { + console.log(error.message); + this.emit('end'); + }})) + .pipe(plugins.sass.sync().on('error', plugins.sass.logError)) + .on('error', function(err) {}) + .pipe(plugins.csscomb()) + .pipe(gulp.dest(paths.css)) + .pipe(plugins.browserSync.stream()); +}); + +// Default task +gulp.task('default', ['browserSync']); diff --git a/magmi/web/css/960.css b/magmi/web/css/960.css deleted file mode 100755 index ce17c83c..00000000 --- a/magmi/web/css/960.css +++ /dev/null @@ -1,514 +0,0 @@ -.container_12,.container_16 { - margin-left: auto; - margin-right: auto; - width: 960px -} - -.grid_1,.grid_2,.grid_3,.grid_4,.grid_5,.grid_6,.grid_7,.grid_8,.grid_9,.grid_10,.grid_11,.grid_12,.grid_13,.grid_14,.grid_15,.grid_16 - { - display: inline; - float: left; - margin-left: 10px; - margin-right: 10px -} - -.push_1,.pull_1,.push_2,.pull_2,.push_3,.pull_3,.push_4,.pull_4,.push_5,.pull_5,.push_6,.pull_6,.push_7,.pull_7,.push_8,.pull_8,.push_9,.pull_9,.push_10,.pull_10,.push_11,.pull_11,.push_12,.pull_12,.push_13,.pull_13,.push_14,.pull_14,.push_15,.pull_15 - { - position: relative -} - -.container_12 .grid_3,.container_16 .grid_4 { - width: 220px -} - -.container_12 .grid_6,.container_16 .grid_8 { - width: 460px -} - -.container_12 .grid_9,.container_16 .grid_12 { - width: 700px -} - -.container_12 .grid_12,.container_16 .grid_16 { - width: 940px -} - -.alpha { - margin-left: 0 -} - -.omega { - margin-right: 0 -} - -.container_12 .grid_1 { - width: 60px -} - -.container_12 .grid_2 { - width: 140px -} - -.container_12 .grid_4 { - width: 300px -} - -.container_12 .grid_5 { - width: 380px -} - -.container_12 .grid_7 { - width: 540px -} - -.container_12 .grid_8 { - width: 620px -} - -.container_12 .grid_10 { - width: 780px -} - -.container_12 .grid_11 { - width: 860px -} - -.container_16 .grid_1 { - width: 40px -} - -.container_16 .grid_2 { - width: 100px -} - -.container_16 .grid_3 { - width: 160px -} - -.container_16 .grid_5 { - width: 280px -} - -.container_16 .grid_6 { - width: 340px -} - -.container_16 .grid_7 { - width: 400px -} - -.container_16 .grid_9 { - width: 520px -} - -.container_16 .grid_10 { - width: 580px -} - -.container_16 .grid_11 { - width: 640px -} - -.container_16 .grid_13 { - width: 760px -} - -.container_16 .grid_14 { - width: 820px -} - -.container_16 .grid_15 { - width: 880px -} - -.container_12 .prefix_3,.container_16 .prefix_4 { - padding-left: 240px -} - -.container_12 .prefix_6,.container_16 .prefix_8 { - padding-left: 480px -} - -.container_12 .prefix_9,.container_16 .prefix_12 { - padding-left: 720px -} - -.container_12 .prefix_1 { - padding-left: 80px -} - -.container_12 .prefix_2 { - padding-left: 160px -} - -.container_12 .prefix_4 { - padding-left: 320px -} - -.container_12 .prefix_5 { - padding-left: 400px -} - -.container_12 .prefix_7 { - padding-left: 560px -} - -.container_12 .prefix_8 { - padding-left: 640px -} - -.container_12 .prefix_10 { - padding-left: 800px -} - -.container_12 .prefix_11 { - padding-left: 880px -} - -.container_16 .prefix_1 { - padding-left: 60px -} - -.container_16 .prefix_2 { - padding-left: 120px -} - -.container_16 .prefix_3 { - padding-left: 180px -} - -.container_16 .prefix_5 { - padding-left: 300px -} - -.container_16 .prefix_6 { - padding-left: 360px -} - -.container_16 .prefix_7 { - padding-left: 420px -} - -.container_16 .prefix_9 { - padding-left: 540px -} - -.container_16 .prefix_10 { - padding-left: 600px -} - -.container_16 .prefix_11 { - padding-left: 660px -} - -.container_16 .prefix_13 { - padding-left: 780px -} - -.container_16 .prefix_14 { - padding-left: 840px -} - -.container_16 .prefix_15 { - padding-left: 900px -} - -.container_12 .suffix_3,.container_16 .suffix_4 { - padding-right: 240px -} - -.container_12 .suffix_6,.container_16 .suffix_8 { - padding-right: 480px -} - -.container_12 .suffix_9,.container_16 .suffix_12 { - padding-right: 720px -} - -.container_12 .suffix_1 { - padding-right: 80px -} - -.container_12 .suffix_2 { - padding-right: 160px -} - -.container_12 .suffix_4 { - padding-right: 320px -} - -.container_12 .suffix_5 { - padding-right: 400px -} - -.container_12 .suffix_7 { - padding-right: 560px -} - -.container_12 .suffix_8 { - padding-right: 640px -} - -.container_12 .suffix_10 { - padding-right: 800px -} - -.container_12 .suffix_11 { - padding-right: 880px -} - -.container_16 .suffix_1 { - padding-right: 60px -} - -.container_16 .suffix_2 { - padding-right: 120px -} - -.container_16 .suffix_3 { - padding-right: 180px -} - -.container_16 .suffix_5 { - padding-right: 300px -} - -.container_16 .suffix_6 { - padding-right: 360px -} - -.container_16 .suffix_7 { - padding-right: 420px -} - -.container_16 .suffix_9 { - padding-right: 540px -} - -.container_16 .suffix_10 { - padding-right: 600px -} - -.container_16 .suffix_11 { - padding-right: 660px -} - -.container_16 .suffix_13 { - padding-right: 780px -} - -.container_16 .suffix_14 { - padding-right: 840px -} - -.container_16 .suffix_15 { - padding-right: 900px -} - -.container_12 .push_3,.container_16 .push_4 { - left: 240px -} - -.container_12 .push_6,.container_16 .push_8 { - left: 480px -} - -.container_12 .push_9,.container_16 .push_12 { - left: 720px -} - -.container_12 .push_1 { - left: 80px -} - -.container_12 .push_2 { - left: 160px -} - -.container_12 .push_4 { - left: 320px -} - -.container_12 .push_5 { - left: 400px -} - -.container_12 .push_7 { - left: 560px -} - -.container_12 .push_8 { - left: 640px -} - -.container_12 .push_10 { - left: 800px -} - -.container_12 .push_11 { - left: 880px -} - -.container_16 .push_1 { - left: 60px -} - -.container_16 .push_2 { - left: 120px -} - -.container_16 .push_3 { - left: 180px -} - -.container_16 .push_5 { - left: 300px -} - -.container_16 .push_6 { - left: 360px -} - -.container_16 .push_7 { - left: 420px -} - -.container_16 .push_9 { - left: 540px -} - -.container_16 .push_10 { - left: 600px -} - -.container_16 .push_11 { - left: 660px -} - -.container_16 .push_13 { - left: 780px -} - -.container_16 .push_14 { - left: 840px -} - -.container_16 .push_15 { - left: 900px -} - -.container_12 .pull_3,.container_16 .pull_4 { - left: -240px -} - -.container_12 .pull_6,.container_16 .pull_8 { - left: -480px -} - -.container_12 .pull_9,.container_16 .pull_12 { - left: -720px -} - -.container_12 .pull_1 { - left: -80px -} - -.container_12 .pull_2 { - left: -160px -} - -.container_12 .pull_4 { - left: -320px -} - -.container_12 .pull_5 { - left: -400px -} - -.container_12 .pull_7 { - left: -560px -} - -.container_12 .pull_8 { - left: -640px -} - -.container_12 .pull_10 { - left: -800px -} - -.container_12 .pull_11 { - left: -880px -} - -.container_16 .pull_1 { - left: -60px -} - -.container_16 .pull_2 { - left: -120px -} - -.container_16 .pull_3 { - left: -180px -} - -.container_16 .pull_5 { - left: -300px -} - -.container_16 .pull_6 { - left: -360px -} - -.container_16 .pull_7 { - left: -420px -} - -.container_16 .pull_9 { - left: -540px -} - -.container_16 .pull_10 { - left: -600px -} - -.container_16 .pull_11 { - left: -660px -} - -.container_16 .pull_13 { - left: -780px -} - -.container_16 .pull_14 { - left: -840px -} - -.container_16 .pull_15 { - left: -900px -} - -.clear { - clear: both; - display: block; - overflow: hidden; - visibility: hidden; - width: 0; - height: 0 -} - -.clearfix:after { - clear: both; - content: ' '; - display: block; - font-size: 0; - line-height: 0; - visibility: hidden; - width: 0; - height: 0 -} - -* html .clearfix,*:first-child+html .clearfix { - zoom: 1 -} \ No newline at end of file diff --git a/magmi/web/css/magmi.css b/magmi/web/css/magmi.css index 18486436..5f3f8101 100755 --- a/magmi/web/css/magmi.css +++ b/magmi/web/css/magmi.css @@ -1,626 +1,594 @@ -@CHARSET "UTF-8"; - +@CHARSET 'UTF-8'; body { - behavior: url("csshover3.htc"); + behavior: url('csshover3.htc'); } -.datasource_plugin_config,.itemprocessor_plugin_config,.general_plugin_config - { - clear: both; +.datasource_plugin_config, +.itemprocessor_plugin_config, +.general_plugin_config { + clear: both; } ul.formline { - width: 100%; - padding-left: 0px; - clear: both; - height: 24px; + width: 100%; + padding-left: 0; + clear: both; + height: 27px; + margin-bottom: 6px; } - ul.formline li { - padding-left: 0px; - margin-left: 0px; - float: left; - list-style: none; + padding-left: 0; + margin-left: 0; + float: left; + list-style: none; } - ul.formline li.label { - text-align: left; - width: 200px; - padding-top: 4px; + text-align: left; + width: 200px; + line-height: 27px; } - ul.formline li.value { - float: left; -} - -.col { - border: 1px solid #cccccc; - font-size: small; - margin-top: 3px; - margin-bottom: 5px; -} - -.col h3 { - background-color: #cccccc; - line-height: 1.3em; + float: left; } .fieldinfo { - font-size: x-small; - color: #0000cc; -} - -input[type=text] { - border: 1px solid #888888; -} - -input[type=password] { - border: 1px solid #888888; -} - -body { - font-family: sans-serif; + font-size: x-small; + color: #0000cc; } div.title { - width: 100%; - position: relative; - height: 120px; - background-color: #ffffff; + width: 100%; + position: relative; + height: 120; + background-color: #ffffff; } .title .logo { - float: left; - height: 120px; - width: 340px; - background: url("../images/logo.png") no-repeat transparent; - background-color: #ffffff; + float: left; + height: 120; + width: 340; + background: url('../images/logo.png') no-repeat transparent; + background-color: #ffffff; } -.title .logoauth { - position: absolute; - top: 104px; - left: 5px; - font-size: xx-small; +.title .logoauth { + position: absolute; + top: 104px; + left: 5px; + font-size: xx-small; } .title .info { - float: left; - /*width:598px;*/ - border: 1px solid #8888cc; - height: 100%; + float: left; + /*width:598px;*/ + border: 1px solid #8888cc; + height: 100%; } .title .info h3 { - background-color: #8888cc; - width: 100%; - color: #ffffff; + background-color: #8888cc; + width: 100%; + color: #ffffff; } -.title .author { - width: 100%; - float: right; - font-size: 12pt; +.title .author { + width: 100%; + float: right; + font-size: 12pt; } #m_license { - font-family: monospace; - display: block; - z-index: 200; - background: #ffffcc; - border: 1px solid #000000; - color: #000000; + font-family: monospace; + display: block; + z-index: 200; + background: #ffffcc; + border: 1px solid #000000; + color: #000000; } -.title .version { - width: 100%; - float: right; - font-weight: bold; +.title .version { + width: 100%; + float: right; + font-weight: bold; } .subtitle { - width: 100%; - line-height: 2em; - font-size: large; - background: #8888cc; - color: #ffffff; - font-weight: bold; - margin-top: 5px; + background-color: #b8b8e6; + width: 100%; + line-height: 2.6rem; + font-size: 1.25rem; + font-weight: bold; + margin-top: 10px; + border-radius: 3px; +} +.subtitle span { + padding: 0 10px; } .saveinfo { - float: right; - font-size: small; - font-weight: normal; - padding-right: 5px; + float: right; + font-size: small; + font-weight: normal; + padding-right: 5px; } .actionbutton { - border: 1px solid #ccccff; - background: #eeeeff; - text-decoration: none; - font-size: small; + border: 1px solid #ccccff; + background: #eeeeff; + text-decoration: none; + font-size: small; } .actionbutton:hover { - border: 1px solid #8888cc; - background: #ccccff; + border: 1px solid #8888cc; + background: #ccccff; } .error { - color: #cc0000; + color: #cc0000; } li.value span { - padding-top: 4px; - height: 16px; + padding-top: 4px; + height: 16px; } span.version { - float: right; - font-weight: normal; - font-size: medium; - padding-right: 10px; + float: right; + font-weight: normal; + font-size: medium; + padding-right: 10; } -.log_error,.mgupload_error { - border: 1px solid #cc0000; - background: #ff8888; - color: #000000; - text-align: center; - font-size: 10pt; - font-weight: normal; - padding-top: 2px; - padding-bottom: 2px; +.log_error, +.mgupload_error { + border: 1px solid #cc0000; + background: #ff8888; + color: #000000; + text-align: center; + font-size: 10pt; + font-weight: normal; + padding-top: 2px; + padding-bottom: 2px; } .log_standard { - font-size: 10pt; - font-weight: normal; - padding-top: 2px; - padding-bottom: 2px; + font-size: 10pt; + font-weight: normal; + padding-top: 2px; + padding-bottom: 2px; } .log_indexing { - border: 1px solid #0000cc; - background: #8888ff; - color: #000000; - text-align: center; - font-size: 10pt; - font-weight: normal; - padding-top: 2px; - padding-bottom: 2px; + border: 1px solid #0000cc; + background: #8888ff; + color: #000000; + text-align: center; + font-size: 10pt; + font-weight: normal; + padding-top: 2px; + padding-bottom: 2px; } .log_warning { - border: 1px solid #cccc00; - background: #ffff88; - color: #000000; - text-align: center; - font-size: 10pt; - font-weight: normal; - padding-top: 2px; - padding-bottom: 2px; + border: 1px solid #cccc00; + background: #ffff88; + color: #000000; + text-align: center; + font-size: 10pt; + font-weight: normal; + padding-top: 2px; + padding-bottom: 2px; } /*.log_itime,.log_dbtime { - border:1px solid #cccccc; - background: #eeeeee; - color:#000000; - text-align: left; - font-size: 10pt; - padding-top:2px; - padding-bottom:2px; + border:1px solid #cccccc; + background: #eeeeee; + color:#000000; + text-align: left; + font-size: 10pt; + padding-top:2px; + padding-bottom:2px; }*/ .log_end { - border: 1px solid #00cc00; - background: #88ff88; - color: #000000; - text-align: center; - font-size: 10pt; - font-weight: normal; - padding-top: 2px; - padding-bottom: 2px; + border: 1px solid #00cc00; + background: #88ff88; + color: #000000; + text-align: center; + font-size: 10pt; + font-weight: normal; + padding-top: 2px; + padding-bottom: 2px; } .log_end span { - padding-left: 5px; - padding-right: 5px; + padding-left: 5px; + padding-right: 5px; } .log_warning span { - padding-left: 5px; - padding-right: 5px; + padding-left: 5px; + padding-right: 5px; } -.log_info,.mgupload_info { - border: 1px solid #00cc44; - background: #88ffcc; - color: #000000; - text-align: left; - font-size: 10pt; - padding-top: 2px; - padding-bottom: 2px; +.log_info, +.mgupload_info { + border: 1px solid #00cc44; + background: #88ffcc; + color: #000000; + text-align: left; + font-size: 10pt; + padding-top: 2px; + padding-bottom: 2px; } .log_end a { - color: #000000; + color: #000000; } .import_params { - margin-top: 10px; - line-height: 1.4em; - border: 1px solid #cccccc; + margin-top: 10; + line-height: 1.4em; + border: 1px solid #cccccc; } .import_params h2 { - background-color: #cccccc; - line-height: 1.4em; + background-color: #cccccc; + line-height: 1.4em; } .import_running h2 { - line-height: 1.4em; + line-height: 1.4em; } #import_log { - margin-top: 10px; + margin-top: 10; } #progress_container { - position: relative; - float: right; - width: 300px; - border: 1px solid #888888; - font-size: small; - margin-top: 0px; - border-collapse: collapse; + position: relative; + float: right; + width: 300; + border: 1px solid #888888; + font-size: small; + margin-top: 0; + border-collapse: collapse; } #import_progress { - position: absolute; - left: 0px; - top: 0px; - width: 100%; - text-align: center; - font-weight: normal; - z-index: 200; + position: absolute; + left: 0; + top: 0; + width: 100%; + text-align: center; + font-weight: normal; + z-index: 200; } .section_title { - background-color: #cccccc; - line-height: 1.4em; - font-weight: bold; - border: 1px solid #cccccc; - border-collapse: collapse; - padding-bottom: 2px; + background-color: #cccccc; + line-height: 1.4em; + font-weight: bold; + border: 1px solid #cccccc; + border-collapse: collapse; + padding-bottom: 2px; } -#common_config input[type=text],#common_config input[type=password] { - width: 180px; +#common_config input[type=text], +#common_config input[type=password] { + width: 180px; } #common_config ul.formline li.label { - width: 120px; - height: 18px; - padding-top: 3px; + width: 120px; } #profile_action li.label { - height: 18px; - padding-top: 3px; + height: 18px; + padding-top: 3px; } .pluginselect { - width: 400px; - clear: both; - float: left; + width: 400; + clear: both; + float: left; } .pluginselect input[type=checkbox] { - margin-left: 4px; - padding: 0px; - margin-top: 3px; + margin-left: 4px; + padding: 0; + margin-top: 3px; } div.plugininfo { - float: left; - position: relative; - padding-top: 2px; - background-color: #eeeeee; - height: 18px; - margin-bottom: 1px; -} - -.pluginname { - + float: left; + position: relative; + padding-top: 2px; + background-color: #eeeeee; + height: 18px; + margin-bottom: 1px; } span.pluginname.sponsored { - background: #eeeeff; + background: #eeeeff; } div.plugininfo div.plugininfohover { - position: absolute; - top: -9999px; - left: -9999px; + position: absolute; + top: -9999px; + left: -9999px; } div.plugininfo { - width: 50px; - text-align: center; + width: 50; + text-align: center; } div.plugininfo:hover { - background-color: #ccffcc; + background-color: #ccffcc; } div.pluginconf { - float: left; - margin-left: 10px; + float: left; + margin-left: 10; } div.plugindoc { - float: left; - margin-left: 10px; -} - -select { - border: 1px solid #888888; - background: #ffffff; + float: left; + margin-left: 10; } div.plugininfo:hover div.plugininfohover { - width: 400px; - border: 1px solid #000000; - background: #eeeecc; - top: 0px; - left: 100%; - z-index: 200; -} - -div.plugindata .ul { - + width: 400; + border: 1px solid #000000; + background: #eeeecc; + top: 0; + left: 100%; + z-index: 200; } div.plugindata .minidoc { - background: #ffffff; - border-top: 1px solid #cccccc; - padding-top: 3px; - padding-bottom: 3px; + background: #ffffff; + border-top: 1px solid #cccccc; + padding-top: 3px; + padding-bottom: 3px; } div.pluginconfpanel { - display: none; + display: none; } div.pluginconfpanel.selected { - display: block; - clear: both; - border: 1px solid #888888; + display: block; + clear: both; + border: 1px solid #888888; } #import_current { - position: absolute; - left: 0px; - top: 0px; - width: 0px; - background-color: #33cc33; - border: none; - z-index: 20; + position: absolute; + left: 0; + top: 0; + width: 0; + background-color: #33cc33; + border: none; + z-index: 20; } #runlog { - clear: both; - background-color: #ffffff; + clear: both; + background-color: #ffffff; } #runlog .runtime_info { - height: 100px; - overflow: auto; + height: 100; + overflow: auto; } .config_error { - margin-top: 10px; - border: 1px solid #cc0000; - background: #ff8888; - color: #000000; - text-align: center; - font-size: 10pt; - font-weight: normal; + margin-top: 10; + border: 1px solid #cc0000; + background: #ff8888; + color: #000000; + text-align: center; + font-size: 10pt; + font-weight: normal; } .scrollbox { - height: 200px; - position: relative; + height: 200; + position: relative; } .scrollbox_content { - margin-right: 8px; + margin-right: 8px; } .scrollbox_scrollbar { - background-color: silver; - border-left: solid black 1px; - height: 100%; - width: 8px; + background-color: silver; + border-left: solid black 1px; + height: 100%; + width: 8px; } .scrollbox_handle { - background-color: #888888; + background-color: #888888; } -.log_itime table,.log_dbtime table { - width: 100%; +.log_itime table, +.log_dbtime table { + width: 100%; } -.log_itime table td,.log_dbtime table td { - border: 1px solid #eeeeee; +.log_itime table td, +.log_dbtime table td { + border: 1px solid #eeeeee; } div.log_warning { - clear: both; + clear: both; } div.log_error { - clear: both; + clear: both; } .plugin_description { - border: 1px solid #eeeeee; - background-color: #dddddd; - margin: 2px; + border: 1px solid #eeeeee; + background-color: #dddddd; + margin: 2px; } -.plupload_error,.magmi_error { - border: 1px #cc0000 solid; - background-color: #ffaaaa; - color: #000000; - font-weight: normal; +.plupload_error, +.magmi_error { + border: 1px #cc0000 solid; + background-color: #ffaaaa; + color: #000000; + font-weight: normal; } .magmi_error li { - list-style: disc inside; + list-style: disc inside; } .message { - padding-top: 4px; + padding-top: 4px; } .fieldhelp { - float: right; - width: 24px; - height: 24px; - margin-right: 4px; - background: url('fieldhelp.png') transparent no-repeat; + float: right; + width: 24px; + height: 24px; + margin-right: 4px; + background: url('fieldhelp.png') transparent no-repeat; } div.trace { - font-size: small; - font-family: courier, monospace; - background-color: #fff; - border: 1px solid #cc0000; + font-size: small; + font-family: courier, monospace; + background-color: #ffffff; + border: 1px solid #cc0000; } #directrun ul.formline li.label { - width: 200px; + width: 200; } ul#globstep input[type=text] { - width: 100px; + width: 100; } ul#globstep.formline li.label { - width: 200px; + width: 200; } ul#mssep input[type=text] { - width: 50px; + width: 50; } ul#mssep.formline li.label { - width: 250px; + width: 250; } li.utility { - margin-top: 2px; + margin-top: 2px; } .utility .pluginselect { - height: 20px; - vertical-align: middle; + height: 20; + vertical-align: middle; } .utility .plugininfo { - height: 20px; - vertical-align: middle; + height: 20; + vertical-align: middle; } .utility .utility_run { - float: right; - height: 20px; + float: right; + height: 20; } .utility .utility_run a { - margin-top: 2px; + margin-top: 2px; } .utility .pluginoptionpanel { - clear: both; + clear: both; } .separator { - width: 100%; - border: 0px; - border-top: 1px solid #cccccc; - margin-bottom: 5px; - clear: both; + width: 100%; + border: 0; + border-top: 1px solid #cccccc; + margin-bottom: 5px; + clear: both; } .pluginrun_results { - border: 1px solid #0000cc; + border: 1px solid #0000cc; } p.logentry { - margin: 0px; - padding: 0px; - border-bottom: 1px solid #cccccc; + margin: 0; + padding: 0; + border-bottom: 1px solid #cccccc; } .pluginrun_results h3 { - background-color: #0000cc; - color: #ffffff; + background-color: #0000cc; + color: #ffffff; } #overlay { - position: absolute; - left: 0px; - top: 0px; - width: 100%; - height: 100%; - text-align: center; - z-index: 1000; - background: url("../images/white50.png"); + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + text-align: center; + z-index: 1000; + background: url('../images/white50.png'); } #overlaycontent { - width: 800px; - margin: 200px auto; - background-color: #fff; - border: 1px solid #000; - text-align: left; + width: 800; + margin: 200 auto; + background-color: #ffffff; + border: 1px solid #000000; + text-align: left; } div.actionbuttons { - width: 100%; - border-top: 1px solid #000000; - margin-top: 5px; - padding-top: 5px; - height: 24px; + width: 100%; + border-top: 1px solid #000000; + margin-top: 5px; + padding-top: 5px; + height: 24px; } div.actionbuttons a { - display: block; - float: right; - margin-right: 5px; + display: block; + float: right; + margin-right: 5px; } div.changedesc { - width: 100%; - border-top: 1px solid #000000; - border-bottom: 1px solid #000000; - margin-top: 5px; - padding-top: 5px; - padding-bottom: 5px; + width: 100%; + border-top: 1px solid #000000; + border-bottom: 1px solid #000000; + margin-top: 5px; + padding-top: 5px; + padding-bottom: 5px; } div.group { - margin-bottom: 5px; - margin-left: 0px; - margin-right: 0px; + margin-bottom: 5px; + margin-left: 0; + margin-right: 0; } div.group h1 { - margin-top: 2px; - margin-bottom: 3px; -} \ No newline at end of file + margin-top: 2px; + margin-bottom: 3px; +} diff --git a/magmi/web/css/reset.css b/magmi/web/css/reset.css deleted file mode 100755 index ff26604c..00000000 --- a/magmi/web/css/reset.css +++ /dev/null @@ -1,44 +0,0 @@ -html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td - { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; - background: transparent -} - -body { - line-height: 1 -} - -ol,ul { - list-style: none -} - -blockquote,q { - quotes: none -} - -blockquote:before,blockquote:after,q:before,q:after { - content: ''; - content: none -} - -:focus { - outline: 0 -} - -ins { - text-decoration: none -} - -del { - text-decoration: line-through -} - -table { - border-collapse: collapse; - border-spacing: 0 -} \ No newline at end of file diff --git a/magmi/web/head.php b/magmi/web/head.php index f2300d76..da9ce507 100644 --- a/magmi/web/head.php +++ b/magmi/web/head.php @@ -1,26 +1,24 @@ - -MAGMI (MAGento Mass Importer) by Dweeves - version <?php echo Magmi_Version::$version ?> - - - - - - - - - + + + MAGMI (MAGento Mass Importer) by Dweeves - version <?php echo Magmi_Version::$version ?> + + + + + + + + - + diff --git a/magmi/web/header.php b/magmi/web/header.php index e7542934..6b122704 100644 --- a/magmi/web/header.php +++ b/magmi/web/header.php @@ -1,14 +1,14 @@ - -
-
-