From fc75c809bba75fcc975d468a23559d853827f66a Mon Sep 17 00:00:00 2001 From: jlukic Date: Tue, 12 Aug 2014 18:08:10 -0400 Subject: [PATCH] Modify some ui descriptions, fix container max-height and spacing --- .../documents/collections/breadcrumb.html.eco | 2 +- server/documents/collections/table.html.eco | 2 +- server/documents/elements/icon.html.eco | 2 +- server/documents/elements/input.html.eco | 3 ++- server/documents/elements/progress.html.eco | 2 +- server/documents/elements/step.html.eco | 2 +- server/documents/modules/dropdown.html.eco | 2 +- server/documents/modules/form.html.eco | 6 +++--- server/documents/modules/modal.html.eco | 2 +- server/documents/modules/reveal.html.eco | 2 +- server/documents/views/list.html.eco | 4 ++-- server/files/stylesheets/semantic.css | 18 +++++++++--------- 12 files changed, 24 insertions(+), 23 deletions(-) diff --git a/server/documents/collections/breadcrumb.html.eco b/server/documents/collections/breadcrumb.html.eco index cc39b74ed..1eece9b0f 100755 --- a/server/documents/collections/breadcrumb.html.eco +++ b/server/documents/collections/breadcrumb.html.eco @@ -6,7 +6,7 @@ element : 'breadcrumb' elementType : 'collection' title : 'Breadcrumb' -description : 'A breadcrumb is used to display the relation of the current section to other sections of the site.' +description : 'A breadcrumb is used to display the relation of the current content to other content.' type : 'UI Collection' themes : ['Default'] --- diff --git a/server/documents/collections/table.html.eco b/server/documents/collections/table.html.eco index c40dcf50d..107148c9f 100755 --- a/server/documents/collections/table.html.eco +++ b/server/documents/collections/table.html.eco @@ -3,7 +3,7 @@ layout : 'default' css : 'table' title : 'Table' -description : 'Tables display collections of data grouped into rows' +description : 'Tables display collections of related data grouped into rows' type : 'UI Collection' element : 'table' diff --git a/server/documents/elements/icon.html.eco b/server/documents/elements/icon.html.eco index fe49b0659..1ded24a78 100755 --- a/server/documents/elements/icon.html.eco +++ b/server/documents/elements/icon.html.eco @@ -2,7 +2,7 @@ layout : 'default' css : 'icon' title : 'Icon' -description : 'An icon is a glyph used to represent another concept more simply' +description : 'An icon is a glyph used to represent a concept' type : 'UI Element' element : 'icon' diff --git a/server/documents/elements/input.html.eco b/server/documents/elements/input.html.eco index 8c35ac002..07ae3f0ae 100755 --- a/server/documents/elements/input.html.eco +++ b/server/documents/elements/input.html.eco @@ -2,7 +2,7 @@ layout : 'default' css : 'input' title : 'Input' -description : 'Inputs allow a user to enter information' +description : 'An input allows a site to elicit user input' type : 'UI Element' element : 'input' @@ -11,6 +11,7 @@ themes : ['default'] --- <%- @partial('header') %> +
diff --git a/server/documents/elements/progress.html.eco b/server/documents/elements/progress.html.eco index 9ef058818..65ab9da29 100755 --- a/server/documents/elements/progress.html.eco +++ b/server/documents/elements/progress.html.eco @@ -2,7 +2,7 @@ layout : 'default' css : 'progress' title : 'Progress' -description : 'Progress bars show the percent of a task complete' +description : 'A progress bar shows the progression of a task' type : 'UI Element' --- diff --git a/server/documents/elements/step.html.eco b/server/documents/elements/step.html.eco index 66a29b947..c4d44e1d3 100755 --- a/server/documents/elements/step.html.eco +++ b/server/documents/elements/step.html.eco @@ -5,7 +5,7 @@ element : 'step' elementType : 'element' title : 'Step' -description : 'Steps show the current activity in a series of consecutive activities.' +description : 'Steps show the completion of activities that occur in a series' type : 'UI Element' themes : ['default', 'Basic', 'GitHub'] diff --git a/server/documents/modules/dropdown.html.eco b/server/documents/modules/dropdown.html.eco index 8f9a3ba24..e84f2e6ea 100755 --- a/server/documents/modules/dropdown.html.eco +++ b/server/documents/modules/dropdown.html.eco @@ -3,7 +3,7 @@ layout : 'default' css : 'dropdown' title : 'Dropdown' -description : 'A dropdown allows a user to select a value from a series of options.' +description : 'A dropdown allows a user to select a value from a series of options' type : 'UI Module' element : 'dropdown' diff --git a/server/documents/modules/form.html.eco b/server/documents/modules/form.html.eco index 4c6614f63..f99cbfcb8 100755 --- a/server/documents/modules/form.html.eco +++ b/server/documents/modules/form.html.eco @@ -247,7 +247,7 @@ type : 'UI Behavior'

Displaying Error Messages

Forms that contain a ui message error block will automatically be filled in with form validation information.

-
The template for error messages can be modified by adjusting settings.template.error
+
The template for error messages can be modified by adjusting settings.template.error

Let's go ahead and get you signed up.

@@ -283,7 +283,7 @@ type : 'UI Behavior'

Validating on Blur and other Events

Validation messages can also appear inline. UI Forms automatically format labels with the class name prompt. These validation prompts are also set to appear on input change instead of form submission.

-

This example also uses a different validation event. Each element will be validated on input blur instead of the default form submit.

+
This example also uses a different validation event. Each element will be validated on input blur instead of the default form submit.
$('.ui.dropdown') .form(validationRules, { @@ -494,7 +494,7 @@ type : 'UI Behavior' Templates
Templates are used to construct elements
-
Templates are found in settings.template, to modify templates across all forms, modify $.fn.form.settings.templates to include your function. They must return html.
+
Templates are found in settings.template, to modify templates across all forms, modify $.fn.form.settings.templates to include your function. They must return html.
diff --git a/server/documents/modules/modal.html.eco b/server/documents/modules/modal.html.eco index fab0b7019..a44b1106c 100755 --- a/server/documents/modules/modal.html.eco +++ b/server/documents/modules/modal.html.eco @@ -5,7 +5,7 @@ element : 'modal' elementType : 'module' title : 'Modal' -description : 'A modal displays content that temporarily blocks interactions with a web site' +description : 'A modal displays content that temporarily blocks interactions with other content' type : 'UI Module' themes : ['default', 'fixed-width'] diff --git a/server/documents/modules/reveal.html.eco b/server/documents/modules/reveal.html.eco index b7e608e5f..9b55df100 100755 --- a/server/documents/modules/reveal.html.eco +++ b/server/documents/modules/reveal.html.eco @@ -3,7 +3,7 @@ layout : 'default' css : 'reveal' title : 'Reveal' -description : 'A reveal is an element that shows different content below it when hovered' +description : 'A reveal hides additional content until a user engages content' type : 'UI Element' --- diff --git a/server/documents/views/list.html.eco b/server/documents/views/list.html.eco index 4fbeb0c0d..cfb80687a 100755 --- a/server/documents/views/list.html.eco +++ b/server/documents/views/list.html.eco @@ -5,7 +5,7 @@ element : 'list' elementType : 'view' title : 'List' -description : 'A list is used to group short descriptions of content' +description : 'A list is used to group descriptions of related content' type : 'UI View' themes : ['Default'] @@ -26,7 +26,7 @@ themes : ['Default']

Types

List

-

A standard list

+

A simple list

Apples
Pears
diff --git a/server/files/stylesheets/semantic.css b/server/files/stylesheets/semantic.css index bab3f31b2..70bea3999 100755 --- a/server/files/stylesheets/semantic.css +++ b/server/files/stylesheets/semantic.css @@ -94,7 +94,7 @@ h1 { border-bottom: 1px solid rgba(0, 0, 0, 0.1); } h4 + p { - margin: 0px 0px 20px; + margin: 0px 0px 1em; } pre { background-color: #F0F0F0; @@ -574,7 +574,7 @@ body.guide .main.container > * { #example .peek { position: absolute; top: 0px; - left: -280px; + left: -230px; width: 180px; /* -webkit-transition: padding 0.3s ease; @@ -724,7 +724,7 @@ body.guide .main.container > * { } #example .another.example { - margin-top: 0em; + margin-top: -1em; padding-top: 2em; border-top: none; } @@ -1069,9 +1069,8 @@ body.guide .main.container > * { clear: both; } #example .example { - margin: 1em 0em; + margin: 1em 0em 1.5em; padding: 1em 0em; - border-top: 1px solid rgba(0, 0, 0, 0.05); /* clear: both;*/ position: relative; } @@ -1301,11 +1300,12 @@ body.progress .ui.progress .bar { -@media only screen and (max-width : 1725px) { +@media only screen and (max-width : 1325px) { #example .container { width: auto; margin-right: 100px; margin-left: 325px; + max-width: 700px; } #example.index .container { margin-left: 8em; @@ -1470,12 +1470,12 @@ body.progress .ui.progress .bar { -@media only screen and (min-width : 1725px) { +@media only screen and (min-width : 1325px) { #example .container { - width: 1000px; + width: 850px; } #example .sticky-wrapper.stuck .peek { - margin-left: -780px; + margin-left: -655px; } #example.left.pushed .main.menu { margin-left: -132px;
Template