Merge remote-tracking branch 'origin/master'

This commit is contained in:
chhan11 2017-05-22 12:32:13 +02:00
commit af22ccb611
2 changed files with 10 additions and 25 deletions

View File

@ -1,25 +0,0 @@
\newcommand{\boxalert}[1]{{
\usebeamercolor{alerted text}
\colorbox{bg}{\alert{#1}}
}}
\newtcblisting{cisco}[1][]{
size=fbox,
listing only,
listing options={
style=tcblatex,
basicstyle=\ttfamily\scriptsize,
tabsize=1,
language=sh,
breaklines=false,
columns=fullflexible
},
#1
}
\newcommand{\pic}[2]{
\begin{center}
\transparent{0.4}
\includegraphics[height=#1]{#2}
\end{center}
}

View File

@ -15,11 +15,19 @@
% to the file main.tex
\graphicspath{{img/}}
% Custom commands
\newcommand{\insertoutput}[1]{
\begin{center}
\includegraphics[width=12cm]{#1}
\end{center}
}
\newcommand{\pic}[2]{
\begin{center}
\transparent{0.4}
\includegraphics[height=#1]{#2}
\end{center}
}
% In which order to look after images in
% declared graphicspath{}'s
@ -60,6 +68,7 @@
% <!-- ROUTER -->
\subsection{Router}
\subsubsection{File: base.cfg}
\inputminted[frame=lines,framesep=2mm,baselinestretch=1.2,bgcolor=lightgray,fontsize=\footnotesize,linenos,breaklines=true]{powershell}{code/router/base.cfg}
\subsubsection{File: reset.tcl}
@ -68,6 +77,7 @@
% <!-- SWITCH -->
\subsection{Switch}
\subsubsection{File: base.cfg}
\inputminted[frame=lines,framesep=2mm,baselinestretch=1.2,bgcolor=lightgray,fontsize=\footnotesize,linenos,breaklines=true]{powershell}{code/switch/base.cfg}
\subsubsection{File: reset.tcl}