theme: don't rely on an external theme

We mostly redefine the theme. Just redefine everything.
This commit is contained in:
Vincent Bernat 2012-07-31 06:59:26 +02:00
parent 6bc35992f2
commit e975da83f9
10 changed files with 38 additions and 34 deletions

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "themes/nice-and-clean-theme"]
path = themes/nice-and-clean-theme
url = https://github.com/waf/nice-and-clean-theme/

View file

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 179 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 174 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 184 B

After

Width:  |  Height:  |  Size: 184 B

Before After
Before After

BIN
icons/taglist/squarefw.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

BIN
icons/taglist/squarew.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 B

View file

Before

Width:  |  Height:  |  Size: 191 B

After

Width:  |  Height:  |  Size: 191 B

Before After
Before After

View file

@ -40,7 +40,7 @@ for i = 1, #tags do
-- Properties -- Properties
for pname, pvalue in pairs(otags[i]) do for pname, pvalue in pairs(otags[i]) do
if pname == "icon" then if pname == "icon" then
awful.tag.seticon(awful.util.getdir("config") .. "/icons/" .. pvalue .. ".png", tags[i]) awful.tag.seticon(awful.util.getdir("config") .. "/icons/taglist/" .. pvalue .. ".png", tags[i])
elseif pname ~= "name" and pname ~= "layout" then elseif pname ~= "name" and pname ~= "layout" then
awful.tag.setproperty(tags[i], pname, pvalue) awful.tag.setproperty(tags[i], pname, pvalue)
end end

View file

@ -1,39 +1,47 @@
-- Small modifications to anrxc's zenburn theme -- Small modifications to anrxc's zenburn theme
local na = awful.util.color_strip_alpha local na = awful.util.color_strip_alpha
local theme = loadrc("../themes/nice-and-clean-theme/theme") local icons = awful.util.getdir("config") .. "/icons"
if theme then
theme.wallpaper_cmd = { "/bin/true" }
theme.font = "Terminus 8"
for n, l in pairs(theme) do theme = {}
local layout = n:match("layout_([%w]+)") theme.wallpaper_cmd = { "/bin/true" }
if layout then theme.font = "Terminus 8"
theme[n] = awful.util.getdir("config") .. "/icons/layouts/" .. layout .. ".png" theme.tasklist_font = "DejaVu Sans 8"
end
end
theme.border_width = 4 theme.bg_normal = "#22222299"
theme.border_normal = "#00000000" theme.bg_focus = "#d8d8d8bb"
theme.border_focus = "#FF7F0066" theme.bg_urgent = "#d02e5499"
theme.border_marked = theme.border_marked .. "66" theme.bg_minimize = "#44444499"
theme.bg_normal = theme.bg_normal .. "99" theme.fg_normal = "#cccccc"
theme.bg_focus = theme.bg_focus .. "BB" theme.fg_focus = "#000000"
theme.bg_urgent = theme.bg_urgent .. "99" theme.fg_urgent = "#ffffff"
theme.bg_minimize = theme.bg_minimize .. "99" theme.fg_minimize = "#ffffff"
-- Widget stuff theme.border_width = 4
theme.bg_widget = "#000000BB" theme.border_normal = "#00000000"
theme.fg_widget_label = "#737d8c" theme.border_focus = "#FF7F0066"
theme.fg_widget_value = na(theme.fg_normal) theme.border_marked = "#91231c66"
theme.fg_widget_value_important = "#E80F28"
theme.fg_widget_border = theme.fg_widget_label
theme.fg_widget_clock = na(theme.border_focus)
-- Naughty -- Widget stuff
naughty.config.presets.normal.bg = theme.bg_widget theme.bg_widget = "#000000BB"
naughty.config.default_preset.font = "DejaVu Sans 10" theme.fg_widget_label = "#737d8c"
theme.fg_widget_value = na(theme.fg_normal)
theme.fg_widget_value_important = "#E80F28"
theme.fg_widget_border = theme.fg_widget_label
theme.fg_widget_clock = na(theme.border_focus)
return theme -- Taglist
theme.taglist_squares_sel = icons .. "/taglist/squarefw.png"
theme.taglist_squares_unsel = icons .. "/taglist/squarew.png"
-- Layout icons
for _, l in pairs(config.layouts) do
theme["layout_" .. l.name] = icons .. "/layouts/" .. l.name .. ".png"
end end
-- Naughty
naughty.config.presets.normal.bg = theme.bg_widget
naughty.config.default_preset.font = "DejaVu Sans 10"
return theme

@ -1 +0,0 @@
Subproject commit 687d77ae6c2c2cfc38ca85f226006244384560d6