From 5a72ca03471f54934894f7f4deb3043a6cc0177d Mon Sep 17 00:00:00 2001
From: marjohn56 <martin@queens-park.com>
Date: Mon, 26 Mar 2018 15:00:46 +0100
Subject: [PATCH] Rebellion Theme Release V1.0; closes #631

Updated for new jquery.tokenize.css
---
 misc/theme-rebellion/Makefile                 |  4 +-
 .../rebellion/build/css/jquery.tokenize.css   | 72 ++++++++++---------
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/misc/theme-rebellion/Makefile b/misc/theme-rebellion/Makefile
index 11cdede6d..d086ddb44 100644
--- a/misc/theme-rebellion/Makefile
+++ b/misc/theme-rebellion/Makefile
@@ -1,8 +1,6 @@
 PLUGIN_NAME=		theme-rebellion
-PLUGIN_VERSION=		0.2
-PLUGIN_REVISION=	6
+PLUGIN_VERSION=		1.0
 PLUGIN_COMMENT=		A suitably dark theme
 PLUGIN_MAINTAINER=	team-rebellion@queens-park.com
-PLUGIN_DEVEL=		yes
 
 .include "../../Mk/plugins.mk"
diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/jquery.tokenize.css b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/jquery.tokenize.css
index 0bf205243..4bd3d57ce 100644
--- a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/jquery.tokenize.css
+++ b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/jquery.tokenize.css
@@ -1,39 +1,44 @@
 div.TokenizeMeasure,
 div.Tokenize ul li span,
-div.Tokenize ul.TokensContainer li.TokenSearch input
-{
+div.Tokenize ul.TokensContainer li.TokenSearch input {
     font-family: Arial, Helvetica, sans-serif;
     font-size: 12px;
 }
 
-div.Tokenize
-{
+div.Tokenize {
     position: relative;
     display: inline-block;
     zoom: 1;
 }
 
-div.Tokenize ul
-{
+div.Tokenize ul {
     list-style: none;
     padding: 0;
     margin: 0;
 }
 
-div.Tokenize ul li
-{
+div.Tokenize ul li {
     white-space: nowrap;
 }
 
-div.Tokenize ul.TokensContainer
-{
+div.Tokenize ul.TokensContainer {
     cursor: text;
-    padding: 0 5px 0 0;
-    height:auto;
-    min-height:34px;
+    padding: 0 5px 5px 0;
+    height: auto;
+    min-height: 34px;
     max-height: 170px;
+    border-radius: 3px;
     overflow-y: auto;
-    background-color: Gainsboro;
+    background-color: #111;
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+div.Tokenize ul.TokensContainer.Autosize {
+    height: auto;
 }
 
 div.Tokenize.Disabled ul.TokensContainer,
@@ -41,16 +46,23 @@ div.Tokenize.Disabled ul.TokensContainer input {
     cursor: not-allowed;
 }
 
-div.Tokenize ul.TokensContainer li.Token
-{
+div.Tokenize ul.TokensContainer li.Token {
     border: 1px solid #ccd5e3;
     background-color: #911212;
     padding: 0 5px;
     line-height: 18px;
 }
 
-div.Tokenize ul.TokensContainer li.Token.PendingDelete
-{
+div.Tokenize ul.TokensContainer.ui-sortable:not(.ui-sortable-disabled) li.Token {
+    cursor: move;
+}
+
+div.Tokenize ul.TokensContainer li.Token.MovingShadow  {
+    border: 1px solid #fcefa1;
+    background-color: #fbf9ee;
+}
+
+div.Tokenize ul.TokensContainer li.Token.PendingDelete {
     opacity : 0.5;
     -moz-opacity : 0.5;
     -ms-filter: "alpha(opacity=50)";
@@ -58,15 +70,13 @@ div.Tokenize ul.TokensContainer li.Token.PendingDelete
 }
 
 div.Tokenize ul.TokensContainer li.Token,
-div.Tokenize ul.TokensContainer li.TokenSearch
-{
+div.Tokenize ul.TokensContainer li.TokenSearch {
     margin: 5px 0 0 5px;
     height: 18px;
     float: left;
 }
 
-div.Tokenize ul.TokensContainer li.TokenSearch input
-{
+div.Tokenize ul.TokensContainer li.TokenSearch input {
     margin: 0;
     padding: 1px 0;
     background-color: transparent;
@@ -84,13 +94,11 @@ div.Tokenize ul.TokensContainer li.Placeholder {
 }
 
 div.Tokenize ul.TokensContainer,
-div.Tokenize ul.Dropdown
-{
+div.Tokenize ul.Dropdown {
     border: 1px solid #ccc;
 }
 
-div.Tokenize ul.TokensContainer li.Token a.Close
-{
+div.Tokenize ul.TokensContainer li.Token a.Close {
     font-family: Arial, Helvetica, sans-serif !important;
     font-size: 16px !important;
     line-height: 18px;
@@ -105,14 +113,12 @@ div.Tokenize.Disabled ul.TokensContainer li.Token a.Close {
     display: none;
 }
 
-div.Tokenize ul.TokensContainer li.Token a.Close:hover
-{
+div.Tokenize ul.TokensContainer li.Token a.Close:hover {
     background: transparent;
     text-decoration: none;
 }
 
-div.Tokenize ul.Dropdown
-{
+div.Tokenize ul.Dropdown {
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     -ms-box-sizing: border-box;
@@ -145,15 +151,13 @@ div.Tokenize ul.Dropdown
     overflow-x: hidden;
 }
 
-div.Tokenize ul.Dropdown li
-{
+div.Tokenize ul.Dropdown li {
     padding: 5px 20px;
     overflow: hidden;
     cursor: pointer;
 }
 
-div.Tokenize ul.Dropdown li.Hover
-{
+div.Tokenize ul.Dropdown li.Hover {
     color: white;
     text-decoration: none;
     background-color: #0081c2;