diff --git a/Wiki/Config/Bindings/index.md b/Wiki/Config/Bindings/index.md index 79af66e6..ee41b1e2 100644 --- a/Wiki/Config/Bindings/index.md +++ b/Wiki/Config/Bindings/index.md @@ -4,15 +4,12 @@ type: config weight: 650 description: | This describes how to configure Mouse and Key bindings. - --- +# Bindings + * TOC {:toc} - -Bindings -======== - Bindings are actions/functions that can be triggered by hitting a key (or key combination) or mouse buttons. These bindings can be used to launch programs, run buit in functions (like Maximize or Iconify), diff --git a/Wiki/Config/Colorsets/index.md b/Wiki/Config/Colorsets/index.md index ca54bcbb..0d7aac8b 100644 --- a/Wiki/Config/Colorsets/index.md +++ b/Wiki/Config/Colorsets/index.md @@ -8,13 +8,12 @@ description: | the foreground and background color along with the shade and highlight color (for 3D relief on borders). Colorsets can also use pixmaps and be transparent. - --- +# Colorsets + * TOC {:toc} -# Colorsets - A Colorset is a collection of colors: foreground (fg), background (bg), hilight (hi), and shade (sh). The foreground is the color of the text, background is the color behind the text, and the hilight and shade are used to give a 3D beveled effect around diff --git a/Wiki/Config/Commands/index.md b/Wiki/Config/Commands/index.md index 5575280b..b056616a 100644 --- a/Wiki/Config/Commands/index.md +++ b/Wiki/Config/Commands/index.md @@ -7,12 +7,11 @@ description: | it processes the command to set/change settings, preform actions, and so on. This page is an overview of how Fvwm works and processes commands. --- +# Fvwm Commands * TOC {:toc} -# Fvwm Commands - Fvwm is configured and controlled though an extensive list of commands. These commands control all aspects of Fvwm. diff --git a/Wiki/Config/Decor/index.md b/Wiki/Config/Decor/index.md index 11f1b634..43efa272 100644 --- a/Wiki/Config/Decor/index.md +++ b/Wiki/Config/Decor/index.md @@ -6,13 +6,12 @@ description: | This gives an overview of how to configure window decorations. See /Decor for example decors. - --- +# Window Decor + * TOC {:toc} -# Window Decor - A Window Decor defines how a window looks. There are two different meanings of Window Decor that could get used. diff --git a/Wiki/Config/Functions/FunctionContext/index.md b/Wiki/Config/Functions/FunctionContext/index.md index 974d583d..c86d7687 100644 --- a/Wiki/Config/Functions/FunctionContext/index.md +++ b/Wiki/Config/Functions/FunctionContext/index.md @@ -6,14 +6,11 @@ description: | Functions are usually run in the context of the window in which they were run, but not always. Here are some pointers for ensuring commands are run in the correct context. - --- -* TOC -{:toc} - # Function Context -## Introduction +* TOC +{:toc} Under most circumstances, functions tend to be invoked within a window context. That means the set of commands within the function operate on a window. More diff --git a/Wiki/Config/Fvwm2rc/index.md b/Wiki/Config/Fvwm2rc/index.md index 23d1c8f8..538d3cab 100644 --- a/Wiki/Config/Fvwm2rc/index.md +++ b/Wiki/Config/Fvwm2rc/index.md @@ -6,13 +6,12 @@ description: | Fvwm is configured through a configuration file located at ~/.fvwm/config (default), also known as the Fvwm2rc or .fvwm2rc file. This page is an overview of the location of that file and how Fvwm starts. - --- +# The Fvwm2rc file + * TOC {:toc} -# The Fvwm2rc file - Fvwm is configured through an extensive config file. At the release of Fvwm 2, the config file was located at ~/.fvwm2rc to not conflict with ~/.fvwmrc for Fvwm 1. It then moved to ~/.fvwm/.fvwm2rc and finally to ~/.fvwm2rc/config (although some old diff --git a/Wiki/Config/Menus/index.md b/Wiki/Config/Menus/index.md index fce90a2c..098a652a 100644 --- a/Wiki/Config/Menus/index.md +++ b/Wiki/Config/Menus/index.md @@ -8,14 +8,12 @@ description: | with scripts, such as wall paper menus, a menu that allows you to see all files in $HOME, etc. This is the basics of configuring Menus. - --- +# Menus + * TOC {:toc} -Menus -===== - Menus are lists you can pop up from a binding or hook it to a start menu on a panel. Menus can be used to list programs or even be created dynamically so you can list the contents of a directory, a recent applications menu, diff --git a/Wiki/Config/StyleTips/index.md b/Wiki/Config/StyleTips/index.md index 45f8568a..31c1a5f6 100644 --- a/Wiki/Config/StyleTips/index.md +++ b/Wiki/Config/StyleTips/index.md @@ -8,16 +8,14 @@ description: | This article by Thomas Adam. --- +# FVWM: How Styles are Applied + * TOC {:toc} -# FVWM: How Styles are Applied - *This is a copy of the following article by Thomas Adam: * -## Introduction - Configuring FVWM can seem like a chore at times. Indeed, there are certain aspects of it that are easy - and some that are less so. I've been helping people configure FVWM for some time now, and while I have delved diff --git a/Wiki/Config/VectorButtons/index.md b/Wiki/Config/VectorButtons/index.md index 021b8e37..4e15fb3f 100644 --- a/Wiki/Config/VectorButtons/index.md +++ b/Wiki/Config/VectorButtons/index.md @@ -5,13 +5,12 @@ weight: 440 description: | Vector Buttons are a built in method for drawing buttons for windows in Fvwm. This describes the syntax and provides a collection of examples. - --- +# Vector Buttons + * TOC {:toc} -# Vector Buttons - Vectors are a method to draw window buttons in Fvwm. A Vector definition describes the button as a square. Position in the button is the X and Y location as a percentage between 0 and 100 from the top left corner of the button. diff --git a/Wiki/Menus/WindowOps/index.md b/Wiki/Menus/WindowOps/index.md index d52aa7e1..6c420a9c 100644 --- a/Wiki/Menus/WindowOps/index.md +++ b/Wiki/Menus/WindowOps/index.md @@ -5,13 +5,12 @@ weight: 500 description: | This menu is just a collection of actions (Maximize, Iconify, Close, etc) that can be used to control windows. - --- +# WindowOps Menu + * TOC {:toc} -# WindowOps Menu - These are a collection of Menus that can be used to control windows. The menus can be accessed from a root menu in which you have to select the window to operate on. They can also be bound to window buttons or diff --git a/Wiki/NewToFvwm/index.md b/Wiki/NewToFvwm/index.md index 0dc8824f..63b1382c 100644 --- a/Wiki/NewToFvwm/index.md +++ b/Wiki/NewToFvwm/index.md @@ -1,12 +1,10 @@ --- title: NewToFvwm --- -* TOC -{:toc} - # New to FVWM -## Introduction +* TOC +{:toc} Welcome. So you're new to FVWM and you're wondering what it's all about. Perhaps you want some further information about FVWM but don't quite know diff --git a/Wiki/Panels/FvwmTaskBar/index.md b/Wiki/Panels/FvwmTaskBar/index.md index c02a1be8..f5839011 100644 --- a/Wiki/Panels/FvwmTaskBar/index.md +++ b/Wiki/Panels/FvwmTaskBar/index.md @@ -5,13 +5,12 @@ weight: 500 description: | This seems to be a common Panel asked about and with the removal of FvwmTaskBar here is a replacement. - --- +# FvwmTaskBar + * TOC {:toc} -# FvwmTaskBar - FvwmTaskBar is similar to the classic windows taskbar along the bottom of the screen. In older versions of fvwm there was a module FvwmTaskBar, but this was removed in 2.6.7 in favor of using diff --git a/Wiki/Panels/RightPanel/index.md b/Wiki/Panels/RightPanel/index.md index f53e9ade..89f2e13c 100644 --- a/Wiki/Panels/RightPanel/index.md +++ b/Wiki/Panels/RightPanel/index.md @@ -5,13 +5,12 @@ weight: 600 description: | This is a description of the RightPanel found in the default configuration. - --- +# RightPanel + * TOC {:toc} -# RightPanel - The RightPanel is a taskbar like panel along the right edge of the screen for a now more common widescreen setup. This panel contains [FvwmPager]( {{ "/Moduels/FvwmPager" | prepend: site.wikiurl }}) for moving around diff --git a/Wiki/Panels/SensorDock/index.md b/Wiki/Panels/SensorDock/index.md index 412e03e1..b945aa0e 100644 --- a/Wiki/Panels/SensorDock/index.md +++ b/Wiki/Panels/SensorDock/index.md @@ -7,13 +7,12 @@ description: | uses xosview to show cpu, mem, disk, etc., uses FvwmScript to show the date/time and temperature outputs from lm-sensors and a systemtray. - --- +# SensorDock + * TOC {:toc} -# SensorDock - SensorDock is a dock which uses [FvwmButtons]( {{ "/Modules/FvwmButtons" | prepend: site.wikiurl }}) to Swallow different apps such as [FvwmPager]( diff --git a/Wiki/Panels/index.md b/Wiki/Panels/index.md index 33d12dd0..7ee5441b 100644 --- a/Wiki/Panels/index.md +++ b/Wiki/Panels/index.md @@ -8,13 +8,12 @@ description: | as a taskbar or pager. Fvwm provides various modules to help build panels. This can also be mixed with third party software or even use a third party panel. - --- +# Panels and Docks + * TOC {:toc} -# Panels and Docks - Like everything else in Fvwm these need to be configured. Fvwm provides lots of choice of how to configure the panels you want to use. diff --git a/Wiki/Tips/CapsLockAsModifier/index.md b/Wiki/Tips/CapsLockAsModifier/index.md index 860041e6..4aa11262 100644 --- a/Wiki/Tips/CapsLockAsModifier/index.md +++ b/Wiki/Tips/CapsLockAsModifier/index.md @@ -4,14 +4,11 @@ type: tip description: | This describes how to configure CapsLock as a Modifier for Key and Mouse bindings. - --- -* TOC -{:toc} - # Caps Lock as FVWM Key -## Introduction +* TOC +{:toc} Many people think of Caps Lock as a very annoying key at an annoying position. Lots of us also know Windows, Amiga, or Macintosh keys, which are diff --git a/Wiki/Tips/FocusStealing/index.md b/Wiki/Tips/FocusStealing/index.md index a2df9c0b..7a18e8ec 100644 --- a/Wiki/Tips/FocusStealing/index.md +++ b/Wiki/Tips/FocusStealing/index.md @@ -5,14 +5,11 @@ description: | Some applications want to steal focus when an event is trigered. This describes how to disable apps from stealing focus in Fvwm. - --- -* TOC -{:toc} - # Stopping Applications Stealing Focus -## Introduction +* TOC +{:toc} Many people are confused by some applications appearing to steal focus. Usually, the following isn't enough: diff --git a/Wiki/Tips/GradientBackgrounds/index.md b/Wiki/Tips/GradientBackgrounds/index.md index a4774083..47957814 100644 --- a/Wiki/Tips/GradientBackgrounds/index.md +++ b/Wiki/Tips/GradientBackgrounds/index.md @@ -3,14 +3,13 @@ title: Gradient Backgrounds type: tip description: | This descibes how to get nice gradients on different fvwm desktops or pages. - --- +# Gradient Backgrounds + * TOC {:toc} -# Gradient Backgrounds - -This descibes how to get nice gradients on different fvwm desktops or pages. +This describes how to get nice gradients on different fvwm desktops or pages. ## Create the Gradients diff --git a/Wiki/Tips/RxvtRunDialogue/index.md b/Wiki/Tips/RxvtRunDialogue/index.md index cb8cf245..545ef68a 100644 --- a/Wiki/Tips/RxvtRunDialogue/index.md +++ b/Wiki/Tips/RxvtRunDialogue/index.md @@ -4,14 +4,11 @@ type: tip description: | This uses Rxvt to configure pop up a little dialog you can type a command to execute. - --- -* TOC -{:toc} - # An RXVT based run dialog with tab completion -## Introduction +* TOC +{:toc} What follows is the description of a very simple way to realize a run dialog (a little dialog where the user can enter the name of an executable to start) using diff --git a/Wiki/Tips/SwallowXloadFvwmButtons/index.md b/Wiki/Tips/SwallowXloadFvwmButtons/index.md index 28f1b19c..e4276c91 100644 --- a/Wiki/Tips/SwallowXloadFvwmButtons/index.md +++ b/Wiki/Tips/SwallowXloadFvwmButtons/index.md @@ -4,13 +4,12 @@ type: tip description: | This describes how to build a system monintor by Swallowing xload inside of FvwmButtons. - --- +# Using FvwmButtons to Swallow Xload + * TOC {:toc} -# Using FvwmButtons to Swallow Xload - ## Simple Example The simplest example of swallowing xload is to create a definition similar to this one: diff --git a/Wiki/_layouts/wiki.html b/Wiki/_layouts/wiki.html deleted file mode 100644 index ee1628ed..00000000 --- a/Wiki/_layouts/wiki.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - {% include head.html %} - - - - {% capture header %}{% include header.html %}{% endcapture %}{{ header | strip_newlines | remove: " " }} - -
-
- - {{ content }} - -
-
- - {% include footer.html %} - - - - diff --git a/Wiki/img/fvwm-logo_sml.png b/Wiki/img/fvwm-logo_sml.png deleted file mode 100644 index c31d62b9..00000000 Binary files a/Wiki/img/fvwm-logo_sml.png and /dev/null differ diff --git a/_includes/fvwmwindow.html b/_includes/fvwmwindow.html index 26003057..65852515 100644 --- a/_includes/fvwmwindow.html +++ b/_includes/fvwmwindow.html @@ -24,9 +24,7 @@ {% if include.bgcolor %}{% assign fvwmbgcolor=include.bgcolor %} {% else %}{% assign fvwmbgcolor=fvwmcolor %}{% endif %} -
+
@@ -37,17 +35,12 @@
-
-
+
+
{{ include.title }}
-
-
+
+
diff --git a/_layouts/fvwm3.html b/_layouts/fvwm3.html index 3e849849..7aca8295 100644 --- a/_layouts/fvwm3.html +++ b/_layouts/fvwm3.html @@ -1,106 +1,72 @@ - + - + - {% if page.title %} {{ page.title }} - {% else %} {{ site.title }} - {% endif %} + {% if page.title -%} {{ page.title }} + {%- else -%} {{ site.title }} {%- endif %} - - - - - + + + + - + - - - - - -
+ + diff --git a/_sass/_fvwm3.scss b/_sass/_fvwm3.scss index 0df449dc..da5588c1 100644 --- a/_sass/_fvwm3.scss +++ b/_sass/_fvwm3.scss @@ -1,32 +1,10 @@ /** - * Fvwm3 Styles that adjust the bootstrap v4.5 framework. - * - * Styles must be responsive, design from the smallest screens - * to the largest screens. Defaults should always be for the - * smallest screens then use media queries for bigger screens. - * - * To match bootstrap, the break points are: - * @media (min-width: 576px ) {} - * @media (min-width: 768px ) {} - * @media (min-width: 992px ) {} - * @media (min-width: 1200px ) {} + * Fvwm3 Styles that adjust the bootstrap v5.3 framework. */ - /** - * Bootstrap Overrides + * Ordered lists: Number -> lower-alpha -> lower-roman. */ -html { overflow-y: scroll; } -.body { padding-top: 5rem; } -// Full Width for larger sizes -@media (min-width: 576px ) { - .container { - margin-left: auto; - margin-right: auto; - max-width: 95%; - } -} -// Ordered List Markers ol ol { list-style-type: lower-alpha; } @@ -36,6 +14,7 @@ ol ol ol { ul, ol { margin-bottom: 1rem !important; } + // Block Quotes blockquote { background: darken($bg-color, 5%); @@ -43,7 +22,7 @@ blockquote { margin: 1rem 1rem; padding: 0.5rem 10px; } -// Tables +// Tables, since bootstrap doesn't style them without classes. table { margin-left: 1rem; } th { padding: 3px 15px 3px 15px; @@ -54,7 +33,6 @@ td { padding: 3px 6px 3px 6px; } - // Wiki Index Links p.title-indent { @@ -62,7 +40,6 @@ p.title-indent margin-left: 40px; } - /** * Rouge Line Number Tables */ @@ -73,61 +50,69 @@ table.rouge-table { margin: 0; } /** * Top navigation bar and links */ -.navbar { - background-color: $bg-color !important; - border-bottom: solid 5px $border-color; -} .navbtn { - border: 3px solid; - border-color: $border-color !important; - background-color: $link-button-pressed-color; + width: 44px; + height: 44px; + background-image: url("/img/fvwm-button-raised.png"); + background-repeat: no-repeat; + background-position: center; + border: solid 2px $border-color; +} +.navbtn.show { + background-image: url("/img/fvwm-button-sunk.png"); +} +#fvwmorg-main-nav { + top: 55px; + right: 15px; + left: auto; + padding-top: 11px; + padding-bottom: 11px; + min-width: 0; + box-shadow: 3px 3px 1px $fwin-bgcolor; +} +#fvwmorg-main-nav a { + width: 100%; + display: block; + padding-left: 0.5em; + padding-right: 1em; } -.navbtn.collapsed { background-color: $navlink-color; } .fvwmnav { - max-width: calc(100vw - 250px); + display: flex; + flex-wrap: nowrap; + align-items: center; + justify-content: left; + padding: 0; + margin: 0; + background-color: $bg-color; + border-bottom: solid 5px $border-color; +} +.fvwmnav-logo { + margin: 0; } .fvwmnav-link { - font-size: 28px; - font-weight: 700; - color: $navlink-color !important; - background-color: $navlink-bgcolor; + font-size: 130%; + font-weight: 700; + color: $navlink-color; + background-color: $navlink-bgcolor; + text-decoration: none; } .fvwmnav-link:hover { - text-decoration: none; - border-bottom: solid 3px $border-color; - color: $navhilink-color !important; + text-decoration: none; + color: $navlink-bgcolor; + background-color: $navlink-color; } .lgslash { - font-size: 14px; - font-weight: 600; - color: $navhilink-color; -} -.fvwmnav .fvwmnav-link { font-size: 14px; } -/* - * Responsive Header Link Size - */ -@media (min-width: 576px) { - .fvwmnav .fvwmnav-link { font-size: 20px; } - .lgslash { font-size: 20px; } -} -@media (min-width: 768px) { - .fvwmnav .fvwmnav-link { font-size: 26px; } - .lgslash { font-size: 26px; } -} -@media (min-width: 992px) { - .fvwmnav .fvwmnav-link { font-size: 32px; } - .lgslash { font-size: 32px; } + font-size: 150%; + font-weight: 600; + color: $navhilink-color; } - - /** * Main Content Window */ #maincontent { font-size: 18px; margin-top: 15px; - padding: 5rem 3px 1.5rem 3px; text-align: left; } // Main Content Links @@ -147,14 +132,10 @@ table.rouge-table { margin: 0; } #maincontent > h4, #maincontent > h5, #maincontent > h6 { - padding-top: 90px; - margin-top: -90px; + padding-top: 65px; + margin-top: -65px; } - - - - /** * Markdown TOC full */ @@ -231,18 +212,3 @@ table.rouge-table { margin: 0; } #markdown-toc, #toc-full { display: none; } } - - -// Increase Margins for Larger Screens -@media (min-width: 768px ) { - table { margin-left: 2rem; } - #toc-full { margin: 3px 2rem; } - blockquote { margin: 1rem 2rem; } -} -@media (min-width: 992px ) { - table { margin-left: 3rem; } - #toc-full { margin: 3px 3rem; } - blockquote { margin: 1rem 3rem; } -} - - diff --git a/img/fvwm-button-raised.png b/img/fvwm-button-raised.png new file mode 100644 index 00000000..3e36f178 Binary files /dev/null and b/img/fvwm-button-raised.png differ diff --git a/img/fvwm-button-sunk.png b/img/fvwm-button-sunk.png new file mode 100644 index 00000000..b902673e Binary files /dev/null and b/img/fvwm-button-sunk.png differ diff --git a/index.md b/index.md index 5cb57919..0a326f30 100644 --- a/index.md +++ b/index.md @@ -131,11 +131,11 @@ environment from. If you want a preconfigured desktop environment using Fvwm, check out the following: {% capture fvwmtxt %} - {% endcapture %} diff --git a/js/fvwmwindow.js b/js/fvwmwindow.js new file mode 100644 index 00000000..7dcc2f27 --- /dev/null +++ b/js/fvwmwindow.js @@ -0,0 +1,35 @@ +(() => { + document.querySelectorAll('.fvwmwindow').forEach((w) => { + const t = document.getElementById('fvwmwindow-title-' + w.dataset.fvwmid); + w.addEventListener('mouseover', () => { + t?.classList.add('fwin-focus'); + }); + w.addEventListener('mouseout', () => { + t?.classList.remove('fwin-focus'); + }); + }); + document.querySelectorAll('.fvwmwindow-button1').forEach((b) => { + const w = document.getElementById('fvwmwindow-' + b.dataset.fvwmid); + b.addEventListener('click', () => { + w?.classList.toggle('fvwmwindow-max'); + }); + }); + document.querySelectorAll('.fvwmwindow-button2').forEach((b) => { + const w = document.getElementById('fvwmwindow-main-' + b.dataset.fvwmid); + b.addEventListener('click', () => { + w?.classList.remove('fvwmwindow-min'); + }); + }); + document.querySelectorAll('.fvwmwindow-button4').forEach((b) => { + const w = document.getElementById('fvwmwindow-main-' + b.dataset.fvwmid); + b.addEventListener('click', () => { + w?.classList.add('fvwmwindow-min'); + }); + }); + document.querySelectorAll('.fvwmwindow-title').forEach((t) => { + const w = document.getElementById('fvwmwindow-main-' + t.dataset.fvwmid); + t.addEventListener('dblclick', () => { + w?.classList.toggle('fvwmwindow-min'); + }); + }); +})();