From a06961fcb2145fd46a5ead5e9ad92cd4383a8e3a Mon Sep 17 00:00:00 2001 From: Jeff Arnold Date: Sat, 15 Sep 2012 21:02:31 -0400 Subject: [PATCH] changed color names so they don't use @ --- README.rst | 38 ++++----- beamercolorthemesolarized.sty | 142 +++++++++++++++++----------------- 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/README.rst b/README.rst index e56cc6b..5c9e421 100644 --- a/README.rst +++ b/README.rst @@ -50,29 +50,29 @@ The package defines the sixteen colors of the Solarized palette. :: - solarized@base03 #002b36 - solarized@base02 #073642 - solarized@base01 #586e75 - solarized@base00 #657b83 - solarized@base0 #839496 - solarized@base1 #93a1a1 - solarized@base2 #eee8d5 - solarized@base3 #fdf6e3 - solarized@yellow #b58900 - solarized@orange #cb4b16 - solarized@red #dc322f - solarized@magenta #d33682 - solarized@violet #6c71c4 - solarized@blue #268bd2 - solarized@cyan #2aa198 - solarized@green #859900 + solarizedBase03 #002b36 + solarizedBase02 #073642 + solarizedBase01 #586e75 + solarizedBase00 #657b83 + solarizedBase0 #839496 + solarizedBase1 #93a1a1 + solarizedBase2 #eee8d5 + solarizedBase3 #fdf6e3 + solarizedYellow #b58900 + solarizedOrange #cb4b16 + solarizedRed #dc322f + solarizedMagenta #d33682 + solarizedViolet #6c71c4 + solarizedBlue #268bd2 + solarizedCyan #2aa198 + solarizedGreen #859900 Additionally, it defines these colors, the values of which are dependent on the options specified when the theme is loaded. -- ``solarized@accent`` Accent color. -- ``solarized@rebase03``, ``solarized@rebase02``, ``solarized@rebase01``, ``solarized@rebase00``: Background colors; dark colors if the dark theme is used, light colors if light theme. -- ``solarized@rebase0``, ``solarized@rebase1``, ``solarized@rebase2``, ``solarized@rebase3``: Foreground colors; light colors if the dark theme is used, dark colors if light theme. +- ``solarizedAccent`` Accent color. +- ``solarizedRebase03``, ``solarizedRebase02``, ``solarizedRebase01``, ``solarizedRebase00``: Background colors; dark colors if the dark theme is used, light colors if light theme. +- ``solarizedRebase0``, ``solarizedRebase1``, ``solarizedRebase2``, ``solarizedRebase3``: Foreground colors; light colors if the dark theme is used, dark colors if light theme. diff --git a/beamercolorthemesolarized.sty b/beamercolorthemesolarized.sty index 3903544..db656c0 100644 --- a/beamercolorthemesolarized.sty +++ b/beamercolorthemesolarized.sty @@ -31,124 +31,124 @@ \ProcessKeyvalOptions* % Solarized palette -\definecolor{solarized@base03}{HTML}{002B36} -\definecolor{solarized@base02}{HTML}{073642} -\definecolor{solarized@base01}{HTML}{586e75} -\definecolor{solarized@base00}{HTML}{657b83} -\definecolor{solarized@base0}{HTML}{839496} -\definecolor{solarized@base1}{HTML}{93a1a1} -\definecolor{solarized@base2}{HTML}{EEE8D5} -\definecolor{solarized@base3}{HTML}{FDF6E3} -\definecolor{solarized@yellow}{HTML}{B58900} -\definecolor{solarized@orange}{HTML}{CB4B16} -\definecolor{solarized@red}{HTML}{DC322F} -\definecolor{solarized@magenta}{HTML}{D33682} -\definecolor{solarized@violet}{HTML}{6C71C4} -\definecolor{solarized@blue}{HTML}{268BD2} -\definecolor{solarized@cyan}{HTML}{2AA198} -\definecolor{solarized@green}{HTML}{859900} +\definecolor{solarizedBase03}{HTML}{002B36} +\definecolor{solarizedBase02}{HTML}{073642} +\definecolor{solarizedBase01}{HTML}{586e75} +\definecolor{solarizedBase00}{HTML}{657b83} +\definecolor{solarizedBase0}{HTML}{839496} +\definecolor{solarizedBase1}{HTML}{93a1a1} +\definecolor{solarizedBase2}{HTML}{EEE8D5} +\definecolor{solarizedBase3}{HTML}{FDF6E3} +\definecolor{solarizedYellow}{HTML}{B58900} +\definecolor{solarizedOrange}{HTML}{CB4B16} +\definecolor{solarizedRed}{HTML}{DC322F} +\definecolor{solarizedMagenta}{HTML}{D33682} +\definecolor{solarizedViolet}{HTML}{6C71C4} +\definecolor{solarizedBlue}{HTML}{268BD2} +\definecolor{solarizedCyan}{HTML}{2AA198} +\definecolor{solarizedGreen}{HTML}{859900} % Set Accent color % Ugly. Should be done with a switch -\ifdefstring{\solarized@accent}{yellow}{ - \colorlet{solarized@accent}{solarized@yellow} +\ifdefstring{\solarizedAccent}{yellow}{ + \colorlet{solarizedAccent}{solarizedYellow} }{} -\ifdefstring{\solarized@accent}{orange}{ - \colorlet{solarized@accent}{solarized@orange} +\ifdefstring{\solarizedAccent}{orange}{ + \colorlet{solarizedAccent}{solarizedOrange} }{} -\ifdefstring{\solarized@accent}{red}{ - \colorlet{solarized@accent}{solarized@red} +\ifdefstring{\solarizedAccent}{red}{ + \colorlet{solarizedAccent}{solarizedRed} }{} -\ifdefstring{\solarized@accent}{magenta}{ - \colorlet{solarized@accent}{solarized@magenta} +\ifdefstring{\solarizedAccent}{magenta}{ + \colorlet{solarizedAccent}{solarizedMagenta} }{} -\ifdefstring{\solarized@accent}{violet}{ - \colorlet{solarized@accent}{solarized@violet} +\ifdefstring{\solarizedAccent}{violet}{ + \colorlet{solarizedAccent}{solarizedViolet} }{} -\ifdefstring{\solarized@accent}{blue}{ - \colorlet{solarized@accent}{solarized@blue} +\ifdefstring{\solarizedAccent}{blue}{ + \colorlet{solarizedAccent}{solarizedBlue} }{} -\ifdefstring{\solarized@accent}{cyan}{ - \colorlet{solarized@accent}{solarized@cyan} +\ifdefstring{\solarizedAccent}{cyan}{ + \colorlet{solarizedAccent}{solarizedCyan} }{} -\ifdefstring{\solarized@accent}{green}{ - \colorlet{solarized@accent}{solarized@green} +\ifdefstring{\solarizedAccent}{green}{ + \colorlet{solarizedAccent}{solarizedGreen} }{} %% Set base colors for dark or light versions %% Dark % Switch between light and dark themes using the method in the CSS % stylesheet http://ethanschoonover.com/solarized -\ifboolexpe{ bool {solarized@dark}}{ - \colorlet{solarized@rebase03}{solarized@base03} - \colorlet{solarized@rebase02}{solarized@base02} - \colorlet{solarized@rebase01}{solarized@base01} - \colorlet{solarized@rebase00}{solarized@base00} - \colorlet{solarized@rebase0}{solarized@base0} - \colorlet{solarized@rebase1}{solarized@base1} - \colorlet{solarized@rebase2}{solarized@base2} - \colorlet{solarized@rebase3}{solarized@base3} +\ifboolexpe{ bool {solarizedDark}}{ + \colorlet{solarizedRebase03}{solarizedBase03} + \colorlet{solarizedRebase02}{solarizedBase02} + \colorlet{solarizedRebase01}{solarizedBase01} + \colorlet{solarizedRebase00}{solarizedBase00} + \colorlet{solarizedRebase0}{solarizedBase0} + \colorlet{solarizedRebase1}{solarizedBase1} + \colorlet{solarizedRebase2}{solarizedBase2} + \colorlet{solarizedRebase3}{solarizedBase3} }{ %% Light - \colorlet{solarized@rebase03}{solarized@base3} - \colorlet{solarized@rebase02}{solarized@base2} - \colorlet{solarized@rebase01}{solarized@base1} - \colorlet{solarized@rebase00}{solarized@base0} - \colorlet{solarized@rebase0}{solarized@base00} - \colorlet{solarized@rebase1}{solarized@base01} - \colorlet{solarized@rebase2}{solarized@base02} - \colorlet{solarized@rebase3}{solarized@base03} + \colorlet{solarizedRebase03}{solarizedBase3} + \colorlet{solarizedRebase02}{solarizedBase2} + \colorlet{solarizedRebase01}{solarizedBase1} + \colorlet{solarizedRebase00}{solarizedBase0} + \colorlet{solarizedRebase0}{solarizedBase00} + \colorlet{solarizedRebase1}{solarizedBase01} + \colorlet{solarizedRebase2}{solarizedBase02} + \colorlet{solarizedRebase3}{solarizedBase03} } \mode -\setbeamercolor{normal text}{fg=solarized@rebase0, bg=solarized@rebase03} -\setbeamercolor{alerted text}{fg=solarized@accent} +\setbeamercolor{normal text}{fg=solarizedRebase0, bg=solarizedRebase03} +\setbeamercolor{alerted text}{fg=solarizedAccent} % based css pre element -\setbeamercolor{example text}{fg=solarized@rebase1, bg=solarized@rebase02} +\setbeamercolor{example text}{fg=solarizedRebase1, bg=solarizedRebase02} % Header and footer from CSS -\setbeamercolor{footline}{bg=solarized@rebase02,fg=solarized@rebase01} -\setbeamercolor{headline}{bg=solarized@rebase01,fg=solarized@rebase1} +\setbeamercolor{footline}{bg=solarizedRebase02,fg=solarizedRebase01} +\setbeamercolor{headline}{bg=solarizedRebase01,fg=solarizedRebase1} % Titles -\setbeamercolor*{titlelike}{fg=solarized@accent} -\setbeamercolor*{frametitle}{fg=solarized@accent} -\setbeamercolor*{title}{fg=solarized@accent} +\setbeamercolor*{titlelike}{fg=solarizedAccent} +\setbeamercolor*{frametitle}{fg=solarizedAccent} +\setbeamercolor*{title}{fg=solarizedAccent} % Structure elements use css style for header -\setbeamercolor*{structure}{bg=solarized@rebase01, fg=solarized@rebase1} +\setbeamercolor*{structure}{bg=solarizedRebase01, fg=solarizedRebase1} % Do not mess with subtle colors in palette. I don't like it. -\setbeamercolor*{palette primary}{bg=solarized@rebase01, fg=solarized@rebase1} -\setbeamercolor*{palette secondary}{parentbg=solarized@rebase01, fg=solarized@rebase1} -\setbeamercolor*{palette tertiary}{bg=solarized@rebase01, fg=solarized@rebase1} -\setbeamercolor*{palette quaternary}{bg=solarized@rebase01, fg=solarized@rebase1} +\setbeamercolor*{palette primary}{bg=solarizedRebase01, fg=solarizedRebase1} +\setbeamercolor*{palette secondary}{parentbg=solarizedRebase01, fg=solarizedRebase1} +\setbeamercolor*{palette tertiary}{bg=solarizedRebase01, fg=solarizedRebase1} +\setbeamercolor*{palette quaternary}{bg=solarizedRebase01, fg=solarizedRebase1} % Make Blocks slightly lighter/darker -\setbeamercolor{block title}{fg=solarized@accent, bg=solarized@rebase02} +\setbeamercolor{block title}{fg=solarizedAccent, bg=solarizedRebase02} %\setbeamercolor{block title alerted}{} %\setbeamercolor{block title example}{} -\setbeamercolor{block body}{parent=normal text, bg=solarized@rebase02} +\setbeamercolor{block body}{parent=normal text, bg=solarizedRebase02} % \setbeamercolor{block body alerted}{} % \setbeamercolor{block body example}{} % same as footline % Set Sidebar and footline to use the css style for footer \setbeamercolor*{sidebar}{parent=headline} -\setbeamercolor*{palette sidebar primary}{fg=solarized@rebase01, fg=solarized@rebase1} -\setbeamercolor*{palette sidebar secondary}{fg=solarized@rebase01, fg=solarized@rebase1} -\setbeamercolor*{palette sidebar tertiary}{fg=solarized@rebase01, fg=solarized@rebase1} -\setbeamercolor*{palette sidebar quaternary}{fg=solarized@rebase01, fg=solarized@rebase1} +\setbeamercolor*{palette sidebar primary}{fg=solarizedRebase01, fg=solarizedRebase1} +\setbeamercolor*{palette sidebar secondary}{fg=solarizedRebase01, fg=solarizedRebase1} +\setbeamercolor*{palette sidebar tertiary}{fg=solarizedRebase01, fg=solarizedRebase1} +\setbeamercolor*{palette sidebar quaternary}{fg=solarizedRebase01, fg=solarizedRebase1} % border-color for headings -\setbeamercolor{separation line}{fg=solarized@rebase0} -\setbeamercolor{fine separation line}{fg=solarized@rebase0} +\setbeamercolor{separation line}{fg=solarizedRebase0} +\setbeamercolor{fine separation line}{fg=solarizedRebase0} \setbeamercolor*{section in sidebar shaded}{parent=palette sidebar primary} % a.hover.navlink in CSS -\setbeamercolor*{section in sidebar}{parent=palette sidebar primary, fg=solarized@rebase02} +\setbeamercolor*{section in sidebar}{parent=palette sidebar primary, fg=solarizedRebase02} \setbeamercolor*{subsection in sidebar}{parent=section in sidebar} \setbeamercolor*{subsection in sidebar shaded}{parent=section in sidebar shaded}