diff --git a/css/betternavigator.css b/css/betternavigator.css
index a3258bf..78b9196 100644
--- a/css/betternavigator.css
+++ b/css/betternavigator.css
@@ -24,24 +24,26 @@
span[class^='bn-icon'], span[class*=' bn-icon'] { display: inline-block; }
-#BetterNavigator { position: fixed; top: 0; right: 0; z-index: 99999; max-height: 100%; overflow: auto; background: #cfd8de; border: 1px solid #ecf0f2; border-width: 0 0 1px 1px; box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); font-family: Helvetica, Arial, sans-serif; font-size: 12px; text-align: left; }
-#BetterNavigator.collapsed { -moz-transform-origin: right top; -ms-transform-origin: right top; -webkit-transform-origin: right top; transform-origin: right top; -moz-transform: rotate(90deg) translate(100%, 0); -ms-transform: rotate(90deg) translate(100%, 0); -webkit-transform: rotate(90deg) translate(100%, 0); transform: rotate(90deg) translate(100%, 0); border-width: 0 1px 1px 0; }
+#BetterNavigator { position: fixed; top: 0; right: 0; z-index: 99999; max-height: 100%; overflow: auto; font-family: Helvetica, Arial, sans-serif; font-size: 12px; line-height: 16px; text-align: left; }
+#BetterNavigator a { text-decoration: none; }
+#BetterNavigator.collapsed { box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); -moz-transform-origin: right top; -ms-transform-origin: right top; -webkit-transform-origin: right top; transform-origin: right top; -moz-transform: rotate(90deg) translate(100%, 0); -ms-transform: rotate(90deg) translate(100%, 0); -webkit-transform: rotate(90deg) translate(100%, 0); transform: rotate(90deg) translate(100%, 0); border-width: 0 1px 1px 0; }
+#BetterNavigator.collapsed #BetterNavigatorStatus { border-width: 0 1px 1px 0; }
#BetterNavigator.collapsed #BetterNavigatorStatus .bn-icon-close { display: none; }
#BetterNavigator.collapsed #BetterNavigatorStatus .bn-icon-cog { display: inline-block; }
#BetterNavigator.collapsed #BetterNavigatorContent { display: none; }
-#BetterNavigatorStatus { color: #fff; background: #6f6f6f; text-transform: uppercase; cursor: pointer; padding: 10px 15px 8px; font-weight: bold; }
-#BetterNavigatorStatus.Live { background: #39b54a; }
-#BetterNavigatorStatus.Live:hover { background: #36ac46; }
-#BetterNavigatorStatus.Stage { background: #f26c4f; }
-#BetterNavigatorStatus.Stage:hover { background: #e6674b; }
+#BetterNavigatorStatus { color: #fff; background: #6f6f6f; border: 1px solid #646464; border-width: 0 0 0 1px; text-transform: uppercase; cursor: pointer; padding: 10px 15px 8px; font-weight: bold; }
#BetterNavigatorStatus .bn-icon-cog { margin: -4px 8px -4px -4px; display: none; }
#BetterNavigatorStatus .bn-icon-close { float: right; margin: 1px 0 0 0; }
#BetterNavigatorStatus .bn-icon-cog, #BetterNavigatorStatus .bn-icon-close { opacity: .7; }
#BetterNavigatorStatus:hover { background: dimgray; }
#BetterNavigatorStatus:hover .bn-icon-cog, #BetterNavigatorStatus:hover .bn-icon-close { opacity: 1; }
+#BetterNavigatorStatus.Live { background: #39b54a; border-color: #33a343; }
+#BetterNavigatorStatus.Live:hover { background: #36ac46; }
+#BetterNavigatorStatus.Stage { background: #f26c4f; border-color: #da6147; }
+#BetterNavigatorStatus.Stage:hover { background: #e6674b; }
-#BetterNavigatorContent { padding: 6px; color: #71767a; }
+#BetterNavigatorContent { padding: 6px; color: #71767a; background: #cfd8de; border: 1px solid #bac2c8; border-width: 0 0 1px 1px; }
#BetterNavigatorContent .bn-heading { text-align: center; text-transform: uppercase; font-size: 11px; margin: 8px 0 4px 0; }
#BetterNavigatorContent span[class^='bn-icon'], #BetterNavigatorContent span[class*=' bn-icon'] { margin: -2px 5px -3px -2px; }
#BetterNavigatorContent a, #BetterNavigatorContent span.bn-disabled { display: block; background: #eceff2; color: #313639; font-family: Helvetica, Arial, sans-serif; font-size: 12px; border-radius: 5px; border-bottom: 1px solid #a3aaaf; margin: 0 0 4px 0; padding: 6px 10px 5px 10px; line-height: 16px; font-weight: bold; }
diff --git a/css/betternavigator.css.map b/css/betternavigator.css.map
index 6250355..3a8a0e6 100644
--- a/css/betternavigator.css.map
+++ b/css/betternavigator.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": ";;AAmFQ,cAAsB,GAlE5B,mBAAmB,EAAE,GACJ,EAZjB,MAAM,EAAE,IAAwC,EAChD,KAAK,EAAE,IAAuC;;AA4ExC,YAAsB,GAlE5B,mBAAmB,EAAE,OACJ,EAZjB,MAAM,EAAE,IAAwC,EAChD,KAAK,EAAE,IAAuC;;AA4ExC,WAAsB,GAlE5B,mBAAmB,EAAE,OACJ,EAZjB,MAAM,EAAE,IAAwC,EAChD,KAAK,EAAE,IAAuC;;AA4ExC,gBAAsB,GAlE5B,mBAAmB,EAAE,OACJ,EAZjB,MAAM,EAAE,IAAwC,EAChD,KAAK,EAAE,IAAuC;;AA4ExC,aAAsB,GAlE5B,mBAAmB,EAAE,OACJ,EAZjB,MAAM,EAAE,IAAwC,EAChD,KAAK,EAAE,IAAuC;;AA4ExC,cAAsB,GAlE5B,mBAAmB,EAAE,OACJ,EAZjB,MAAM,EAAE,IAAwC,EAChD,KAAK,EAAE,IAAuC;;AA4ExC,aAAsB,GAlE5B,mBAAmB,EAAE,OACJ,EAZjB,MAAM,EAAE,IAAwC,EAChD,KAAK,EAAE,IAAuC;;AA4ExC,aAAsB,GAlE5B,mBAAmB,EAAE,QACJ,EAZjB,MAAM,EAAE,IAAwC,EAChD,KAAK,EAAE,IAAuC;;AA4ExC,cAAsB,GAlE5B,mBAAmB,EAAE,QACJ,EAZjB,MAAM,EAAE,IAAwC,EAChD,KAAK,EAAE,IAAuC;;AA4ExC,aAAsB,GAlE5B,mBAAmB,EAAE,QACJ,EAZjB,MAAM,EAAE,IAAwC,EAChD,KAAK,EAAE,IAAuC;;AA4ExC,aAAsB,GAlE5B,mBAAmB,EAAE,QACJ,EAZjB,MAAM,EAAE,IAAwC,EAChD,KAAK,EAAE,IAAuC;;ACAhD,+CAA8C,GAC5C,OAAO,EAAE,YAAY;;AAKvB,gBAAiB,GACb,QAAQ,EAAE,KAAK,EACf,GAAG,EAAE,CAAC,EACN,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,WAAW,EACzB,UAAU,EAAE,8BAA2B,EACvC,WAAW,EAAE,4BAA4B,EACzC,SAAS,EAAE,IAAI,EACf,UAAU,EAAE,IAAI;AAIhB,0BAAY,GC8Td,qBAAwC,EC5Nb,SAAiB,ED4N5C,oBAAwC,EC5Nb,SAAiB,ED4N5C,wBAAwC,EC5Nb,SAAiB,ED4N5C,gBAAwC,EC5Nb,SAAiB,ED4N5C,cAAwC,ED5Tf,gCAA+B,EC4TxD,aAAwC,ED5Tf,gCAA+B,EC4TxD,iBAAwC,ED5Tf,gCAA+B,EC4TxD,SAAwC,ED5Tf,gCAA+B,EAClD,YAAY,EAAE,WAAW;AAIrB,gEAAe,GACX,OAAO,EAAE,IAAI;AAEjB,8DAAa,GACT,OAAO,EAAE,YAAY;AAI7B,kDAAwB,GACpB,OAAO,EAAE,IAAI;;AAOzB,sBAAuB,GACnB,KAAK,EAAE,IAAI,EACX,UAAU,EAAE,OAAO,EACnB,cAAc,EAAE,SAAS,EACzB,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,IAAI;AAEjB,2BAAO,GACH,UAAU,EAAE,OAAO;AAEnB,iCAAQ,GACJ,UAAU,EAAE,OAAiB;AAIrC,4BAAQ,GACJ,UAAU,EAAE,OAAO;AAEnB,kCAAQ,GACJ,UAAU,EAAE,OAAiB;AAIrC,mCAAa,GACX,MAAM,EAAE,kBAAkB,EAC1B,OAAO,EAAE,IAAI;AAGf,qCAAe,GACb,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,SAAS;AAGnB,0EACe,GACb,OAAO,EAAE,EAAE;AAGb,4BAAQ,GACJ,UAAU,EAAE,OAAiB;AAE7B,sFACe,GACb,OAAO,EAAE,CAAC;;AAOpB,uBAAwB,GACpB,OAAO,EAAE,GAAG,EACZ,KAAK,EAAE,OAAO;AAEd,mCAAY,GACR,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,SAAS,EACzB,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,WAAW;AAGvB,+FAA8C,GAC5C,MAAM,EAAE,kBAAkB;AAG5B,mEACiB,GACb,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,OAAO,EACnB,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,4BAA4B,EACzC,SAAS,EAAE,IAAI,EACf,aAAa,EAAE,GAAG,EAClB,aAAa,EAAE,iBAAiB,EAChC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,iBAAiB,EAC1B,WAAW,EAAE,IAAI,EACjB,WAAW,EAAE,IAAI;AAEjB,iFAAO,GACH,WAAW,EAAE,MAAM;AAI3B,kGAES,GACL,UAAU,EAAE,IAAI,EAChB,KAAK,EAAE,IAAI;AAGf,wCAAiB,GACb,UAAU,EAAE,OAAO,EACnB,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,OAAO;;AAKvB,gBAAiB,GACb,UAAU,EAAE,IAAI,EAChB,UAAU,EAAE,IAAI,EAChB,KAAK,EAAE,IAAI,EACX,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,CAAC,EACT,aAAa,EAAE,cAAc,EAC7B,WAAW,EAAE,iBAAiB",
+"mappings": "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",
"sources": ["../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/utilities/sprites/_base.scss","../scss/betternavigator.scss","../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/_support.scss","../../../../../../Applications/CodeKit.app/Contents/Resources/engines/compass/compass-core/stylesheets/compass/css3/_transform.scss"],
"names": [],
"file": "betternavigator.css"
diff --git a/scss/betternavigator.scss b/scss/betternavigator.scss
index 9c843b1..da0c148 100644
--- a/scss/betternavigator.scss
+++ b/scss/betternavigator.scss
@@ -18,22 +18,25 @@ span[class^='bn-icon'],span[class*=' bn-icon']{
z-index: 99999;
max-height: 100%;
overflow: auto;
- background: #cfd8de;
- border: 1px solid #ecf0f2;
- border-width: 0 0 1px 1px;
- box-shadow: 0px 0px 3px rgba(0,0,0,0.5);
font-family: Helvetica, Arial, sans-serif;
font-size: 12px;
+ line-height: 16px;
text-align: left;
+ a {
+ text-decoration: none;
+ }
+
//Toggle states
&.collapsed {
+ box-shadow: 0px 0px 3px rgba(0,0,0,0.5);
@include transform-origin(right,top);
@include transform(rotate(90deg) translate(100%,0));
border-width: 0 1px 1px 0;
#BetterNavigatorStatus {
+ border-width: 0 1px 1px 0;
.bn-icon-close {
display: none;
@@ -51,30 +54,20 @@ span[class^='bn-icon'],span[class*=' bn-icon']{
//Status
+$liveColor: #39b54a;
+$stageColor: #f26c4f;
+$archiveColor: #6f6f6f;
+
#BetterNavigatorStatus {
color: #fff;
- background: #6f6f6f;
+ background: $archiveColor;
+ border: 1px solid shade($archiveColor, 10);
+ border-width: 0 0 0 1px;
text-transform: uppercase;
cursor: pointer;
padding: 10px 15px 8px;
font-weight: bold;
- &.Live {
- background: #39b54a;
-
- &:hover {
- background: shade(#39b54a, 5);
- }
- }
-
- &.Stage {
- background: #f26c4f;
-
- &:hover {
- background: shade(#f26c4f, 5);
- }
- }
-
.bn-icon-cog {
margin: -4px 8px -4px -4px;
display: none;
@@ -91,13 +84,31 @@ span[class^='bn-icon'],span[class*=' bn-icon']{
}
&:hover {
- background: shade(#6f6f6f, 5);
+ background: shade($archiveColor, 5);
.bn-icon-cog,
.bn-icon-close {
opacity: 1;
}
}
+
+ &.Live {
+ background: $liveColor;
+ border-color: shade($liveColor, 10);
+
+ &:hover {
+ background: shade($liveColor, 5);
+ }
+ }
+
+ &.Stage {
+ background: $stageColor;
+ border-color: shade($stageColor, 10);
+
+ &:hover {
+ background: shade($stageColor, 5);
+ }
+ }
}
//Content
@@ -105,6 +116,9 @@ span[class^='bn-icon'],span[class*=' bn-icon']{
#BetterNavigatorContent {
padding: 6px;
color: #71767a;
+ background: #cfd8de;
+ border: 1px solid shade(#cfd8de, 10);
+ border-width: 0 0 1px 1px;
.bn-heading {
text-align: center;
diff --git a/templates/BetterNavigator.ss b/templates/BetterNavigator.ss
index f4cd482..02c0bb2 100644
--- a/templates/BetterNavigator.ss
+++ b/templates/BetterNavigator.ss
@@ -22,14 +22,14 @@
<% with $BetterNavigator %>
<% if not $LiveLink.Active %>
<% if $LiveLink.Link %>
- View Published
+ View published
<% else %>
Not yet published
<% end_if %>
<% end_if %>
<% if not $StageLink.Active %>
<% if $StageLink.Link %>
- View Draft
+ View draft
<% else %>
Deleted from draft site
<% end_if %>
@@ -49,19 +49,19 @@
<% if $BetterNavigator.Mode=='dev' || $BetterNavigator.IsDeveloper %>
- Developer Tools
+ Developer tools
@@ -71,12 +71,12 @@