Merge branch 'development'

i3/config

@@ -8,20 +8,20 @@ set $mod Mod4
 workspace_layout tabbed
 
 # Configure border style <normal|1pixel|pixel xx|none|pixel>
-#new_window pixel 1
-for_window [class=".*"] border normal
+for_window [class=".*"] border pixel 5
 
 # Hide borders <none|vertical|horizontal|both|smart>
-hide_edge_borders smart
+hide_edge_borders none
 
 # change borders
 bindsym $mod+u border none
-bindsym $mod+y border pixel 1
+bindsym $mod+y border pixel 5
 bindsym $mod+n border normal
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
 font xft:URWGothic-Book 11
+#font pango:monospace 11
 
 # Use Mouse+$mod to drag floating windows
 floating_modifier $mod
@@ -133,6 +133,7 @@ bindsym $mod+Shift+z split h, layout stacked, focus left, move right, move up, f
 
 # toggle fullscreen mode for the focused container
 bindsym $mod+space fullscreen toggle
+bindsym --whole-window button8 fullscreen toggle
 
 # several 16:9 resolutions binded for quick switching
 bindsym $mod+Shift+bracketleft exec xrandr -s 1024x576
@@ -409,6 +410,7 @@ bar {
 bindsym $mod+m bar mode toggle
 
 # Theme colors
+set $bdrcolor #4d4949
 set $bgicolor #d58681
 set $bgucolor #6a6868
 set $txtacolor #F9FAF9
@@ -416,9 +418,9 @@ set $txtucolor #bdbbbb
 set $indcolor #00ff00
 
 # class                   border  backgr. text    indic.   child_border
-  client.focused          $acolour $acolour $txtacolor $indcolor
-  client.focused_inactive $acolour $bgicolor $txtacolor $indcolor
-  client.unfocused        $acolour $bgucolor $txtucolor $indcolor
+  client.focused          $bdrcolor $acolour $txtacolor $indcolor
+  client.focused_inactive $bdrcolor $bgicolor $txtacolor $indcolor
+  client.unfocused        $bdrcolor $bgucolor $txtucolor $indcolor
   client.urgent           #CB4B16 #FDF6E3 #CB4B16 $indcolor
   client.placeholder      #000000 #0c0c0c $txtacolor #000000
   client.background       #2B2C2B
@@ -437,7 +439,7 @@ gaps outer -6
 # gaps outer all plus 5
 
 # Smart gaps (gaps used if only more than one container on the workspace)
-smart_gaps on
+#smart_gaps on
 
 # Smart borders (draw borders around container only if it is not the only container on this workspace)
 # on|no_gaps (on=always activate and no_gaps=only activate if the gap size to the edge of the screen is 0)