From 4980437db6a96ee9a43f8741ad13f485020bee00 Mon Sep 17 00:00:00 2001 From: jlukic Date: Fri, 3 Oct 2014 16:47:13 -0400 Subject: [PATCH] Adding partials for each UI element in prep for kitchen sink, updatings language menu --- server/documents/index.html.eco | 504 +------------------- server/files/images/{share.png => logo.png} | Bin server/files/javascript/icon.js | 2 +- server/files/stylesheets/home.css | 7 +- server/files/stylesheets/semantic.css | 3 + server/layouts/default.html.eco | 22 +- server/partials/examples/accordion.html | 74 +++ server/partials/examples/button.html | 0 server/partials/examples/card.html | 30 ++ server/partials/examples/checkbox.html | 16 + server/partials/examples/dropdown.html | 276 +++++++++++ server/partials/examples/feed.html | 22 + server/partials/examples/input.html | 30 ++ server/partials/examples/label.html | 9 + server/partials/examples/message.html | 4 + server/partials/examples/segment.html | 3 + server/partials/examples/step.html | 23 + server/partials/languages.html | 19 + 18 files changed, 532 insertions(+), 512 deletions(-) rename server/files/images/{share.png => logo.png} (100%) mode change 100755 => 100644 create mode 100644 server/partials/examples/accordion.html create mode 100644 server/partials/examples/button.html create mode 100644 server/partials/examples/card.html create mode 100644 server/partials/examples/checkbox.html create mode 100644 server/partials/examples/dropdown.html create mode 100644 server/partials/examples/feed.html create mode 100644 server/partials/examples/input.html create mode 100644 server/partials/examples/label.html create mode 100644 server/partials/examples/message.html create mode 100644 server/partials/examples/segment.html create mode 100644 server/partials/examples/step.html create mode 100644 server/partials/languages.html diff --git a/server/documents/index.html.eco b/server/documents/index.html.eco index d344d8f5c..29a6df9e1 100755 --- a/server/documents/index.html.eco +++ b/server/documents/index.html.eco @@ -12,28 +12,12 @@ type : 'Semantic'
- +
@@ -162,212 +146,45 @@ type : 'Semantic'

Accordion

- + <%- @partial('examples/accordion') %>
- + <%- @partial('examples/step') %> +

Input

-
- - -
Search
-
- -
- -
- -
-
+ <%- @partial('examples/input') %>

Label

-
- - jkitsune@newrepublic.com - -
- - 23 New - - Dresses + <%- @partial('examples/label') %>

Message

-
-
We're creating your profile page
-

It will be ready in just a second.

-
+ <%- @partial('examples/message') %>

- Card + Card

-
-
-
-
-
-
Add Friend
-
-
-
- -
-
-
Steve Jobes
- -
- Steve Jobes is a fictional character designed to resemble someone familiar to readers. -
-
- -
+ <%- @partial('examples/card') %>

Feed

-
-
-
- -
-
-
- - Elliot Fu - added you as a friend -
-
-
-
-
- -
-
- You added Jenny Hess to the group Close Friends -
-
-
+ <%- @partial('examples/feed') %>
@@ -375,310 +192,19 @@ type : 'Semantic'

Dropdown

- - -
-
- + <%- @partial('examples/dropdown') %>

Segment

-
-
-
+ <%- @partial('examples/segment') %>

Checkbox

-
- - -
- -
- - -
- -
- - -
+ <%- @partial('examples/checkbox') %>
diff --git a/server/files/images/share.png b/server/files/images/logo.png old mode 100755 new mode 100644 similarity index 100% rename from server/files/images/share.png rename to server/files/images/logo.png diff --git a/server/files/javascript/icon.js b/server/files/javascript/icon.js index 2ed952bb9..ef9367546 100755 --- a/server/files/javascript/icon.js +++ b/server/files/javascript/icon.js @@ -29,7 +29,7 @@ semantic.icon.ready = function() { $group.filter('[data-content]').popup({ position: 'top center', variation: 'large inverted', - delay: 300 + delay: 100 }); }) .end() diff --git a/server/files/stylesheets/home.css b/server/files/stylesheets/home.css index 3c72ec210..3acf4b11a 100755 --- a/server/files/stylesheets/home.css +++ b/server/files/stylesheets/home.css @@ -723,9 +723,6 @@ #example.index .masthead:before { display: none; } - #example.index .feature.stripe p { - min-height: 0px; - } #example.index .following.bar .column { text-align: center; } @@ -771,6 +768,10 @@ /* Homepage */ @media only screen and (max-width : 780px) { + #example.index .feature.stripe p { + height: auto; + min-height: 0px; + } #example.index .container { margin-left: 2em; margin-right: 2em; diff --git a/server/files/stylesheets/semantic.css b/server/files/stylesheets/semantic.css index 1b7119b8a..930cb410a 100755 --- a/server/files/stylesheets/semantic.css +++ b/server/files/stylesheets/semantic.css @@ -159,6 +159,9 @@ a:hover { Sidebar ---------------*/ +#example #menu .logo.image { + width: 35px; +} #example #menu .item { position: relative; -webkit-border-radius: 0px; diff --git a/server/layouts/default.html.eco b/server/layouts/default.html.eco index 8c7b52aba..54c0845bb 100755 --- a/server/layouts/default.html.eco +++ b/server/layouts/default.html.eco @@ -22,7 +22,7 @@ - + <%- @getBlock('meta').toHTML() %> @@ -182,7 +182,7 @@ Close Menu
- +
@@ -304,23 +304,7 @@ diff --git a/server/partials/examples/accordion.html b/server/partials/examples/accordion.html new file mode 100644 index 000000000..79eb4f367 --- /dev/null +++ b/server/partials/examples/accordion.html @@ -0,0 +1,74 @@ + \ No newline at end of file diff --git a/server/partials/examples/button.html b/server/partials/examples/button.html new file mode 100644 index 000000000..e69de29bb diff --git a/server/partials/examples/card.html b/server/partials/examples/card.html new file mode 100644 index 000000000..bd909af86 --- /dev/null +++ b/server/partials/examples/card.html @@ -0,0 +1,30 @@ +
+
+
+
+
+
Add Friend
+
+
+
+ +
+
+
Steve Jobes
+ +
+ Steve Jobes is a fictional character designed to resemble someone familiar to readers. +
+
+ +
\ No newline at end of file diff --git a/server/partials/examples/checkbox.html b/server/partials/examples/checkbox.html new file mode 100644 index 000000000..2bb3641f2 --- /dev/null +++ b/server/partials/examples/checkbox.html @@ -0,0 +1,16 @@ +
+ + +
+ + +
+ + +
+ + +
+ + +
\ No newline at end of file diff --git a/server/partials/examples/dropdown.html b/server/partials/examples/dropdown.html new file mode 100644 index 000000000..b45cd4099 --- /dev/null +++ b/server/partials/examples/dropdown.html @@ -0,0 +1,276 @@ + + +
+ \ No newline at end of file diff --git a/server/partials/examples/feed.html b/server/partials/examples/feed.html new file mode 100644 index 000000000..42b543ff2 --- /dev/null +++ b/server/partials/examples/feed.html @@ -0,0 +1,22 @@ +
+
+
+ +
+
+
+ + Elliot Fu + added you as a friend +
+
+
+
+
+ +
+
+ You added Jenny Hess to the group Close Friends +
+
+
\ No newline at end of file diff --git a/server/partials/examples/input.html b/server/partials/examples/input.html new file mode 100644 index 000000000..f7e13bc7b --- /dev/null +++ b/server/partials/examples/input.html @@ -0,0 +1,30 @@ +
+ + +
Search
+
+ + +
+ +
+ +
+
+ + +
+
+ http:// +
+ + +
+ + +
+ +
+ Tags +
+
\ No newline at end of file diff --git a/server/partials/examples/label.html b/server/partials/examples/label.html new file mode 100644 index 000000000..40e9be46e --- /dev/null +++ b/server/partials/examples/label.html @@ -0,0 +1,9 @@ +
+ + jkitsune@newrepublic.com + +
+ + 23 New + +Dresses \ No newline at end of file diff --git a/server/partials/examples/message.html b/server/partials/examples/message.html new file mode 100644 index 000000000..f40f2ee10 --- /dev/null +++ b/server/partials/examples/message.html @@ -0,0 +1,4 @@ +
+
We're creating your profile page
+

It will be ready in just a second.

+
\ No newline at end of file diff --git a/server/partials/examples/segment.html b/server/partials/examples/segment.html new file mode 100644 index 000000000..39b764f2a --- /dev/null +++ b/server/partials/examples/segment.html @@ -0,0 +1,3 @@ +
+
+
\ No newline at end of file diff --git a/server/partials/examples/step.html b/server/partials/examples/step.html new file mode 100644 index 000000000..57ea0a2db --- /dev/null +++ b/server/partials/examples/step.html @@ -0,0 +1,23 @@ +
+ + +
+
Shipping
+
Choose your shipping options
+
+
+ + +
+
Billing
+
Enter billing information
+
+
+ + +
+
Confirm Order
+
Verify order details
+
+
+
\ No newline at end of file diff --git a/server/partials/languages.html b/server/partials/languages.html new file mode 100644 index 000000000..33b10fc84 --- /dev/null +++ b/server/partials/languages.html @@ -0,0 +1,19 @@ + \ No newline at end of file