all repos — fluxbox @ 0090dc8a6ba4b5c360ecda470b316e630b85c30c

custom fork of the fluxbox windowmanager 

Merge documentation
Mathias Gumz akira@fluxbox.org
commit

0090dc8a6ba4b5c360ecda470b316e630b85c30c

parent

5adf31002f35b4582f17e2a498f6c152994c26ac

2 files changed, 4 insertions(+), 2 deletions(-)

jump to
M doc/asciidoc/fluxbox-style.txt → doc/asciidoc/fluxbox-style.txt 
@@ -248,7 +248,6 @@ window.button.unfocus.pixmap:   <filename>
    window.close.pixmap:            <filename>
    window.close.pressed.pixmap:    <filename>
    window.close.unfocus.pixmap:    <filename>
-   window.font:                    <font>
    window.frame.focusColor:        <color>
    window.frame.unfocusColor:      <color>
    window.grip.focus:              <texture type>

@@ -277,10 +276,12 @@ window.label.active.textColor:  <color>
    window.label.focus:             <texture type>
    window.label.focus.color:       <color>
    window.label.focus.colorTo:     <color>
+   window.label.focus.font:        <font>
    window.label.focus.pixmap:      <filename>
    window.label.unfocus:           <texture type>
    window.label.unfocus.color:     <color>
    window.label.unfocus.colorTo:   <color>
+   window.label.unfocus.font:      <font>
    window.label.unfocus.pixmap:    <filename>
    window.label.focus.textColor:   <color>
    window.label.unfocus.textColor: <color>
M doc/fluxbox-style.5.in → doc/fluxbox-style.5.in 
@@ -268,7 +268,6 @@ window\&.button\&.unfocus\&.pixmap:   <filename>
 window\&.close\&.pixmap:            <filename>
 window\&.close\&.pressed\&.pixmap:    <filename>
 window\&.close\&.unfocus\&.pixmap:    <filename>
-window\&.font:                    <font>
 window\&.frame\&.focusColor:        <color>
 window\&.frame\&.unfocusColor:      <color>
 window\&.grip\&.focus:              <texture type>

@@ -297,10 +296,12 @@ window\&.label\&.active\&.textColor:  <color>
 window\&.label\&.focus:             <texture type>
 window\&.label\&.focus\&.color:       <color>
 window\&.label\&.focus\&.colorTo:     <color>
+window\&.label\&.focus\&.font:        <font>
 window\&.label\&.focus\&.pixmap:      <filename>
 window\&.label\&.unfocus:           <texture type>
 window\&.label\&.unfocus\&.color:     <color>
 window\&.label\&.unfocus\&.colorTo:   <color>
+window\&.label\&.unfocus\&.font:      <font>
 window\&.label\&.unfocus\&.pixmap:    <filename>
 window\&.label\&.focus\&.textColor:   <color>
 window\&.label\&.unfocus\&.textColor: <color>