diff --git a/build/uncompressed/collections/grid.css b/build/uncompressed/collections/grid.css index 2aef461f0..6c944f880 100644 --- a/build/uncompressed/collections/grid.css +++ b/build/uncompressed/collections/grid.css @@ -279,7 +279,7 @@ margin-left: 0% !important; margin-right: 0% !important; } -.ui.divided.grid > .column, +.ui.divided.grid > .column:not(.row), .ui.divided.grid > .row > .column { display: table-cell; -webkit-box-shadow: -1px 0px 0px 0px rgba(0, 0, 0, 0.1), -2px 0px 0px 0px rgba(255, 255, 255, 0.8); @@ -297,16 +297,16 @@ } /* Vertically Divided */ .ui.vertically.divided.grid > .row { - -webkit-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1), 0px -2px 0px 0px rgba(255, 255, 255, 0.8); - -moz-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1), 0px -2px 0px 0px rgba(255, 255, 255, 0.8); - box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1), 0px -2px 0px 0px rgba(255, 255, 255, 0.8); + -webkit-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1), 0px -2px 0px 0px rgba(255, 255, 255, 0.8) !important; + -moz-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1), 0px -2px 0px 0px rgba(255, 255, 255, 0.8) !important; + box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1), 0px -2px 0px 0px rgba(255, 255, 255, 0.8) !important; } .ui.vertically.divided.grid > .row > .column, -.ui.vertically.divided.grid > .column, +.ui.vertically.divided.grid > .column:not(.row), .ui.vertically.divided.grid > .row:first-child { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + -webkit-box-shadow: none !important; + -moz-box-shadow: none !important; + box-shadow: none !important; } /*---------------------- Celled diff --git a/build/uncompressed/collections/menu.css b/build/uncompressed/collections/menu.css index c23bbf767..6072e20ee 100644 --- a/build/uncompressed/collections/menu.css +++ b/build/uncompressed/collections/menu.css @@ -390,7 +390,7 @@ margin: 0em; } .ui.vertical.menu .dropdown.item .menu .item { - font-size: 0.875em; + font-size: 1em; padding: 0.75em 1em; } .ui.vertical.menu .dropdown.item .menu .item .icon { diff --git a/build/uncompressed/collections/message.css b/build/uncompressed/collections/message.css index d575cd078..fdc9674d5 100644 --- a/build/uncompressed/collections/message.css +++ b/build/uncompressed/collections/message.css @@ -70,7 +70,6 @@ .ui.message ul.list li { position: relative; list-style-type: none; - font-style: italic; margin: 0em 0em 0em 1em; padding: 0em; } diff --git a/build/uncompressed/elements/list.css b/build/uncompressed/elements/list.css new file mode 100644 index 000000000..f13e20fad --- /dev/null +++ b/build/uncompressed/elements/list.css @@ -0,0 +1,218 @@ +/* + * # Semantic List - Flat + * http://github.com/quirkyinc/semantic + * + * + * Copyright 2013 Contributors + * Released under the MIT license + * http://opensource.org/licenses/MIT + * + * Released: April 26 2013 + */ +/******************************* + List +*******************************/ +ul.ui.list, +.ui.list { + margin: 1em 0em; +} +ul.ui.list:first-child, +.ui.list:first-child { + margin-top: 1em; +} +ul.ui.list:last-child, +.ui.list:last-child { + margin-bottom: 0em; +} +ul.ui.list, +li:first-child, +.ui.list .item:first-child { + border-top: none; +} +/******************************* + Content +*******************************/ +/* List Item */ +ul.ui.list li, +.ui.list .item { + display: list-item; + list-style-type: none; + list-style-position: inside; + padding: 0.3em 0em; + line-height: 1.2; +} +/* Icon */ +.ui.list .icon { + margin: 0em 0.5em 0em 0em; +} +/* Link */ +ul.ui.list a, +.ui.list a { + cursor: pointer; +} +.ui.list a .icon { + color: rgba(0, 0, 0, 0.6); + -webkit-transition: color 0.2s ease; + -moz-transition: color 0.2s ease; + -o-transition: color 0.2s ease; + -ms-transition: color 0.2s ease; + transition: color 0.2s ease; +} +/* Header */ +.ui.list .header { + font-weight: bold; +} +/******************************* + Types +*******************************/ +/******************************* + States +*******************************/ +/*------------------- + Hover +--------------------*/ +.ui.list a:hover .icon { + color: rgba(0, 0, 0, 0.8); +} +/******************************* + Variations +*******************************/ +/*------------------- + Bulleted +--------------------*/ +ul.ui.bulleted.list, +.ui.bulleted.list { + margin-left: 1.5em; +} +ul.ui.bulleted.list li, +.ui.bulleted.list .item { + position: relative; +} +ul.ui.bulleted.list li:before, +.ui.bulleted.list .item:before { + position: absolute; + top: 0.4em; + left: -1.5em; + content: '\25CF'; + font-size: 0.8em; + line-height: 1.2rem; + vertical-align: top; + color: rgba(0, 0, 0, 0.6); +} +/*------------------- + Ordered +--------------------*/ +ol.ui.list, +ul.ui.ordered.list, +.ui.ordered.list { + counter-reset: ordered; + margin-left: 2em; +} +ol.ui.list li, +ul.ui.ordered.list li, +.ui.ordered.list .item { + counter-increment: ordered; + position: relative; +} +ol.ui.list li:before, +ul.ui.ordered.list li:before, +.ui.ordered.list .item:before { + position: absolute; + top: 0.4em; + left: -2em; + content: counter(ordered); + width: 0.8em; + margin-right: 0.5rem; + border-right: 1px solid rgba(0, 0, 0, 0.1); + padding-right: 0.5em; + text-align: right; + line-height: 1.2rem; + vertical-align: top; + opacity: 0.8; +} +/*------------------- + Divided +--------------------*/ +ul.ui.divided.list li, +.ui.divided.list .item { + border-top: 1px solid rgba(0, 0, 0, 0.1); + padding-left: 0.5em; + padding-right: 0.5em; +} +ul.ui.divided.list, +li:first-child, +.ui.divided.list .item:first-child { + border-top: none; +} +/* Divided bulleted */ +ul.ui.divided.bulleted.list, +.ui.divided.bulleted.list { + margin-left: 0em; +} +ul.ui.divided.bulleted.list li, +.ui.divided.bulleted.list .item { + padding-left: 1.5em; +} +ul.ui.divided.bulleted.list li:before, +.ui.divided.bulleted.list .item:before { + left: 0em; +} +/* Divided ordered */ +ol.ui.divided.list, +ul.ui.divided.ordered.list, +.ui.divided.ordered.list { + margin-left: 0em; +} +ol.ui.divided.list li, +ul.ui.divided.ordered.list li, +.ui.divided.ordered.list .item { + padding-left: 2em; +} +ol.ui.divided.list li:before, +ul.ui.divided.ordered.list li:before, +.ui.divided.ordered.list .item:before { + left: 0em; +} +/*------------------- + Celled +--------------------*/ +ul.ui.celled.list li, +.ui.celled.list .item { + border-top: 1px solid rgba(0, 0, 0, 0.1); + padding-left: 0.5em; + padding-right: 0.5em; +} +ul.ui.celled.list, +li:last-child, +.ui.celled.list .item:last-child { + border-bottom: 1px solid rgba(0, 0, 0, 0.1); +} +/* Celled Bulleted */ +ul.ui.celled.bulleted.list, +.ui.celled.bulleted.list { + margin-left: 0em; +} +ul.ui.celled.bulleted.list li, +.ui.celled.bulleted.list .item { + padding-left: 1.5em; +} +ul.ui.celled.bulleted.list li:before, +.ui.celled.bulleted.list .item:before { + left: 0em; +} +/* Celled Ordered */ +ol.ui.celled.list, +ul.ui.celled.ordered.list, +.ui.celled.ordered.list { + margin-left: 0em; +} +ol.ui.celled.list li, +ul.ui.celled.ordered.list li, +.ui.celled.ordered.list .item { + padding-left: 2em; +} +ol.ui.celled.list li:before, +ul.ui.celled.ordered.list li:before, +.ui.celled.ordered.list .item:before { + left: 0em; +} diff --git a/node/package.json b/node/package.json index 2452c0c70..537ea95b7 100755 --- a/node/package.json +++ b/node/package.json @@ -4,6 +4,6 @@ "version": 0.1 }, "dependencies": { - "docpad": "~6.48.1" + "docpad": "~6.49.0" } } diff --git a/node/src/documents/collections/grid.html b/node/src/documents/collections/grid.html index 09ee31357..5482d7eab 100755 --- a/node/src/documents/collections/grid.html +++ b/node/src/documents/collections/grid.html @@ -57,7 +57,6 @@ type : 'UI Collection'

Rows

A row is used to create vertical padding between groups of columns on a page. If no rows are specified columns will sit flush vertically.

-

@@ -339,6 +338,33 @@ type : 'UI Collection'
+
+

Vertically Divided Grid

+

A grid can have dividers between rows

+
+
+
+

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec odio. Quisque volutpat mattis eros. Nullam malesuada erat ut turpis. Suspendisse urna nibh, viverra non, semper suscipit, posuere a, pede.

+
+
+

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec odio. Quisque volutpat mattis eros. Nullam malesuada erat ut turpis. Suspendisse urna nibh, viverra non, semper suscipit, posuere a, pede.

+
+
+
+
+

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec odio. Quisque volutpat mattis eros. Nullam malesuada erat ut turpis. Suspendisse urna nibh, viverra non, semper suscipit, posuere a, pede.

+
+
+

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec odio. Quisque volutpat mattis eros. Nullam malesuada erat ut turpis. Suspendisse urna nibh, viverra non, semper suscipit, posuere a, pede.

+
+
+

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec odio. Quisque volutpat mattis eros. Nullam malesuada erat ut turpis. Suspendisse urna nibh, viverra non, semper suscipit, posuere a, pede.

+
+
+
+
+ +

Celled Grid

A grid can have rows divided into cells

@@ -782,7 +808,7 @@ type : 'UI Collection'

Row Alignment (Floating)

-

A column can be"floated", to either the left or right of its row.

+

A column can be "floated", to either the left or right of its row.

Column Width

-

A column can span across multiple grid columns.

+

A column can vary in width taking up more than a single grid column.

Colume One Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum iaculis sapien.
diff --git a/node/src/documents/collections/menu.html b/node/src/documents/collections/menu.html index 6e908b7f0..6b3674bc9 100755 --- a/node/src/documents/collections/menu.html +++ b/node/src/documents/collections/menu.html @@ -47,7 +47,14 @@ type : 'UI Collection' More
diff --git a/node/src/documents/elements/button.html b/node/src/documents/elements/button.html index ffcf1374b..02870b1f3 100755 --- a/node/src/documents/elements/button.html +++ b/node/src/documents/elements/button.html @@ -10,8 +10,8 @@ type : 'UI Element'

Button -
Buttons indicate a possible user action.

+

Buttons indicate a possible user action.

@@ -24,7 +24,7 @@ type : 'UI Element' Groups
-

Standard

+

Types

Basic:

diff --git a/node/src/documents/elements/list.html b/node/src/documents/elements/list.html new file mode 100755 index 000000000..ff758c457 --- /dev/null +++ b/node/src/documents/elements/list.html @@ -0,0 +1,156 @@ +--- +layout : 'default' +css : 'list' +title : 'List' +type : 'UI Collection' +--- + +
+
+

+ List +

+

A list is a group of related items ordered consecutively.

+
+
+
+ +
+ +
+ +

Standard

+
+

List

+

A standard list

+
+
New York City
+
Chicago
+
Los Angeles
+
San Francisco
+
+
+ + + +

Content

+ + + +
+

Header

+

A list can contain a header

+
+
+
New York City
+ A lovely city +
+
+
Chicago
+ Also quite a lovely city +
+
+
Los Angeles
+ Sometimes can be a lovely city +
+
+
San Francisco
+ What a lovely city +
+
+
+ +

States

+ + +

Variations

+ +
+

Bulleted

+

A list can mark items with a bullet

+
+
New York City
+
Chicago
+
Los Angeles
+
San Francisco
+
+
+ +
+

Ordered

+

A list can be ordered numerically

+
+
New York City
+
Chicago
+
Los Angeles
+
San Francisco
+
Detroit
+
Richmond
+
Nashville
+
St Louis
+
Kansas City
+
Oakland
+
Virginia Beach
+
+
+ +
+

Divided

+

A list can show divisions between content

+
+
New York City
+
Chicago
+
Los Angeles
+
San Francisco
+
+
+ +
+

Celled

+

A list can divide its items into cells

+
+
New York City
+
Chicago
+
Los Angeles
+
San Francisco
+
+
+ + + +
\ No newline at end of file diff --git a/node/src/documents/index.html b/node/src/documents/index.html index d2cd5b6ae..294ff9bdf 100755 --- a/node/src/documents/index.html +++ b/node/src/documents/index.html @@ -1,7 +1,7 @@ --- layout : 'default' css : 'index' -title : 'Introduction' +title : 'Getting Started' type : 'Semantic' --- @@ -21,8 +21,9 @@ type : 'Semantic'

Comparing UI Frameworks

-

3 column grid

-
+
+
+

3 column grid

Semantic
@@ -54,9 +55,8 @@ type : 'Semantic'
-
-

Navigation Menu

-
+
+

Navigation Menu

Semantic
@@ -86,9 +86,8 @@ type : 'Semantic'
-
-

Buttons

-
+
+

Buttons

Semantic
@@ -109,5 +108,6 @@ type : 'Semantic'
+
\ No newline at end of file diff --git a/node/src/documents/index_old.html b/node/src/documents/index_old.html index fa24748fe..0eef13c91 100755 --- a/node/src/documents/index_old.html +++ b/node/src/documents/index_old.html @@ -2,7 +2,7 @@ layout : 'default' css : 'index' title : 'Introduction' -type : 'Semantic' +type : 'Not Used' --- diff --git a/node/src/documents/introduction/definitions.html b/node/src/documents/introduction/definitions.html index 7adf03f96..9f2a05ffa 100755 --- a/node/src/documents/introduction/definitions.html +++ b/node/src/documents/introduction/definitions.html @@ -26,26 +26,40 @@ type : 'UI Introduction'

Defining Definitions

-

Definitions in semantic are groups of css, fonts, images, and javascript which make up a single element on a page. A UI definition is portable, and stand-alone

+

Definitions in semantic are groups of css, fonts, images, and javascript which make up a single element. Unlike other javascript libraries, semantic UI elements are stand-alone and only require their own assets to function correctly.

-

Definitions avoid conflicts with other elements by descending rules from a common namespace.

+

CSS Definitions avoid conflicts with other elements by descending rules from a common ui namespace. UI namespaces should use a single word class name that represents its function descriptively on a web site. For example, a button will be namespaced in html using the class name "ui button".

+

Definition Types

Semantic has five different ui definitions. These are useful patterns for describing re-usable parts of a website.

-
    -
  • Element - a basic building block of a website, exists alone or in homogenous groups
  • -
  • Collection - a heterogeneous group of several elements which are usually found together
  • -
  • View - a way to present common website content
  • -
  • Module - an element that also includes behavior as part of its definition
  • -
  • Behavior - a set of behaviors not specfically tied to a design
  • -
+ + + + + + + + + + + + + + + + + + + + + +
Element a basic building block of a website, exists alone or in homogenous groups
Collection a heterogeneous group of several elements which are usually found together
View a way to present common website content
Module an element that also includes behavior as part of its definition
Behavior a set of behaviors not specfically tied to a design

UI Elements

-

UI Elements are interface elements which do not contain other elements inside themselves. This can be thought of as similar in definition as an "element" in chemistry.

- -

UI elements can have plural definitions when they are known to exist together frequently.

+

UI Elements are page elements which are indivisible. This can be thought of as similar in definition as an "element" in chemistry.

-

In this case each button will be large because we understand it is a part of the large button group

+

UI elements can have plural definitions when they are known to exist together in groups. Plural variations allow you to only specify qualities once, allowing them to be inferred across all members of a group.

@@ -55,19 +69,46 @@ type : 'UI Introduction'
Examples of UI elements: -
    -
  • Buttons
  • -
  • Labels
  • -
  • Headers
  • -
  • Progress bars
  • -
- + + + + + + + + + + + + + + + + + + + + + +
Button +
Button
+
Label +
label
+
Input +
+ +
+
Loader +
+
Segment +
Segment
+

UI Collections

-

UI Collections are groups of heteregeneous UI elements which are usually found together. Carrying the chemistry metaphor, these can be thought of as molecules.

+

UI Collections are groups of heteregeneous page elements which are usually found together. Carrying the chemistry metaphor, these can be thought of as molecules.

-

UI collections have a definition of elements that exist, or could exist inside of them. They do not usually require all elements to be found, but they describe a list of the "usual suspects". Unlike elements, collections are not typically useful to define in plural.

+

UI collections have a definition of elements that exist, or could exist inside of them. They do not usually require all elements to be found, but they describe a list of the "usual suspects". Unlike elements definitions, collections are not typically useful to define in plural.

Examples of UI collections:

    diff --git a/node/src/documents/introduction/types.html b/node/src/documents/introduction/types.html index e79c36558..04ea1fae3 100755 --- a/node/src/documents/introduction/types.html +++ b/node/src/documents/introduction/types.html @@ -12,7 +12,7 @@ type : 'UI Introduction'
    Draft
    Incomplete
    -

    Types are exclusive versions of an element included in its definition

    +

    Types are exclusive versions of an element that very from its prototype or standard definition

@@ -27,7 +27,7 @@ type : 'UI Introduction'

A type is a mutually exclusive change to an element. Types may require different html structures to work correctly, or expect different content.

Content

-

For example an icon menu might expect you to include glyphs instead of text to be formatted correctly

+

An icon menu might expect you to include glyphs instead of text to be formatted correctly

HTML Differences

-

Types may also require different html to be formatted correctly. A tiered menu needs additional content like a sub menu to display itself correctly

+

Types may also require different html. For example, a tiered menu needs html specified for a sub menu to display itself correctly