Commit 16b082fb authored by Johnson, Seth R.'s avatar Johnson, Seth R.
Browse files

Merge branch 'master' into refactor

parents b1260ccf 75d9fea3
Loading
Loading
Loading
Loading
+14 −12
Original line number Diff line number Diff line
.DS_Store
Official-TM-Style_060816.pdf
ornl-template-example.pdf
*.log
*.aux
*.bbl
*.blg
*.synctex.gz
*.toc
*.lof
*.lot
*.bcf
*.run.xml
*.glo
*.ist
*.make
*.blg
*.cookie
*.d
*.fls
*.cookie
*.gls
*.glg
*.glo
*.gls
*.ist
*.lof
*.log
*.lot
*.make
*.out
*.run.xml
*.synctex.gz
*.toc
(128 KiB)

File moved.

(17.2 KiB)

File moved.

+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ Insert figures after the text callout but as close to the call out as possible.

\begin{figure}[h]
\centering
\includegraphics[width=5.5in, height=2.5in]{Fig1.png}
\includegraphics[width=5.5in, height=2.5in]{fig1.png}
\vspace{-.1in}

\flushleft\caption[All figure captions are 10 pt, bold, Times New Roman.]{All figure captions are 10 pt, bold, Times New Roman. \textmd{If you have a two-line or more figure caption it is flush left. Only the first sentence of a figure caption is bolded.}}
@@ -304,7 +304,7 @@ Insert figures after the text callout but as close to the call out as possible.

\begin{figure}[h]
\centering
\includegraphics[width=6.2in, height=2.75in, keepaspectratio=true]{Fig1.png}
\includegraphics[width=6.2in, height=2.75in, keepaspectratio=true]{fig1.png}
\vspace{-.1in}
\caption{One-line figure captions are centered.}
\end{figure}
(343 KiB)

File moved.

Loading