You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2016/10/19 14:24:54 UTC
[64/67] shiro-site git commit: Remove boot strap specifics and keep
rendering the same
Remove boot strap specifics and keep rendering the same
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.
Project: http://git-wip-us.apache.org/repos/asf/shiro-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro-site/commit/276b79c5
Tree: http://git-wip-us.apache.org/repos/asf/shiro-site/tree/276b79c5
Diff: http://git-wip-us.apache.org/repos/asf/shiro-site/diff/276b79c5
Branch: refs/heads/master
Commit: 276b79c555f8fa88c4f96f29dd89d34cc3dc030a
Parents: ddea166
Author: Brian Demers <bd...@apache.org>
Authored: Tue Oct 18 21:51:14 2016 -0400
Committer: Brian Demers <bd...@apache.org>
Committed: Wed Oct 19 09:52:28 2016 -0400
----------------------------------------------------------------------
templates/default.vtl | 6 ------
templates/macros/danger.vtl | 24 ++++++++++++++++++++----
templates/macros/info.vtl | 26 ++++++++++++++++++++++----
templates/macros/tip.vtl | 22 ++++++++++++++++++----
templates/macros/warning.vtl | 24 ++++++++++++++++++++----
5 files changed, 80 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/276b79c5/templates/default.vtl
----------------------------------------------------------------------
diff --git a/templates/default.vtl b/templates/default.vtl
index 15d4dab..3651a92 100644
--- a/templates/default.vtl
+++ b/templates/default.vtl
@@ -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">
<!--
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/276b79c5/templates/macros/danger.vtl
----------------------------------------------------------------------
diff --git a/templates/macros/danger.vtl b/templates/macros/danger.vtl
index 6fd069f..b02e19d 100644
--- a/templates/macros/danger.vtl
+++ b/templates/macros/danger.vtl
@@ -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
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/276b79c5/templates/macros/info.vtl
----------------------------------------------------------------------
diff --git a/templates/macros/info.vtl b/templates/macros/info.vtl
index 805e1dc..459068b 100644
--- a/templates/macros/info.vtl
+++ b/templates/macros/info.vtl
@@ -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
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/276b79c5/templates/macros/tip.vtl
----------------------------------------------------------------------
diff --git a/templates/macros/tip.vtl b/templates/macros/tip.vtl
index e8046ad..717c5b0 100644
--- a/templates/macros/tip.vtl
+++ b/templates/macros/tip.vtl
@@ -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
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/276b79c5/templates/macros/warning.vtl
----------------------------------------------------------------------
diff --git a/templates/macros/warning.vtl b/templates/macros/warning.vtl
index 7fb4310..fedd599 100644
--- a/templates/macros/warning.vtl
+++ b/templates/macros/warning.vtl
@@ -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
\ No newline at end of file