From 387f14ce178cf3bb2b2250c7b11f4ef4282d0bd6 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Thu, 30 Jul 2015 19:46:30 +1000 Subject: [PATCH] Revision to UI docs, minor pixel adjustment to fixed dd --- .../partials/_markdowneditor.htm | 26 +- modules/system/assets/ui/docs/flag.md | 472 +++++++++--------- modules/system/assets/ui/docs/form.md | 38 +- modules/system/assets/ui/docs/toolbar.md | 54 ++ modules/system/assets/ui/js/dropdown.js | 4 +- 5 files changed, 339 insertions(+), 255 deletions(-) diff --git a/modules/backend/formwidgets/markdowneditor/partials/_markdowneditor.htm b/modules/backend/formwidgets/markdowneditor/partials/_markdowneditor.htm index 84d640304..21465ddae 100644 --- a/modules/backend/formwidgets/markdowneditor/partials/_markdowneditor.htm +++ b/modules/backend/formwidgets/markdowneditor/partials/_markdowneditor.htm @@ -11,8 +11,17 @@
+ +
- +
- - + + + + + + -
diff --git a/modules/system/assets/ui/docs/flag.md b/modules/system/assets/ui/docs/flag.md index 50ae451cc..65db65d8b 100644 --- a/modules/system/assets/ui/docs/flag.md +++ b/modules/system/assets/ui/docs/flag.md @@ -2,240 +2,240 @@ Provides flags of various descriptions # Example - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/system/assets/ui/docs/form.md b/modules/system/assets/ui/docs/form.md index 53e2231c7..0ebb82f6b 100644 --- a/modules/system/assets/ui/docs/form.md +++ b/modules/system/assets/ui/docs/form.md @@ -1,6 +1,25 @@ -Renders a form +# Form -# Example +## Types + +
+
+ + +
+ +
+ + +
+ +
+ + +
+
+ +### Complete example
@@ -8,14 +27,14 @@ Renders a form
- +

Example below help text here.

- +

Example below help text here.

@@ -23,7 +42,7 @@ Renders a form

Example above help text here.

- +
@@ -40,7 +59,6 @@ Renders a form
-
-
+ diff --git a/modules/system/assets/ui/docs/toolbar.md b/modules/system/assets/ui/docs/toolbar.md index 920a20d81..18bb78b7f 100644 --- a/modules/system/assets/ui/docs/toolbar.md +++ b/modules/system/assets/ui/docs/toolbar.md @@ -4,6 +4,8 @@ Toolbar # Example +

Basic toolbar

+
@@ -29,4 +31,56 @@ Toolbar
+
+ +

Editor toolbar

+ +
+
+
+ + +
+ + +
+ + + + + + + + + + + +
+
+
+ + +
\ No newline at end of file diff --git a/modules/system/assets/ui/js/dropdown.js b/modules/system/assets/ui/js/dropdown.js index 9e51faccb..812c88360 100644 --- a/modules/system/assets/ui/js/dropdown.js +++ b/modules/system/assets/ui/js/dropdown.js @@ -116,9 +116,9 @@ $dropdown.css({ position: 'fixed', - top: position.top - $(window).scrollTop() + $target.outerHeight(), + top: position.top - 1 - $(window).scrollTop() + $target.outerHeight(), left: position.left - }) + }) } $(document).on('shown.bs.dropdown', '.dropdown.dropdown-fixed', function(event, eventData) {