qpid-dispatch git commit: DISPATCH-750 Force font-family for FontAwesome fonts for Windows support

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

qpid-dispatch git commit: DISPATCH-750 Force font-family for FontAwesome fonts for Windows support

eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 5ee5bc9be -> 47724c7c4


DISPATCH-750 Force font-family for FontAwesome fonts for Windows support


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/47724c7c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/47724c7c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/47724c7c

Branch: refs/heads/master
Commit: 47724c7c42ee9fca15a06baeab5af40abf9aed2b
Parents: 5ee5bc9
Author: Ernest Allen <[hidden email]>
Authored: Sat Jun 17 20:23:31 2017 -0400
Committer: Ernest Allen <[hidden email]>
Committed: Sat Jun 17 20:23:31 2017 -0400

----------------------------------------------------------------------
 console/stand-alone/index.html                |  5 ++
 console/stand-alone/plugin/css/dispatchpf.css | 11 +++
 console/stand-alone/plugin/css/plugin.css     | 87 +++++++++++++++-------
 console/stand-alone/plugin/css/site-base.css  |  1 +
 4 files changed, 78 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/47724c7c/console/stand-alone/index.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index b67b57e..1bd1dd3 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -27,6 +27,7 @@ under the License.
     <title>Qpid Dispatch Console</title>
 
     <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+    <link href='https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css' type="text/css">
     <link rel="stylesheet" href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css">
 
     <!-- PatternFly Styles -->
@@ -96,6 +97,10 @@ under the License.
         </div>
     </div>
 
+<!--[if lt IE 9]>
+<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+<![endif]-->
+
 <!-- jQuery -->
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/47724c7c/console/stand-alone/plugin/css/dispatchpf.css
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/css/dispatchpf.css b/console/stand-alone/plugin/css/dispatchpf.css
index 3dc5a8e..eee5ff4 100644
--- a/console/stand-alone/plugin/css/dispatchpf.css
+++ b/console/stand-alone/plugin/css/dispatchpf.css
@@ -48,9 +48,11 @@ span.dynatree-icon {
   margin-right: 5px;
 }
 .dynatree-exp-c span.fa-angle:before, .dynatree-exp-cl span.fa-angle:before {
+  font-family: FontAwesome;
   content: "\f105";
 }
 .dynatree-exp-e span.fa-angle:before, .dynatree-exp-el span.fa-angle:before {
+  font-family: FontAwesome;
   content: "\f107";
 }
 
@@ -60,9 +62,11 @@ span.dynatree-icon {
 }
 
 .dynatree-ico-cf span.dynatree-icon:before {
+  font-family: FontAwesome;
   content: "\f07b";
 }
 .dynatree-ico-ef span.dynatree-icon:before {
+  font-family: FontAwesome;
   content: "\f07c";
 }
 
@@ -133,13 +137,16 @@ div#list-controller {
 }
 
 .icon-bar-chart:before {
+  font-family: FontAwesome;
     content: "\f080";
 }
 
 .icon-step-forward:before {
+  font-family: FontAwesome;
   content: "\f051";
 }
 .icon-step-backward:before {
+  font-family: FontAwesome;
   content: "\f048";
 }
 
@@ -169,3 +176,7 @@ div.chartContainer {
 #dispatch-login-container .alert {
   padding-right: 47px;
 }
+
+.fa-edit:before, .fa-trash-o:before {
+  font-family: FontAwesome;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/47724c7c/console/stand-alone/plugin/css/plugin.css
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/css/plugin.css b/console/stand-alone/plugin/css/plugin.css
index 90c44f5..5f0e285 100644
--- a/console/stand-alone/plugin/css/plugin.css
+++ b/console/stand-alone/plugin/css/plugin.css
@@ -703,92 +703,127 @@ ul.dispatch-view {
 
 span:not(.dynatree-has-children).address .dynatree-icon:before,
 span:not(.dynatree-has-children).router\.address .dynatree-icon:before {
-    content: "\f0ac";
+  font-family: FontAwesome;
+  content: "\f0ac";
 }
 span:not(.dynatree-has-children).address.mobile .dynatree-icon:before,
 span:not(.dynatree-has-children).router\.address.mobile .dynatree-icon:before {
-    content: "\f109";
+  font-family: FontAwesome;
+  content: "\f109";
 }
 span:not(.dynatree-has-children).address.internal.mobile .dynatree-icon:before,
 span:not(.dynatree-has-children).router\.address.internal.mobile .dynatree-icon:before {
-    content: "\f0ac";
+  font-family: FontAwesome;
+  content: "\f0ac";
 }
 span:not(.dynatree-has-children).address.router .dynatree-icon:before,
 span:not(.dynatree-has-children).router\.address.router .dynatree-icon:before {
-    content: "\f047";
+  font-family: FontAwesome;
+  content: "\f047";
 }
 
 span.address-link .dynatree-icon:before {
-    content: "\f0ac";
+  font-family: FontAwesome;
+  content: "\f0ac";
 }
 
 span:not(.dynatree-has-children).connection.external .dynatree-icon:before {
-    content: "\f109";
+  font-family: FontAwesome;
+  content: "\f109";
 }
 span:not(.dynatree-has-children).connection.normal .dynatree-icon:before {
-    content: "\f08e";
+  font-family: FontAwesome;
+  content: "\f08e";
 }
 span:not(.dynatree-has-children).connection.external.quiesced .dynatree-icon:before {
+  font-family: FontAwesome;
  content: "\f14c";
  color: red;
 }
 span:not(.dynatree-has-children).connection.inter-router .dynatree-icon:before {
-     content: "\f07e";
+  font-family: FontAwesome;
+   content: "\f07e";
+}
+span:not(.dynatree-has-children).connection.router-control .dynatree-icon:before {
+  font-family: FontAwesome;
+   content: "\f013";
 }
 span:not(.dynatree-has-children).no-data .dynatree-icon:before {
-     content: "\f05e";
-     color: red !important;
+  font-family: FontAwesome;
+  content: "\f05e";
+  color: red !important;
 }
 span:not(.dynatree-has-children).loading .dynatree-icon:before {
-     content: "\f254";
+  font-family: FontAwesome;
+  content: "\f254";
 }
 span:not(.dynatree-has-children).connector .dynatree-icon:before {
-     content: "\f126";
+  font-family: FontAwesome;
+  content: "\f126";
 }
 span:not(.dynatree-has-children).container .dynatree-icon:before {
-     content: "\f16c";
+  font-family: FontAwesome;
+  content: "\f16c";
 }
 span:not(.dynatree-has-children).log .dynatree-icon:before {
-     content: "\f0f6";
+  font-family: FontAwesome;
+  content: "\f0f6";
 }
 span:not(.dynatree-has-children).router\.node .dynatree-icon:before {
-     content: "\f013";
+  font-family: FontAwesome;
+  content: "\f013";
 }
 span:not(.dynatree-has-children).link.inter-router .dynatree-icon:before,
 span:not(.dynatree-has-children).router\.link.inter-router .dynatree-icon:before{
-     content: "\f07e";
+  font-family: FontAwesome;
+  content: "\f07e";
+}
+span:not(.dynatree-has-children).link.router-control .dynatree-icon:before,
+span:not(.dynatree-has-children).router\.link.router-control .dynatree-icon:before{
+  font-family: FontAwesome;
+  content: "\f013";
 }
 span:not(.dynatree-has-children).link.endpoint .dynatree-icon:before,
 span:not(.dynatree-has-children).router\.link.endpoint .dynatree-icon:before{
-     content: "\f109";
+  font-family: FontAwesome;
+  content: "\f109";
 }
 span:not(.dynatree-has-children).link.console .dynatree-icon:before,
 span:not(.dynatree-has-children).router\.link.console .dynatree-icon:before {
-     content: "\f108";
+  font-family: FontAwesome;
+  content: "\f108";
 }
 span:not(.dynatree-has-children).listener .dynatree-icon:before {
-     content: "\f025";
+  font-family: FontAwesome;
+  content: "\f025";
 }
 span:not(.dynatree-has-children).connection .dynatree-icon:before {
-     content: "\f07e";
+  font-family: FontAwesome;
+  content: "\f07e";
 }
 span:not(.dynatree-has-children).connection.console .dynatree-icon:before {
-     content: "\f108";
+  font-family: FontAwesome;
+  content: "\f108";
 }
 span:not(.dynatree-has-children).waypoint .dynatree-icon:before {
-     content: "\f0ec";
+  font-family: FontAwesome;
+  content: "\f0ec";
 }
 span:not(.dynatree-has-children).router .dynatree-icon:before {
-     content: "\f047";
+  font-family: FontAwesome;
+  content: "\f047";
 }
 span:not(.dynatree-has-children).fixedAddress .dynatree-icon:before {
-     content: "\f015";
+  font-family: FontAwesome;
+  content: "\f015";
 }
 span:not(.dynatree-has-children).linkRoutePattern .dynatree-icon:before {
-     content: "\f039";
+  font-family: FontAwesome;
+  content: "\f039";
 }
 span:not(.dynatree-has-children).allocator .dynatree-icon:before {
-     content: "\f170";
+  font-family: FontAwesome;
+  content: "\f170";
 }
 
 .ngCellText {

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/47724c7c/console/stand-alone/plugin/css/site-base.css
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/css/site-base.css b/console/stand-alone/plugin/css/site-base.css
index ec3a4d5..27aca28 100644
--- a/console/stand-alone/plugin/css/site-base.css
+++ b/console/stand-alone/plugin/css/site-base.css
@@ -4630,6 +4630,7 @@ span.dynatree-expander:before:hover
 
 span.dynatree-icon:before {
     background-position: 0px 0px;
+    font-family: FontAwesome;
     content: "\f013";
 }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]