From 9c3dbd4a9bd6b08ac3e1ea2ff83372ee7d5930bf Mon Sep 17 00:00:00 2001 From: jlukic Date: Wed, 1 Oct 2014 13:17:15 -0400 Subject: [PATCH] Adds tabs to icons, fixes some doc text --- server/documents/collections/message.html.eco | 2 +- server/documents/elements/divider.html.eco | 32 +-- server/documents/elements/icon.html.eco | 190 +++++++++--------- server/documents/index.html.eco | 20 +- server/files/javascript/home.js | 12 +- server/files/stylesheets/home.css | 12 +- server/layouts/default.html.eco | 2 +- 7 files changed, 137 insertions(+), 133 deletions(-) diff --git a/server/documents/collections/message.html.eco b/server/documents/collections/message.html.eco index 016582a0e..bce1f3a5e 100755 --- a/server/documents/collections/message.html.eco +++ b/server/documents/collections/message.html.eco @@ -201,7 +201,7 @@ themes : ['Default', 'GitHub', 'Google']

A message may be formatted to display a positive message.

- Positive/Success and Negative/Error nessages by default use similar colors, but each has their own color variables that can be distinguished in your theme. + Positive/Success and Negative/Error messages by default use similar colors, but each has their own color variables that can be distinguished in your theme.
diff --git a/server/documents/elements/divider.html.eco b/server/documents/elements/divider.html.eco index 8b0c74076..9c664f76b 100755 --- a/server/documents/elements/divider.html.eco +++ b/server/documents/elements/divider.html.eco @@ -70,23 +70,25 @@ themes : ['default']

A divider can segment content horizontally

Horizontal dividers can also be used in combination with header and icons to create different styles of dividers.
-
Dividers in Semantic 1.0 will automatically vary the size of their rules to match the length of your text
-
-
- -
- - +
Dividers will automatically vary the size of their dividing rules to match the length of your text
+
+
+
+ +
+ + +
+
Search
+
+
+ Or +
+
+ Create New Order +
-
Search
-
-
- Or -
-
- Create New Order -
diff --git a/server/documents/elements/icon.html.eco b/server/documents/elements/icon.html.eco index 8c8eaeb6b..523163c5c 100755 --- a/server/documents/elements/icon.html.eco +++ b/server/documents/elements/icon.html.eco @@ -12,21 +12,19 @@ type : 'UI Element' themes : ['Default'] --- -<%- @partial('header') %> +<%- @partial('header', { tabs: { icons: 'Icons', definition: 'Definition' } }) %>
-

Types

+
-

Icon Set

-

An icon sets contains an arbitrary number of glyphs

-
- Icons serve a very similar function to text in a page. In Semantic icons receive a special tag <i> which allow for an abbreviated markup when sitting along-side text. -
- -
Semantic includes a complete port of Font Awesome designed by Dave Gandy for its standard icon set.
+

Icon Set

+

An icon sets contains an arbitrary number of glyphs

+
+ Icons serve a very similar function to text in a page. In Semantic icons receive a special tag <i> which allow for an abbreviated markup when sitting along-side text. +
-
+
Semantic includes a complete port of Font Awesome designed by Dave Gandy for its standard icon set.

Web Content

Icons can represent types of content found on websites

@@ -1064,107 +1062,109 @@ themes : ['Default']
+
-

States

+

States

-
-

Disabled

-

An icon can show that it is disabled

- -
+
+

Disabled

+

An icon can show that it is disabled

+ +
-
-

Loading

-

An icon can be used as a simple loader

- - - -
+
+

Loading

+

An icon can be used as a simple loader

+ + + +
-

Variations

+

Variations

-
-

Size

-

An icon can vary in size

- -
- -
- -
- -
- -
- -
+
+

Size

+

An icon can vary in size

+ +
+ +
+ +
+ +
+ +
+ +
-
-

Link

-

An icon can be formatted as a link

- - -
+
+

Link

+

An icon can be formatted as a link

+ + +
-
-

Flipped

-

An icon can be flipped

- - -
+
+

Flipped

+

An icon can be flipped

+ + +
-
-

Rotated

-

An icon can be rotated

- - -
+
+

Rotated

+

An icon can be rotated

+ + +
-
-

Circular

-

An icon can be formatted to appear circular

- - - - -
+
+

Circular

+

An icon can be formatted to appear circular

+ + + + +
+ +
+

Bordered

+
+ In 0.x.x bordered was formally known as squared +
+

An icon can be formatted to appear bordered

+ + + + +
-
-

Bordered

-
- In 0.x.x bordered was formally known as squared +
+

Colors

+

An icon can be formatted with different colors

+ + + + + +
-

An icon can be formatted to appear bordered

- - - - -
-
-

Colors

-

An icon can be formatted with different colors

- - - - - - -
+
+

Inverted

+

an icon can have its colors inverted for contrast

+ + + + + + +
-
-

Inverted

-

an icon can have its colors inverted for contrast

- - - - - -
-
\ No newline at end of file diff --git a/server/documents/index.html.eco b/server/documents/index.html.eco index d2c18a4a3..9dc27a14e 100755 --- a/server/documents/index.html.eco +++ b/server/documents/index.html.eco @@ -13,11 +13,8 @@ type : 'Semantic'
- - Version 1.0.0 Beta -
-