diff --git a/css/area_togglelink.less b/css/area_togglelink.less index a8ce7c6..0607a03 100755 --- a/css/area_togglelink.less +++ b/css/area_togglelink.less @@ -8,30 +8,50 @@ .togglelink { &.page_main-content { position: absolute; - top: 0px; + top: 0; bottom: -1px; width: 2rem; left: -(@margin-default); z-index: 1; - @media @screen_max-md{ + + @media @screen_max-md { display: none; } a { + .fontello-double(); + .icon-right-bold(); + .icon-left-bold(); + .display-flex(); .flex-direction(); .justify-content(); - width: (@margin-default); + width: @margin-default; height: 100%; background-color: @button_background; border: solid 1px @button_background; border-radius: @fix_border-radius 0 0 @fix_border-radius; color: @button_color; text-decoration: none; - text-align: center; transition: @transition color, @transition background-color, @transition border-color; + &::before, + &::after { + width: 100%; + opacity: .6; + font-size: 1rem; + line-height: 1; + text-align: center; + margin: 0; + transition: @transition opacity; + } + + &::before { + opacity: 1; + font-size: 1.25rem; + } + &:hover, &:focus, &:active { @@ -44,10 +64,13 @@ color: inherit; text-decoration: none; } + + &::after { + opacity: 0; + } } } - /* + + + toggle out + + + */ .wide-content & { left: -1px; @@ -57,17 +80,34 @@ border-color: @button_background; border-radius: 0 @fix_border-radius @fix_border-radius 0; + &::before { + opacity: .6; + font-size: 1rem; + } + + &::after { + opacity: 1; + font-size: 1.25rem; + } + &:hover, &:focus, &:active { background-color: @button_color; + + &::before { + opacity: 0; + } + + &::after { + opacity: 1; + } } } } } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* min-width: 1440px */ @@ -77,7 +117,6 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1199px */ diff --git a/css/base_fontello-icons.less b/css/base_fontello-icons.less index 4441b8b..e9e0a50 100644 --- a/css/base_fontello-icons.less +++ b/css/base_fontello-icons.less @@ -18,7 +18,80 @@ * If in the Fontello-Packet an icon is added, the code should be supplemented here: */ -/* additional "after" for nav-pagetools */ +.icon-emo-happy { &::before { content: '\e804'; } } /* '' */ +.icon-emo-wink { &::before { content: '\e805'; } } /* '' */ +.icon-emo-unhappy { &::before { content: '\e806'; } } /* '' */ +.icon-emo-sleep { &::before { content: '\e807'; } } /* '' */ +.icon-emo-thumbsup { &::before { content: '\e808'; } } /* '' */ +.icon-emo-grin { &::before { content: '\e80c'; } } /* '' */ +.icon-emo-angry { &::before { content: '\e80d'; } } /* '' */ +.icon-emo-cry { &::before { content: '\e80f'; } } /* '' */ +.icon-emo-squint { &::before { content: '\e811'; } } /* '' */ +.icon-emo-laugh { &::before { content: '\e812'; } } /* '' */ +.icon-emo-wink2 { &::before { content: '\e813'; } } /* '' */ + +.icon-up { &::before { content: '\e853'; } } /* '' */ +.icon-up-small { &::before { content: '\e82f'; } } /* '' */ +.icon-up-thick { &::before { content: '\e831'; } } /* '' */ +.icon-up-open-big { &::before { content: '\e848'; } } /* '' */ + +.icon-down { &::before { content: '\e859'; } } /* '' */ +.icon-down-small { &::before { content: '\e834'; } } /* '' */ +.icon-down-thick { &::before { content: '\e835'; } } /* '' */ +.icon-down-bold { &::before { content: '\e883'; } } /* '' */ + +.icon-right-small { &::before { content: '\e82d'; } } /* '' */ +.icon-right-thick { &::before { content: '\e82e'; } } /* '' */ + +.icon-left-small { &::before { content: '\e836'; } } /* '' */ +.icon-left-thick { &::before { content: '\e82c'; } } /* '' */ +.icon-left-bold { &::before { content: '\e837'; } } /* '' */ + +.icon-smile { &::before { content: '\e85e'; } } /* '' */ +.icon-frown { &::before { content: '\e84b'; } } /* '' */ +.icon-meh { &::before { content: '\e85f'; } } /* '' */ + +.icon-help { &::before { content: '\e83c'; } } /* '' */ +.icon-menu { &::before { content: '\e854'; } } /* '' */ +.icon-home { &::before { content: '\e842'; } } /* '' */ +.icon-search { &::before { content: '\e855'; } } /* '' */ +.icon-user { &::before { content: '\e833'; } } /* '' */ +.icon-user-circle { &::before { content: '\e86c'; } } /* '' */ +.icon-login { &::before { content: '\e845'; } } /* '' */ +.icon-logout { &::before { content: '\e847'; } } /* '' */ + +.icon-dividers { &::before { content: '\e801'; } } /* '' */ +.icon-cog { &::before { content: '\e84e'; } } /* '' */ +.icon-cog-alt { &::before { content: '\e818'; } } /* '' */ +.icon-attachment { &::before { content: '\e832'; } } /* '' */ +.icon-revert-replay { &::before { content: '\e839'; } } /* '' */ +.icon-bell { &::before { content: '\e83a'; } } /* '' */ +.icon-bookmark-empty { &::before { content: '\e83b'; } } /* '' */ +.icon-check { &::before { content: '\e841'; } } /* '' */ +.icon-checkbox-marked { &::before { content: '\e844'; } } /* '' */ +.icon-down-open-big { &::before { content: '\e846'; } } /* '' */ +.icon-star { &::before { content: '\e860'; } } /* '' */ +.icon-star-outline { &::before { content: '\e84c'; } } /* '' */ +.icon-sitemap { &::before { content: '\e84d'; } } /* '' */ +.icon-puzzle { &::before { content: '\e84f'; } } /* '' */ +.icon-plus { &::before { content: '\e850'; } } /* '' */ +.icon-minus { &::before { content: '\e852'; } } /* '' */ +.icon-pencil-1 { &::before { content: '\e851'; } } /* '' */ +.icon-clipboard { &::before { content: '\e857'; } } /* '' */ +.icon-clipboard-empty { &::before { content: '\e856'; } } /* '' */ +.icon-clock { &::before { content: '\e858'; } } /* '' */ +.icon-cloud { &::before { content: '\e85a'; } } /* '' */ +.icon-mail { &::before { content: '\e85d'; } } /* '' */ + +.icon-folder-image { &::before { content: '\e809'; } } /* '' */ +.icon-file-new { &::before { content: '\e83d'; } } /* '' */ +.icon-file { &::before { content: '\e83e'; } } /* '' */ +.icon-file-export:before { content: '\e80a'; } /* '' */ +.icon-files { &::before { content: '\e849'; } } /* '' */ + + +/* + + + + + additional "after" for nav-pagetools + + + + + */ + .icon-pencil { &::before, &::after { content: '\e840'; } @@ -67,65 +140,7 @@ &::before, &::after { content: '\e861'; } } - - -.icon-dividers { &::before { content: '\e801'; } } /* '' */ -.icon-emo-happy { &::before { content: '\e804'; } } /* '' */ -.icon-emo-wink { &::before { content: '\e805'; } } /* '' */ -.icon-emo-unhappy { &::before { content: '\e806'; } } /* '' */ -.icon-emo-sleep { &::before { content: '\e807'; } } /* '' */ -.icon-emo-thumbsup { &::before { content: '\e808'; } } /* '' */ -.icon-folder-image { &::before { content: '\e809'; } } /* '' */ -.icon-emo-grin { &::before { content: '\e80c'; } } /* '' */ -.icon-emo-angry { &::before { content: '\e80d'; } } /* '' */ -.icon-emo-cry { &::before { content: '\e80f'; } } /* '' */ -.icon-emo-squint { &::before { content: '\e811'; } } /* '' */ -.icon-emo-laugh { &::before { content: '\e812'; } } /* '' */ -.icon-emo-wink2 { &::before { content: '\e813'; } } /* '' */ -.icon-cog-alt { &::before { content: '\e818'; } } /* '' */ -.icon-left-thick { &::before { content: '\e82c'; } } /* '' */ -.icon-right-small { &::before { content: '\e82d'; } } /* '' */ -.icon-right-thick { &::before { content: '\e82e'; } } /* '' */ -.icon-up-small { &::before { content: '\e82f'; } } /* '' */ -.icon-up-thick { &::before { content: '\e831'; } } /* '' */ -.icon-attachment { &::before { content: '\e832'; } } /* '' */ -.icon-user { &::before { content: '\e833'; } } /* '' */ -.icon-down-small { &::before { content: '\e834'; } } /* '' */ -.icon-down-thick { &::before { content: '\e835'; } } /* '' */ -.icon-left-small { &::before { content: '\e836'; } } /* '' */ -.icon-left-bold { &::before { content: '\e837'; } } /* '' */ -.icon-revert-replay { &::before { content: '\e839'; } } /* '' */ -.icon-bell { &::before { content: '\e83a'; } } /* '' */ -.icon-bookmark-empty { &::before { content: '\e83b'; } } /* '' */ -.icon-help { &::before { content: '\e83c'; } } /* '' */ -.icon-file-new { &::before { content: '\e83d'; } } /* '' */ -.icon-file { &::before { content: '\e83e'; } } /* '' */ -.icon-check { &::before { content: '\e841'; } } /* '' */ -.icon-home { &::before { content: '\e842'; } } /* '' */ -.icon-checkbox-marked { &::before { content: '\e844'; } } /* '' */ -.icon-login { &::before { content: '\e845'; } } /* '' */ -.icon-down-open-big { &::before { content: '\e846'; } } /* '' */ -.icon-logout { &::before { content: '\e847'; } } /* '' */ -.icon-up-open-big { &::before { content: '\e848'; } } /* '' */ -.icon-files { &::before { content: '\e849'; } } /* '' */ -.icon-frown { &::before { content: '\e84b'; } } /* '' */ -.icon-star-outline { &::before { content: '\e84c'; } } /* '' */ -.icon-sitemap { &::before { content: '\e84d'; } } /* '' */ -.icon-cog { &::before { content: '\e84e'; } } /* '' */ -.icon-puzzle { &::before { content: '\e84f'; } } /* '' */ -.icon-plus { &::before { content: '\e850'; } } /* '' */ -.icon-pencil-1 { &::before { content: '\e851'; } } /* '' */ -.icon-minus { &::before { content: '\e852'; } } /* '' */ -.icon-up { &::before { content: '\e853'; } } /* '' */ -.icon-menu { &::before { content: '\e854'; } } /* '' */ -.icon-search { &::before { content: '\e855'; } } /* '' */ -.icon-clipboard-empty { &::before { content: '\e856'; } } /* '' */ -.icon-clipboard { &::before { content: '\e857'; } } /* '' */ -.icon-clock { &::before { content: '\e858'; } } /* '' */ -.icon-down { &::before { content: '\e859'; } } /* '' */ -.icon-cloud { &::before { content: '\e85a'; } } /* '' */ -.icon-mail { &::before { content: '\e85d'; } } /* '' */ -.icon-smile { &::before { content: '\e85e'; } } /* '' */ -.icon-meh { &::before { content: '\e85f'; } } /* '' */ -.icon-star { &::before { content: '\e860'; } } /* '' */ -.icon-user-circle { &::before { content: '\e86c'; } } /* '' */ +.icon-right-bold { + &::before, + &::after { content: '\e882'; } +} diff --git a/fonts/icons/config.json b/fonts/icons/config.json index f95c68d..3e018be 100755 --- a/fonts/icons/config.json +++ b/fonts/icons/config.json @@ -212,6 +212,20 @@ "arrow-left-bold" ] }, + { + "uid": "be1984df02c15bc51c0c83bf51f3bab6", + "css": "right-bold", + "code": 59522, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M166.7 625V375H500V173.3L826.7 500 500 826.7V625H166.7Z", + "width": 1000 + }, + "search": [ + "right-bold" + ] + }, { "uid": "c58db1d3ca8a7d95ab530541c4aff47b", "css": "up-bold", @@ -226,6 +240,20 @@ "arrow-up-bold" ] }, + { + "uid": "d03bf8f62747a186370204a5053cddc9", + "css": "down-bold", + "code": 59523, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M375 166.7H625V500H826.7L500 826.7 173.3 500H375V166.7Z", + "width": 1000 + }, + "search": [ + "down-bold" + ] + }, { "uid": "8ed00db9d20a2d7ff1c7eed96813b6cf", "css": "up-open-big", @@ -282,6 +310,20 @@ "menu-down" ] }, + { + "uid": "e7226f2ac8200dea21fd7d6fffa1778c", + "css": "user-circle", + "code": 59500, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M500 800C395.8 800 303.8 746.7 250 666.7 251.3 583.3 416.7 537.5 500 537.5 583.3 537.5 748.7 583.3 750 666.7 696.3 746.7 604.2 800 500 800M500 208.3A125 125 0 0 1 625 333.3 125 125 0 0 1 500 458.3 125 125 0 0 1 375 333.3 125 125 0 0 1 500 208.3M500 83.3A416.7 416.7 0 0 0 83.3 500 416.7 416.7 0 0 0 500 916.7 416.7 416.7 0 0 0 916.7 500C916.7 269.6 729.2 83.3 500 83.3Z", + "width": 1000 + }, + "search": [ + "account-circle" + ] + }, { "uid": "e9cf37693b41c528d5b115a05daf598f", "css": "user", @@ -386,6 +428,20 @@ "code": 59416, "src": "fontawesome" }, + { + "uid": "3b1ed5290f0ac657d3a08e12df23ca97", + "css": "folder-image", + "code": 59401, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M208.3 708.3L395.8 458.3 541.7 645.8 645.8 520.8 791.7 708.3M833.3 250H500L416.7 166.7H166.7A83.3 83.3 0 0 0 83.3 250V750A83.3 83.3 0 0 0 166.7 833.3H833.3A83.3 83.3 0 0 0 916.7 750V333.3A83.3 83.3 0 0 0 833.3 250Z", + "width": 1000 + }, + "search": [ + "folder" + ] + }, { "uid": "c24c3a39a7cfc385fcdbfb6e550a6333", "css": "clipboard-empty", @@ -416,7 +472,7 @@ }, { "uid": "108d2cf571cfb17440c1691dc597609a", - "css": "doc", + "css": "file", "code": 59454, "src": "custom_icons", "selected": true, @@ -430,7 +486,7 @@ }, { "uid": "2fffd3933d8cc5e0ed4c292f3631ed0b", - "css": "docs", + "css": "files", "code": 59465, "src": "custom_icons", "selected": true, @@ -444,7 +500,7 @@ }, { "uid": "7b357343fb97c221a7c3f5a27b7b800c", - "css": "doc-new", + "css": "file-new", "code": 59453, "src": "custom_icons", "selected": true, @@ -472,7 +528,7 @@ }, { "uid": "3dbc74b737ad75b2dea6346133003e37", - "css": "doc-text", + "css": "file-text", "code": 59466, "src": "custom_icons", "selected": true, @@ -484,6 +540,34 @@ "file-document" ] }, + { + "uid": "6ba0f5403cd0e8e95462198d1c2f2203", + "css": "file-xml", + "code": 59394, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M541.7 375H770.8L541.7 145.8V375M250 83.3H583.3L833.3 333.3V833.3A83.3 83.3 0 0 1 750 916.7H250A83.3 83.3 0 0 1 166.7 833.3V166.7C166.7 120.4 203.7 83.3 250 83.3M255 645.8L410.8 801.7 470 742.9 372.9 645.8 470 548.8 410.8 490 255 645.8M720 645.8L564.2 490 505 548.8 602.1 645.8 505 742.9 564.2 801.7 720 645.8Z", + "width": 1000 + }, + "search": [ + "file-xml" + ] + }, + { + "uid": "bb5181b39a408e334b9213d6051250c3", + "css": "file-export", + "code": 59402, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M250 83.3C203.7 83.3 166.7 120.8 166.7 166.7V833.3A83.3 83.3 0 0 0 250 916.7H750A83.3 83.3 0 0 0 833.3 833.3V333.3L583.3 83.3M541.7 145.8L770.8 375H541.7M372.1 509.2H666.7V803.7L578.3 715.4 460.4 833.3 342.5 715.4 460.4 597.9", + "width": 1000 + }, + "search": [ + "file-export" + ] + }, { "uid": "2c9c17d58273a5617b1bbdc0602c6bb4", "css": "link", @@ -512,20 +596,6 @@ "attachment" ] }, - { - "uid": "90cfe91091dbeb0257184badce6dd31d", - "css": "undo-variant", - "code": 59449, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M562.5 291.7A270.8 270.8 0 0 1 833.3 562.5 270.8 270.8 0 0 1 562.5 833.3H416.7V750H562.5C666.7 750 750 666.7 750 562.5 750 458.3 666.7 375 562.5 375H326.3L454.6 503.7 395.8 562.5 166.7 333.3 395.8 104.2 455 162.9 326.3 291.7H562.5M250 750H333.3V833.3H250V750Z", - "width": 1000 - }, - "search": [ - "undo-variant" - ] - }, { "uid": "256d512a42d54f808cc5afffb7adca21", "css": "pencil", @@ -554,6 +624,20 @@ "pencil" ] }, + { + "uid": "affa5bca15baedc7e4d51e239d058525", + "css": "pencil-add", + "code": 59392, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M546.6 671.6H671.6V546.6H754.9V671.6H879.9V754.9H754.9V879.9H671.6V754.9H546.6ZM862.9 293.3C879.2 277.1 879.2 250 862.9 234.6L765.4 137.1C750 120.8 722.9 120.8 706.7 137.1L630 213.3 786.3 369.6M125 718.8V875H281.3L742.1 413.7 585.8 257.5Z", + "width": 1000 + }, + "search": [ + "pencil" + ] + }, { "uid": "869010a7f405f1c4c4f8e1d610d66aed", "css": "book-open", @@ -833,6 +917,48 @@ "search": [ "check" ] + }, + { + "uid": "d4eb253b87393661a6bb0d84edf343d5", + "css": "dividers", + "code": 59393, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M458.3 83.3H541.7V166.7H562.5A62.5 62.5 0 0 1 625 229.2V375L606.7 393.3 675 511.7C721.2 466.2 750 403.3 750 333.3H833.3C833.3 434.2 788.8 524.6 717.9 585.8L848.8 812.5 854.2 905 776.2 854.2 648.3 632.1C604.2 654.2 553.3 666.7 500 666.7 446.7 666.7 395.8 654.2 351.7 632.1L223.8 854.2 145.8 905 151.3 812.5 393.3 393.3 375 375V229.2A62.5 62.5 0 0 1 437.5 166.7H458.3V83.3M393.3 559.6C425.8 575 462.1 583.3 500 583.3 537.9 583.3 574.2 575 606.7 559.6L545.8 454.2H545.4C519.6 479.2 480.4 479.2 454.6 454.2H454.2L393.3 559.6M500 250A41.7 41.7 0 0 0 458.3 291.7 41.7 41.7 0 0 0 500 333.3 41.7 41.7 0 0 0 541.7 291.7 41.7 41.7 0 0 0 500 250Z", + "width": 1000 + }, + "search": [ + "dividers" + ] + }, + { + "uid": "539de8f1b724882316384084be16d523", + "css": "revert-replay", + "code": 59449, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M500 208.3V41.7L291.7 250 500 458.3V291.7A250 250 0 0 1 750 541.7 250 250 0 0 1 500 791.7 250 250 0 0 1 250 541.7H166.7A333.3 333.3 0 0 0 500 875 333.3 333.3 0 0 0 833.3 541.7 333.3 333.3 0 0 0 500 208.3Z", + "width": 1000 + }, + "search": [ + "revert" + ] + }, + { + "uid": "9fa299e43ac2df88490666723151a4f9", + "css": "revisions-history", + "code": 59395, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M458.3 291.7V504.6L654.6 620.8 687.5 567.5 520.8 468.8V291.7M520.8 83.3C373.8 83.3 246.3 163.3 177.9 282.1L83.3 187.5V458.3H354.2L239.6 343.8C290 238.8 395.8 166.7 520.8 166.7A312.5 312.5 0 0 1 833.3 479.2 312.5 312.5 0 0 1 520.8 791.7C384.6 791.7 269.6 704.6 226.7 583.3H139.2C185 751.3 337.9 875 520.8 875 739.2 875 916.7 697.9 916.7 479.2A395.8 395.8 0 0 0 520.8 83.3Z", + "width": 1000 + }, + "search": [ + "history" + ] } ] } \ No newline at end of file diff --git a/fonts/icons/fontello-codes.css b/fonts/icons/fontello-codes.css index 6bd2741..5cc6c54 100644 --- a/fonts/icons/fontello-codes.css +++ b/fonts/icons/fontello-codes.css @@ -9,6 +9,7 @@ .icon-emo-sleep:before { content: '\e807'; } /* '' */ .icon-emo-thumbsup:before { content: '\e808'; } /* '' */ .icon-folder-image:before { content: '\e809'; } /* '' */ +.icon-file-export:before { content: '\e80a'; } /* '' */ .icon-emo-grin:before { content: '\e80c'; } /* '' */ .icon-emo-angry:before { content: '\e80d'; } /* '' */ .icon-emo-cry:before { content: '\e80f'; } /* '' */ @@ -70,4 +71,6 @@ .icon-meh:before { content: '\e85f'; } /* '' */ .icon-star:before { content: '\e860'; } /* '' */ .icon-code:before { content: '\e861'; } /* '' */ -.icon-user-circle:before { content: '\e86c'; } /* '' */ \ No newline at end of file +.icon-user-circle:before { content: '\e86c'; } /* '' */ +.icon-right-bold:before { content: '\e882'; } /* '' */ +.icon-down-bold:before { content: '\e883'; } /* '' */ \ No newline at end of file diff --git a/fonts/icons/fontello.eot b/fonts/icons/fontello.eot index 533fa3c..11e1d8e 100755 Binary files a/fonts/icons/fontello.eot and b/fonts/icons/fontello.eot differ diff --git a/fonts/icons/fontello.svg b/fonts/icons/fontello.svg index 91a70e9..c18d413 100755 --- a/fonts/icons/fontello.svg +++ b/fonts/icons/fontello.svg @@ -26,6 +26,8 @@ + + @@ -149,6 +151,10 @@ + + + + \ No newline at end of file diff --git a/fonts/icons/fontello.ttf b/fonts/icons/fontello.ttf index 1c47e86..4dab382 100755 Binary files a/fonts/icons/fontello.ttf and b/fonts/icons/fontello.ttf differ diff --git a/fonts/icons/fontello.woff b/fonts/icons/fontello.woff index 418d2f7..37915e4 100755 Binary files a/fonts/icons/fontello.woff and b/fonts/icons/fontello.woff differ diff --git a/fonts/icons/fontello.woff2 b/fonts/icons/fontello.woff2 index ddb7cbc..4c21d69 100755 Binary files a/fonts/icons/fontello.woff2 and b/fonts/icons/fontello.woff2 differ diff --git a/fonts/icons/fontello.zip b/fonts/icons/fontello.zip index 8e6207c..af8883b 100644 Binary files a/fonts/icons/fontello.zip and b/fonts/icons/fontello.zip differ diff --git a/main.php b/main.php index 65b4546..f571c09 100755 --- a/main.php +++ b/main.php @@ -241,7 +241,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";