summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2014-07-04 15:36:41 +0200
committerAzul <azul@leap.se>2014-07-05 10:21:07 +0200
commit24d108e15c38ca572d5339a39cb110d9067c0b3d (patch)
treeb414c21a49d6635f2bb9ea06f3cce179cd80d005 /app
parentaddab2e939935201bb5a7d7a2070a3d340f8d376 (diff)
backport bootstraps 3.2s list-inline
list-unstyled comes for free
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/application.scss2
-rw-r--r--app/assets/stylesheets/backport.scss24
2 files changed, 26 insertions, 0 deletions
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;
+ }
+}