From 24d108e15c38ca572d5339a39cb110d9067c0b3d Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 4 Jul 2014 15:36:41 +0200
Subject: backport bootstraps 3.2s list-inline

list-unstyled comes for free
---
 app/assets/stylesheets/application.scss |  2 ++
 app/assets/stylesheets/backport.scss    | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 app/assets/stylesheets/backport.scss

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 28206b1..9cd3a55 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -11,6 +11,8 @@
 //
 @import "bootstrap";
 @import "bootstrap-responsive";
+// backport bootstrap 3.2 features
+@import "backport";
 
 //
 // LEAP web app specific overrides
diff --git a/app/assets/stylesheets/backport.scss b/app/assets/stylesheets/backport.scss
new file mode 100644
index 0000000..cadb035
--- /dev/null
+++ b/app/assets/stylesheets/backport.scss
@@ -0,0 +1,24 @@
+//
+// Backporting styles from bootstrap 3.2
+//
+
+
+// List options
+
+// Unstyled keeps list items block level, just removes default browser padding and list-style
+.list-unstyled {
+  padding-left: 0;
+  list-style: none;
+}
+
+// Inline turns list items into inline-block
+.list-inline {
+  @extend .list-unstyled;
+  margin-left: -5px;
+
+  > li {
+    display: inline-block;
+    padding-left: 5px;
+    padding-right: 5px;
+  }
+}
-- 
cgit v1.2.3


From 87e9ccbcdf4f99dd898b0715750092a27fff7e94 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 4 Jul 2014 15:40:54 +0200
Subject: Enable unblocking handles in identities tab

There's an identities tab now for admins that will allow unblocking blocked handles. It should be easy to expand for aliases and forwards and other types of actions such as editing.
---
 app/assets/stylesheets/leap.scss | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'app/assets/stylesheets')

diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index 77104e5..3b7075c 100644
--- a/app/assets/stylesheets/leap.scss
+++ b/app/assets/stylesheets/leap.scss
@@ -144,6 +144,27 @@ input, textarea {
   }
 }
 
+//
+// IDENTITIES
+//
+
+// Color code for the identity labels
+.identity{
+  &.main_email .label {
+    @extend .label-info
+  }
+  &.alias .label {
+    @extend .label-success
+  }
+  &.forward .label {
+    @extend .label-warning
+  }
+  &.disabled .label {
+    @extend .label-default
+  }
+}
+
+
 //
 // BORING DEFAULT MASTHEAD
 //
-- 
cgit v1.2.3