Skip to content

Commit

Permalink
Remove boot strap specifics and keep rendering the same
Browse files Browse the repository at this point in the history
The info, tip, danger, and warning panels are all split out now
so changing the styling should be easier.  As a bonus all of the missing
confluence gif are fixed as well.
  • Loading branch information
bdemers committed Oct 19, 2016
1 parent ddea166 commit 276b79c
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 22 deletions.
6 changes: 0 additions & 6 deletions templates/default.vtl
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,7 @@
<link rel="stylesheet" href="$root/assets/css/gh-pages/gh-fork-ribbon.ie.css" />
<![endif]-->



<link rel="icon" type="image/vnd.microsoft.icon" href="$root/assets/images/favicon.ico">

<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">

<!--
Expand Down
24 changes: 20 additions & 4 deletions templates/macros/danger.vtl
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
#macro(danger $title, $message)
<div markdown="span" class="alert alert-danger" role="alert">
<i class="fa fa-exclamation-circle"></i>
<b>${title}</b><br/>
${message}
<div class="panelMacro">
<table class="warningMacro">
<colgroup span="1">
<col span="1" width="24">
<col span="1">
</colgroup>
<tbody>
<tr>
<td colspan="1" rowspan="1" valign="top">
<i class="fa fa-exclamation-circle"></i>
</td>

<td colspan="1" rowspan="1">
<b>${title}</b>
<br clear="none">
${message}
</td>
</tr>
</tbody>
</table>
</div>
#end
26 changes: 22 additions & 4 deletions templates/macros/info.vtl
Original file line number Diff line number Diff line change
@@ -1,7 +1,25 @@
#macro(info $title, $message)
<div markdown="span" class="alert alert-info" role="alert">
<i class="fa fa-info-circle"></i>
<b>${title}</b><br/>
${message}
<div class="panelMacro">
<table class="infoMacro">
<colgroup span="1">
<col span="1" width="24">
<col span="1">
</colgroup>


<tbody>
<tr>
<td colspan="1" rowspan="1" valign="top">
<i class="fa fa-info-circle"></i>
</td>

<td colspan="1" rowspan="1">
<b>${title}</b>
<br clear="none">
${message}
</td>
</tr>
</tbody>
</table>
</div>
#end
22 changes: 18 additions & 4 deletions templates/macros/tip.vtl
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
#macro(tip $title, $message)
<div markdown="span" class="alert alert-success" role="alert">
<i class="fa fa-check-square-o"></i>
<b>${title}</b><br/>
${message}
<div class="panelMacro">
<table class="tipMacro">
<colgroup span="1">
<col span="1" width="24">
<col span="1">
</colgroup>
<tbody><tr>
<td colspan="1" rowspan="1" valign="top">
<i class="fa fa-check-square-o"></i>
</td>
<td colspan="1" rowspan="1">
<b>${title}</b>
<br clear="none">
${message}
</td>
</tr>
</tbody>
</table>
</div>
#end
24 changes: 20 additions & 4 deletions templates/macros/warning.vtl
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
#macro(warning $title, $message)
<div markdown="span" class="alert alert-warning" role="alert">
<i class="fa fa-warning"></i>
<b>${title}</b><br/>
${message}
<div class="panelMacro">
<table class="noteMacro">
<colgroup span="1">
<col span="1" width="24">
<col span="1">
</colgroup>
<tbody>
<tr>
<td colspan="1" rowspan="1" valign="top">
<i class="fa fa-warning"></i>
</td>

<td colspan="1" rowspan="1">
<b>${title}</b>
<br clear="none">
${message}
</td>
</tr>
</tbody>
</table>
</div>
#end

0 comments on commit 276b79c

Please sign in to comment.