diff --git a/src/ui/zabapgit_css_common.w3mi.data.css b/src/ui/zabapgit_css_common.w3mi.data.css index 87fb03df4..8efd6a82d 100644 --- a/src/ui/zabapgit_css_common.w3mi.data.css +++ b/src/ui/zabapgit_css_common.w3mi.data.css @@ -78,13 +78,6 @@ div.panel { border-radius: 3px; } -#debug-output { - text-align: right; - padding-right: 0.5em; - font-style: italic; - font-size: small; -} - div.dummydiv { padding: 0.5em 1em; text-align: center; @@ -95,34 +88,49 @@ a.close-btn { } /* STRUCTURE DIVS, HEADER & FOOTER */ -#abapGitLogo { outline: none; } - div#header { padding: 0.5em 0.5em; border-bottom: 3px double; } -div#header td:not(.logo) { padding-top: 11px; } /* align with logo H */ -div#header td.logo { width: 164px; } -div#header td:not(.logo) { padding-top: 11px; } /* align with logo H */ +div#header > div { display: inline-block } -div#header span.page_title { - font-weight: normal; - font-size: 18pt; - padding-left: 0.4em; +.logo .icon { display: inline-block } +.logo .icon:before { width: auto } + +/* official logo colors, not vars, redefine in themes directly*/ +.logo .icon.icon-git-alt { color: #f03c2e } +.logo .icon.icon-abapgit { + color: #362701; + vertical-align: bottom; } -div#toc { padding: 0.5em 1em; } -div#toc .favorites a { opacity: 0.5; } -div#toc .favorites:hover a { opacity: 1; } +div#header .logo { font-size: x-large } +div#header .page-title { font-size: x-large } +div#header span.spacer { + display: inline-block; + padding-right: 0.25em; + padding-left: 0.25em; +} +div#footer .logo { font-size: large } div#footer { padding: 0.5em 1em; border-top: 3px double; - text-align: center; } -div#footer span.version { - display: block; - margin-top: 0.3em; +div#footer .version { + margin-top: 0.5em; + font-size: small; +} + +#debug-output { + text-align: right; + padding-right: 0.5em; + font-size: smaller; + font-family: monospace; +} +#debug-output p { + margin-top: 0em; + margin-bottom: 0em; } /* ERROR LOG */ diff --git a/src/ui/zabapgit_css_theme_default.w3mi.data.css b/src/ui/zabapgit_css_theme_default.w3mi.data.css index 4a3cc7d8e..049b05430 100644 --- a/src/ui/zabapgit_css_theme_default.w3mi.data.css +++ b/src/ui/zabapgit_css_theme_default.w3mi.data.css @@ -17,6 +17,7 @@ --theme-greyscale-light: #ccc; --theme-greyscale-lighter: lightgrey; --theme-linkhint-background: lightgreen; + --theme-debug-color: #aaa; } /* GLOBALS */ @@ -62,7 +63,7 @@ div.panel.success { color: #589a58 !important; background-color: #c5eac5; } -#debug-output { color: var(--theme-primary-font-color-reduced); } +#debug-output { color: var(--theme-debug-color); } div.dummydiv { background-color: var(--theme-container-background-color); } /* STRUCTURE DIVS, HEADER & FOOTER */ diff --git a/src/ui/zabapgit_icon_font.w3mi.data.woff b/src/ui/zabapgit_icon_font.w3mi.data.woff index b36876a5a..f4385c886 100644 Binary files a/src/ui/zabapgit_icon_font.w3mi.data.woff and b/src/ui/zabapgit_icon_font.w3mi.data.woff differ diff --git a/src/ui/zabapgit_icon_font_css.w3mi.data.css b/src/ui/zabapgit_icon_font_css.w3mi.data.css index 2fb07f2f4..7633c964a 100644 --- a/src/ui/zabapgit_icon_font_css.w3mi.data.css +++ b/src/ui/zabapgit_icon_font_css.w3mi.data.css @@ -27,30 +27,35 @@ .icon.large { font-size: 200%; } -.icon-arrow-circle-up:before { content: "\f101"; } -.icon-bars:before { content: "\f102"; } -.icon-bolt:before { content: "\f103"; } -.icon-box:before { content: "\f104"; } -.icon-briefcase:before { content: "\f105"; } -.icon-check:before { content: "\f106"; } -.icon-chevron-down:before { content: "\f107"; } -.icon-chevron-left:before { content: "\f108"; } -.icon-chevron-right:before { content: "\f109"; } -.icon-chevron-up:before { content: "\f10a"; } -.icon-cloud-upload-alt:before { content: "\f10b"; } -.icon-code-branch:before { content: "\f10c"; } -.icon-code-commit:before { content: "\f10d"; } -.icon-cog:before { content: "\f10e"; } -.icon-exclamation-circle:before { content: "\f10f"; } -.icon-exclamation-triangle:before { content: "\f110"; } -.icon-file-alt:before { content: "\f111"; } -.icon-file-code:before { content: "\f112"; } -.icon-file-image:before { content: "\f113"; } -.icon-file:before { content: "\f114"; } -.icon-fire-alt:before { content: "\f115"; } -.icon-folder:before { content: "\f116"; } -.icon-lock:before { content: "\f117"; } -.icon-plug:before { content: "\f118"; } -.icon-sliders-h:before { content: "\f119"; } -.icon-snowflake:before { content: "\f11a"; } -.icon-star:before { content: "\f11b"; } +.icon-abapgit:before { content: "\f101"; } +.icon-abaplint:before { content: "\f102"; } +.icon-arrow-circle-up:before { content: "\f103"; } +.icon-bars:before { content: "\f104"; } +.icon-bolt:before { content: "\f105"; } +.icon-box:before { content: "\f106"; } +.icon-briefcase:before { content: "\f107"; } +.icon-check:before { content: "\f108"; } +.icon-chevron-down:before { content: "\f109"; } +.icon-chevron-left:before { content: "\f10a"; } +.icon-chevron-right:before { content: "\f10b"; } +.icon-chevron-up:before { content: "\f10c"; } +.icon-cloud-upload-alt:before { content: "\f10d"; } +.icon-code-branch:before { content: "\f10e"; } +.icon-code-commit:before { content: "\f10f"; } +.icon-cog:before { content: "\f110"; } +.icon-exclamation-circle:before { content: "\f111"; } +.icon-exclamation-triangle:before { content: "\f112"; } +.icon-file-alt:before { content: "\f113"; } +.icon-file-code:before { content: "\f114"; } +.icon-file-image:before { content: "\f115"; } +.icon-file:before { content: "\f116"; } +.icon-fire-alt:before { content: "\f117"; } +.icon-folder:before { content: "\f118"; } +.icon-git-alt:before { content: "\f119"; } +.icon-lock:before { content: "\f11a"; } +.icon-plug:before { content: "\f11b"; } +.icon-question-circle-solid:before { content: "\f11c"; } +.icon-sliders-h:before { content: "\f11d"; } +.icon-snowflake:before { content: "\f11e"; } +.icon-star:before { content: "\f11f"; } +.icon-tools-solid:before { content: "\f120"; } diff --git a/src/ui/zabapgit_icon_font_css.w3mi.xml b/src/ui/zabapgit_icon_font_css.w3mi.xml index f8b4a21d5..217708e8c 100644 --- a/src/ui/zabapgit_icon_font_css.w3mi.xml +++ b/src/ui/zabapgit_icon_font_css.w3mi.xml @@ -21,7 +21,7 @@ MI ZABAPGIT_ICON_FONT_CSS mimetype - text/plain + text/css diff --git a/src/ui/zcl_abapgit_gui_page.clas.abap b/src/ui/zcl_abapgit_gui_page.clas.abap index d0e9087f9..495d390c8 100644 --- a/src/ui/zcl_abapgit_gui_page.clas.abap +++ b/src/ui/zcl_abapgit_gui_page.clas.abap @@ -83,7 +83,7 @@ ENDCLASS. -CLASS zcl_abapgit_gui_page IMPLEMENTATION. +CLASS ZCL_ABAPGIT_GUI_PAGE IMPLEMENTATION. METHOD constructor. @@ -98,19 +98,23 @@ CLASS zcl_abapgit_gui_page IMPLEMENTATION. CREATE OBJECT ri_html TYPE zcl_abapgit_html. - ri_html->add( '' ). ENDMETHOD. @@ -253,21 +257,22 @@ CLASS zcl_abapgit_gui_page IMPLEMENTATION. CREATE OBJECT ri_html TYPE zcl_abapgit_html. - ri_html->add( '' ). "#EC NOTEXT + ri_html->add( '' ). ENDMETHOD. diff --git a/src/ui/zcl_abapgit_ui_factory.clas.abap b/src/ui/zcl_abapgit_ui_factory.clas.abap index 84cebdba0..f2c26233c 100644 --- a/src/ui/zcl_abapgit_ui_factory.clas.abap +++ b/src/ui/zcl_abapgit_ui_factory.clas.abap @@ -191,89 +191,5 @@ CLASS ZCL_ABAPGIT_UI_FACTORY IMPLEMENTATION. iv_mime_name = 'ZABAPGIT_ICON_FONT' iv_base64 = lo_buf->join_and_flush( ) ). - " see https://github.com/larshp/abapGit/issues/201 for source SVG - ro_asset_man->register_asset( - iv_url = 'img/logo' - iv_type = 'image/png' - iv_base64 = - 'iVBORw0KGgoAAAANSUhEUgAAAKMAAAAoCAYAAACSG0qbAAAABHNCSVQICAgIfAhkiAAA' - && 'AAlwSFlzAAAEJQAABCUBprHeCQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9y' - && 'Z5vuPBoAAA8VSURBVHic7Zx7cJzVeYef31nJAtvYko1JjM3FYHlXimwZkLWyLEMcwIGQ' - && 'cEkDJWmTltLStGkoDCkzwBAuCemUlksDNCkhJTTTljJpZhIuBQxxAWPvyuYiW7UkG8Il' - && 'UByIsS1sLEu75+0fu5JXu9/etAJz0TOzM/rOec85765+37m+3yczY8w0NU3qrwv9npfa' - && 'Hfx02pPPd469sgk+7misYnyjpWXy5IOG7kd8ZjjNjEtr13TdOm7eTfCxwo2lUJAQASRu' - && '2dnRfMn4uDbBx42yxZhPiMNMCHKCsVK2GGuqqqoQUwrZTAhygrFQshjfaGmZ/M7yxQtm' - && 'xGL9/qDqzwLxQvYTgpygXEoS4/DQ7LE1O05atLBu1YZdE4KcYLwpupoOmCO+5Z2dXPfE' - && 'xk07Tm2ZroGhBwX1wAygKqiOiVX2Rw9Jam/gyH0wuGGzvTEudRYSY4HFyogghxN2n7Sw' - && 'IendvcCioLoOtCCXNeqohOf0oDwPq9f3Wt/77dOHlWhYzUj/BRybTnrGEnZO5wv2m0rq' - && 'DezJoOiqeZbzegzpk6TVPPWJTT39y5svMogF1ZcesjlQgkwYp4F+EJQXwv4E+MiLUZJa' - && 'F7AIcRq4hWZ2mMRhQD/oZcErXv7FScaja3rt/wpU9E/sFyLACQq57wB/XIl/gWIstn2T' - && 'xpHVre7ZW71p8sFDeQscSEHKu3pTBadNH2Lq61VT57iwNazLgaNSqYaUaWXLDZCJIbBo' - && 'g3tK2A2xHns0oMrm3CRrqdTPnAVMiUIEmLlz2XGLMxNmH7YrifFcoUIHalHj8f8p6UfA' - && 'O+932weStno1zghps6Q7GBFiUYRxopkeaZ2vIwLyfxtQ4vV8lbWHNScacf+T/vwqn90o' - && 'MZYhRADJ+bv725vmj6Q8tHWffPKUD6IgO/tsfawneRHYd97Pdg8kSyJaZiGtBY4pYPYO' - && 'kH84C0Cyv8tKSiK7OZ99EpYAJ2V8AhkRY5lCHGaxhaq+BLCzY/EXd5y0aOG0td1vf1AF' - && 'CWCw7/1u80DQEtahQvcB03MyjQfM7Hwnmxfv9dPivX5SssqOwuzPSqk71mN3ymw5ZtdK' - && 'dmVIdly8xx7JZ29yy0qptwrGLMRRCA6T1w93nLTo5Lq13Zv625tOMRd6DLF4v0lWmQO8' - && 'qPko45y7TWaHZyUnwa6M99mN2fYbuu1V4K5oxF1B4Z4UgFifrQHWFLNbvkh1QheV5DNN' - && 'TZMqFWIGs5zX48M95PTqGa3TZ4erzbvj8/WUErf0L2++uNyGJLn2Js1oDeuYlkbNbmlR' - && 'deXup2hq0qS2es2VlHMDFaOlRdXL5uuwlnodG23QTEljCkbJV3d7WHOK+dXWqHqZnZeb' - && 'Y1fGe3OFOArRU5GTGbSHNWdwUL8Epo1qIQ9V/bXu3HES4jCznNfjb7e1zZ8Ri/UD1MLz' - && 'u05s/huMx4IKGNy4+8Tj/2Pqk8++Vaji86TQqxEuNNM5rWGtSCaokSDkgd0QjbidoPvN' - && '+5s7t9jz5TgdbdBMvLsG2cop6FgLUdUaZk804jYKuyrWa6vzlT2+XrOqQnxd6KwQOj5R' - && 'hULpL9Yaxkcj7g3QT6zK397ZbdtGtbtAZ+B0U3adkt0c67E7OyI6fFDuSpktC6HGpJjU' - && 'GmZ3NOI2mdnVnX32eHZZ7903hGXfBG8mp3J7sd/B0DPCTgUmBf9O7lmMybk56or3Jn8f' - && 'oLVB7Q5dZ9Iy4OBsw2jYbUUk96fwQrzHf955iBZzsDA+aL9k1owZ20fNzaY/tfFXwK48' - && 'ldQkSZ5YqJXmZk15JaJfmOmfgdOAmgCzWrCvyum5aIO+Uor3AIbOx7QV2TeBMPu3vKYA' - && 'Sw091hbWt4PKRhu0oDqkmND1wAnk3vkOmAN2lRLa2hrWMVm5Tek2R3286YzWiK4eQltk' - && '9g1gMfsFMhVYKunR1obQddk+SXZqwLe8acMGe7fYb9HZk7wm3utrBmpsqiXsyClHMHK6' - && '0hLWoRjHBfmLbP9K3bPYjFPIFWLaQeZnlZ8H4JyFflrMwcK4wG63v3/ycZnXOzqalxE0' - && 'mU7x9rvvVv93oVZqBtzNGGeU7Jbp9pZGzS7ReiVQVyDfmXRda4PaA9p5mBLmWGmmSron' - && 'M0FytUGGgjPTAi8UIeVk9u1og5YOJ0QbNBOjIac+Y22JPgLQ1WV7Ol+w36xebYnhtGpj' - && 'FjBYTj3l4KY9/dx6My4d74pN/Ki/Y9HpSG5HR/Nyh/1DHtO9OM6dvWFDwbtWslOykt6U' - && 's5VWZbOFnQtsyMqvc56Ty3T7NeBhLGAfDZDpe5nX6V5uXpbZ43K2NGQ2V9glwLas/I62' - && 'hfrE8EWsJ3mFsGYs+OQqze+A1cBLgbmma4f/9AmOJGBe5vKVLYN1W6wnOWSHmdkVhexM' - && 'PG6yC0x2AbmjoQ3njdh4uwrSw1Htmq5bd3Y0I3FLpQ5n0GTSQ7s6Fva70RPYTPbi+Pz0' - && 'J7ryboRC+m5PnRfsJjVEAfp5bLNflTb52dKIBj36RWY5ZyX2WCLukvbX67ZYHFLHZtGw' - && '+1fD/jDL8qQljWpav9m6Uw3wKYzXgUNJTxsk+0Fssw0L6x+j4dCx6eF/BEtwDBkbx7Fe' - && '29gWCa0yrC2rvXXO26WZfrWG3V2kji8zWbm0QUev67GX5ZgZ8A0H121hXIIZNrxou9oW' - && '6m4b4m/z2aTP+fsAohF3PaNHROvssZ8ElRs5DnyPBAkovxDFF4oJESDeY9tJD4Ur5umg' - && 'PSFm1Uy23Zk2SaM7e43p5Y4uxUMzu2f4H56+tuZmff2gfTqHrGEy5DkW6Abo7LH7gfsB' - && '2uo1LQGzBmoYFSwg57vNcjqqo4F1JXh2S7Zfx83TZZNqdD6MXkQkU369jONgcmfxe83M' - && 'B7XQEdEhg1B0HzDk2ZHpy3vBqLPpMQhyi/f2AIA3WyPZG6KkeVpKiE925awEi7H6JRsA' - && 'cqJDfIi9oayfW8ZB5dY/TFeX7YlGQg+RmgJkcnSQfWyr9QP92enmGcgeNCvx67mXbGdb' - && 'xD1hjI5AklJ+ydgTUGz6iiZNXd09+gYGGIRlQgXn6wDesZYSRFsJOYES5QjSw7fqnu7q' - && 'Bqh7uqu7f3nzdw3uKFJszEIcpqVRs12SRuAYiTrJ1YXMzSGgS6iQnHmWyQWe70pySz/F' - && 'MZagMWnMlaiTuTqTTih7s7IIHm1T1ncVI37l3BAAA4McAYF7iAvG17uxExi1U6Igd9XN' - && 'Dj+UmZA8qPrf3MDQbeSPIN8Ldub0JzeWLcT2I3Swn8JFhr4VQnMze5uKnv0ugOHfUXa3' - && 'ZhySedkR0eGDuMtbw/rTZCI1pA9PF0yWf4e3MnJ7YKXm0pOr6H03QRIIZeYnUj1njhid' - && '8aaRscKX/VGWSRLsCjnK2rcdC3njGUsQ5PSdv92yqJaMk5WBoRMpJsSnNgZufBdCkmsN' - && '60FgRbllK8PNzOlttT/qpz2sOUnpeWGHvq9ewcyc28/7XQCru213NOL+l6wgZ0kXAjnD' - && 'cazP7gXuTdu41rCyxbgr3mt/P16+F6LgUVXtmq5bC237yNsNu5YtPBZgx4kLFznZ1XlM' - && 'BzB/1liECBAN801yhfiq0HflbKXz1ojZ4qCylSBsbm6q/93wX0n0Q1Ir6UzWYXaZyZaF' - && 'qqxeZn813n4ZlhPWJWXMo00P5OTDF5c0qmm8fRlPip6bFhHk6Ti3ddfy5i3OXBemJQE2' - && 'A5g/c/qaTasC8krC0KdzE+3qWG/y6thmW7Vui/UkQ7w51vqDaGnRZFInPdlshNQ2C8oJ' - && 'h0oqaefF++zmzh5bu7bbXrBxjp88bp5qgZzNdyfWD/9t+B+TO4GW8/p+R0SHcGBxLWEF' - && 'jiQlHeIXEaRIPZAVRMVCTDcQCUh8LfOyaqjgCcr+YpY7NRFa2VY/egsqtNtdw8ie5gjJ' - && 'oUTqicjofOYA2f/YgcR03s5MMBF4wlIa7rMr5mnUyru6xl0LZAeFvDG3l83DF5199muk' - && 'oJO1FUMoviSi8Nh9Kg+Ru7qvUvCqPO+cMZsxbPsM4HXW9KcrEyKApTa7s9BVSyLaF3Ik' - && 'SbLSQros18RyInkkV2u5q+6zLaS+aCT0oJl/QVI78IWcsvDos1vtLYCE551QKNuCKW63' - && '+157g36cMOYI9yWhC3K+j4KDEHKxC9+t0altDaFHwL/kvVZIBJw761/uM5/MTJlU7S/Z' - && 'N6hTBNlhZA0OPReNuGdM6nL4jR4G5ZnRusAtKmVHwg1Slcxe11nODZJKh1fJ6kwM3dQa' - && 'VgOw3omjkGuL9/o/L/vFTzs7mi8pQZBpIT4f9PxE2bRFQncY9pdjKDoExDH7ebzPbgFo' - && 'bQjdng48KBfvzZau77ORN61FI66PsW2N7ARiZnZTZ589BtAWCV1v5J1zF+JNVdui2CbL' - && 'OcJsq1ejD2lVgCDL4e14r58J0N6k+cmEu0HYIssdrbxgnaGeeG9yJEg32hC6GbOix81y' - && 'trTsWLtiixpgQNLZ4yVEgCT++xSP0H7C0N1ZadVAh6SR3kRm2WfJO0H/XqTuQcn+IlOI' - && 'AFjRVaZhus3g2az0WuA0wcIi5QP3DDNIIPtakBABYltts7AO4OEi9eTFYGCksSRzwM4L' - && 'ECKAM1gG9tVR5UP+RkqZN5s7a0yBnwUEOSDp7GlPPp83BH0srO+1PmQrDIIen9wOdnln' - && 'n31G5n9ZtDLL6ck2x3uTf6DUee8rASX6vNnyWI/dmZ0R77O7LNXLBkWy9CE7Pd6XvNih' - && 'QkEQeZHZl9PBFtsDstebtyWFwv0B4r32UrzXn+6xDtBdwIslNL0N+JnMvravxiraFO/s' - && 'tm0y+xzQlcfkddCNCe/vGfP7GQH6lzdfbHAjqSCBHZK+PN5CzESSlixgnhMLzXAeXp+3' - && 'hWfuM0sWL10abQv1CdtHixzvmtiYPhcvSFOTJk1NEPEQkWdPUry4oc96y2o3YJiWs5Wx' - && 'zbYq83THHHu9Y1N2kG45tDRqdsgzxxuznKPOGbsTsN2M7d6zfXhePJ5Ici1h6mUcAcw0' - && '8Zo5fp35NoqKxAjwTrRhZmLSpPY9ySmPzV27dm+lTn9cKSTGA+XT+03Jq+l8HBLv2Q7c' - && 'X9K+ygQTFGDcHhaaoGJyouDNV7JH+eGj4mF6gspoC+tzJt1ObsT4MDsF2zxs886+Ml5v' - && '/PogUvEwPUGFiE+SX4gAtQa1gkhV7onQR4oJMR5oxC6stDeghd7Dh6E+CPw/HL4vVO2f' - && 'cpUAAAAASUVORK5CYII=' ). ENDMETHOD. ENDCLASS.