From 0b1d5522b664bf0e0bbc7cd0d882132309b8c26c Mon Sep 17 00:00:00 2001 From: Michal Gebauer Date: Mon, 13 Jan 2014 20:40:12 +0100 Subject: [PATCH 01/12] Doc: Added missing forward icon --- server/documents/elements/icon.html.eco | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/documents/elements/icon.html.eco b/server/documents/elements/icon.html.eco index 5c30f0b50..496a9098f 100755 --- a/server/documents/elements/icon.html.eco +++ b/server/documents/elements/icon.html.eco @@ -386,6 +386,7 @@ type : 'UI Element'

Icons can represent actions that occur on media

Backward
+
Forward
Eject
Fast Backward
Fast Forward
@@ -406,6 +407,7 @@ type : 'UI Element'
+ From b13e6b8f33c5afa350cc5a6fbb89986b41d11362 Mon Sep 17 00:00:00 2001 From: Michal Gebauer Date: Mon, 13 Jan 2014 20:45:36 +0100 Subject: [PATCH 02/12] Doc: Matched icon labels with classes --- server/documents/elements/icon.html.eco | 38 ++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/server/documents/elements/icon.html.eco b/server/documents/elements/icon.html.eco index 496a9098f..2881399c2 100755 --- a/server/documents/elements/icon.html.eco +++ b/server/documents/elements/icon.html.eco @@ -192,7 +192,7 @@ type : 'UI Element'
Filter
Flag
Fork Code
-
Forward
+
Forward Mail
Fullscreen
Hide
Level Down
@@ -203,8 +203,8 @@ type : 'UI Element'
Remove
Remove Sign
Reorder
-
Reply All
-
Reply
+
Reply All Mail
+
Reply Mail
Retweet
Save
Screenshot
@@ -273,7 +273,7 @@ type : 'UI Element'
Block Layout
Column Layout
-
Grid
+
Grid Layout
List Layout
Resize Full
Resize Horizontal
@@ -650,10 +650,10 @@ type : 'UI Element'
Arrow Sign Left
Arrow Sign Right
Arrow Sign Up
-
Circle Arrow Left
-
Circle Arrow Right
-
Circle Arrow Up
-
Circle Down Arrow
+
Circle Left
+
Circle Right
+
Circle Up
+
Circle Down
Circle Blank
Circle
Double Angle Down
@@ -699,11 +699,11 @@ type : 'UI Element' - - - + + + - + @@ -728,13 +728,13 @@ type : 'UI Element'

Currency

Icons can represent units of currency

-
US Dollar
+
Dollar
Euro
-
British Pound
+
Pound
Rupee
-
Korean Won
-
Japanese Yen
-
Chinese Yuan
+
Won
+
Yen
+
Yuan
@@ -1140,7 +1140,7 @@ type : 'UI Element'

Symbols

Icons can represent common symbols

-
Left Open
+
Left Arrow
Left Triangle
Left
Right
@@ -1151,7 +1151,7 @@ type : 'UI Element'
Up Arrow
Down Arrow
Down Triangle
-
Down Arrow
+
Down
Cube
Minus
Plus
From 441dd6344f5b5d8877faa0cfa6dfd9f2ccd530dd Mon Sep 17 00:00:00 2001 From: Michal Gebauer Date: Mon, 13 Jan 2014 20:53:06 +0100 Subject: [PATCH 03/12] Doc: Synchronized icons label and class word order --- server/documents/elements/icon.html.eco | 58 ++++++++++++------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/server/documents/elements/icon.html.eco b/server/documents/elements/icon.html.eco index 2881399c2..08a8d80a3 100755 --- a/server/documents/elements/icon.html.eco +++ b/server/documents/elements/icon.html.eco @@ -60,8 +60,8 @@ type : 'UI Element'
File
File Outline
Folder
-
Open Folder
-
Open Folder Outline
+
Open Folder
+
Open Folder Outline
Folder Outline
Help
Home
@@ -76,8 +76,8 @@ type : 'UI Element'
Map Marker
Mobile
Music
-
Chat Outline
-
Comment Outline
+
Chat Outline
+
Comment Outline
Payment
Photo
QR Code
@@ -123,8 +123,8 @@ type : 'UI Element' - - + + @@ -139,8 +139,8 @@ type : 'UI Element' - - + + @@ -176,7 +176,7 @@ type : 'UI Element'
Add Sign
Add Sign Box
Adjust
-
Empty Bookmark
+
Empty Bookmark
Bookmark
Cloud Download
Cloud Upload
@@ -453,7 +453,7 @@ type : 'UI Element'
Fighter Jet
Fire Extinguisher
Fire
-
Checkered Flag
+
Checkered Flag
Food
Gamepad
Gift
@@ -514,7 +514,7 @@ type : 'UI Element' - + @@ -577,9 +577,9 @@ type : 'UI Element'
OK Circle
OK Sign
Smile
-
Empty Star
-
Half Empty Star
-
Half Star
+
Empty Star
+
Half Empty Star
+
Half Star
Star
Thumbs Down
Thumbs Down Outline
@@ -608,9 +608,9 @@ type : 'UI Element' - - - + + + @@ -642,10 +642,10 @@ type : 'UI Element'
Triangle Left
Triangle Right
Triangle Up
-
Down Arrow
-
Left Arrow
-
Right Arrow
-
Up Arrow
+
Down Arrow
+
Left Arrow
+
Right Arrow
+
Up Arrow
Arrow Sign Down
Arrow Sign Left
Arrow Sign Right
@@ -681,19 +681,19 @@ type : 'UI Element' - - - - + + + + - - - - + + + + From d76889104a9a8c1bab715253a7fd997062c263d2 Mon Sep 17 00:00:00 2001 From: Michal Gebauer Date: Mon, 13 Jan 2014 20:55:24 +0100 Subject: [PATCH 04/12] Doc: Removed arrow class from location icon --- server/documents/elements/icon.html.eco | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/documents/elements/icon.html.eco b/server/documents/elements/icon.html.eco index 08a8d80a3..be21e7c78 100755 --- a/server/documents/elements/icon.html.eco +++ b/server/documents/elements/icon.html.eco @@ -69,7 +69,7 @@ type : 'UI Element'
Info
Info Letter
Legal
-
Location
+
Location
Mail
Mail Outline
Map
From 137f33b8b195c50708577da0fd46b2924b8a315c Mon Sep 17 00:00:00 2001 From: Michal Gebauer Date: Mon, 13 Jan 2014 20:56:55 +0100 Subject: [PATCH 05/12] Doc: Reordered icons existing code --- server/documents/elements/icon.html.eco | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/documents/elements/icon.html.eco b/server/documents/elements/icon.html.eco index be21e7c78..c3ef4ffbd 100755 --- a/server/documents/elements/icon.html.eco +++ b/server/documents/elements/icon.html.eco @@ -220,8 +220,8 @@ type : 'UI Element'
- + @@ -592,8 +592,8 @@ type : 'UI Element'
- + @@ -702,8 +702,8 @@ type : 'UI Element' - + @@ -1053,8 +1053,8 @@ type : 'UI Element' - + From be4b9346592be4a24f0df6d55b4ded56ab247711 Mon Sep 17 00:00:00 2001 From: Michal Gebauer Date: Mon, 13 Jan 2014 20:58:02 +0100 Subject: [PATCH 06/12] Doc: Typo in attention icon --- server/documents/elements/icon.html.eco | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/documents/elements/icon.html.eco b/server/documents/elements/icon.html.eco index c3ef4ffbd..9f46f684f 100755 --- a/server/documents/elements/icon.html.eco +++ b/server/documents/elements/icon.html.eco @@ -567,7 +567,7 @@ type : 'UI Element'
Empty Checkbox
Checked Checkbox
Exclamation
-
attention
+
Attention
Frown
Heart Empty
Heart
@@ -597,7 +597,7 @@ type : 'UI Element' - + From dffc8690bc49968b379fe26bedd64910ce98747f Mon Sep 17 00:00:00 2001 From: Michal Gebauer Date: Mon, 13 Jan 2014 20:58:47 +0100 Subject: [PATCH 07/12] Doc: Removed missing icons from existing code --- server/documents/elements/icon.html.eco | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/documents/elements/icon.html.eco b/server/documents/elements/icon.html.eco index 9f46f684f..4640b6b76 100755 --- a/server/documents/elements/icon.html.eco +++ b/server/documents/elements/icon.html.eco @@ -605,7 +605,6 @@ type : 'UI Element' - @@ -698,7 +697,6 @@ type : 'UI Element' - From 27016f2704e43f975d44a3f2d6c5af2af06386c0 Mon Sep 17 00:00:00 2001 From: Michal Gebauer Date: Mon, 13 Jan 2014 20:59:13 +0100 Subject: [PATCH 08/12] Doc: Icon class typos --- server/documents/elements/icon.html.eco | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/documents/elements/icon.html.eco b/server/documents/elements/icon.html.eco index 4640b6b76..43fd1dd17 100755 --- a/server/documents/elements/icon.html.eco +++ b/server/documents/elements/icon.html.eco @@ -959,7 +959,7 @@ type : 'UI Element'
Flag
Cancel
Close
-
Delete
+
Delete
Check
Edit
Open
@@ -985,7 +985,7 @@ type : 'UI Element' - + @@ -1039,8 +1039,8 @@ type : 'UI Element'
Fast-forward
Pause
Play
-
To-start
-
To-end
+
To-start
+
To-end
Forward
Shuffle
Clockwise
From 40cebae44932bb608d07b9e80166a05a19c9b391 Mon Sep 17 00:00:00 2001 From: Michal Gebauer Date: Mon, 13 Jan 2014 20:59:38 +0100 Subject: [PATCH 09/12] Doc: Added existing code for basic social icons --- server/documents/elements/icon.html.eco | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/documents/elements/icon.html.eco b/server/documents/elements/icon.html.eco index 43fd1dd17..2af13a9b2 100755 --- a/server/documents/elements/icon.html.eco +++ b/server/documents/elements/icon.html.eco @@ -1181,6 +1181,11 @@ type : 'UI Element'
Twitter
Github
+
+ + + +
From c979f481251cd0a509df45cf3107042021ba76db Mon Sep 17 00:00:00 2001 From: Jack Lukic Date: Tue, 14 Jan 2014 11:59:54 -0500 Subject: [PATCH 10/12] Update CONTRIBUTING.md Adds grunt to contributing docs --- CONTRIBUTING.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8a635ea36..186ee51a7 100755 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -94,7 +94,15 @@ npm install -g grunt-cli [Fork](https://github.com/jlukic/Semantic-UI/fork) -### 4) Start Your Server +### 4A) Build Semantic + +In order to have the current version of semantic available inside your local documentation, you will have to build it once with Grunt + +```bash +grunt build +``` + +### 4B) Start Your Server ```bash docpad run From 29fdf711995d5513b0cf2d37d0236a9d402d5565 Mon Sep 17 00:00:00 2001 From: jlukic Date: Tue, 14 Jan 2014 12:06:52 -0500 Subject: [PATCH 11/12] Toying with bower main path to test whether wildcard resolves correctly --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 62f0615df..d0f76873e 100755 --- a/bower.json +++ b/bower.json @@ -3,7 +3,7 @@ "description" : "Semantic empowers designers and developers by creating a shared vocabulary for UI.", "homepage" : "http://www.semantic-ui.com", "main": [ - "./build/*" + "build/**/*" ], "author": { "name" : "Jack Lukic", From ab4a50c4a2f463ba040bb4a8b0b1333bdedfd937 Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Tue, 14 Jan 2014 23:15:12 +0200 Subject: [PATCH 12/12] prevent close icon style override --- src/collections/message.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/collections/message.less b/src/collections/message.less index 51076006a..2fa12ed0a 100755 --- a/src/collections/message.less +++ b/src/collections/message.less @@ -233,7 +233,7 @@ display: table; width: 100%; } -.ui.icon.message > .icon { +.ui.icon.message > .icon:not(.close) { display: table-cell; vertical-align: middle; font-size: 3.8em;