diff --git a/server/documents/index.html.eco b/server/documents/index.html.eco index 5b2e25dd7..b405526d3 100755 --- a/server/documents/index.html.eco +++ b/server/documents/index.html.eco @@ -915,7 +915,7 @@ type : 'Semantic'

Enterprise Ready

Build tools, performance logging, support for custom definitions, multiple-levels of theme inheritanceance—a developer's wet dream.

- + View Expert Guide @@ -923,7 +923,7 @@ type : 'Semantic'

Beginner Friendly

Don't feel comfortable tweaking everything? Download free community designed themes and use our customizer to build a package fit for your needs.

- + View Basic Guide diff --git a/server/documents/kitchen-sink.html.eco b/server/documents/kitchen-sink.html.eco index a60815008..4d63a955a 100755 --- a/server/documents/kitchen-sink.html.eco +++ b/server/documents/kitchen-sink.html.eco @@ -13,6 +13,12 @@ description : 'This a work in progress and currently only includes a portion of
+
+

+ Button +

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

Menu diff --git a/server/files/javascript/semantic.js b/server/files/javascript/semantic.js index 9be832c0e..0ef27c68b 100755 --- a/server/files/javascript/semantic.js +++ b/server/files/javascript/semantic.js @@ -733,6 +733,7 @@ semantic.ready = function() { initializeCode: function() { var $code = $(this).show(), + $codeTag = $(''), code = $code.html(), existingCode = $code.hasClass('existing'), evaluatedCode = $code.hasClass('evaluated'), @@ -783,7 +784,21 @@ semantic.ready = function() { formattedCode = $.trim(code).replace(whiteSpace, '\n'); formattedCode = escapeHTML(formattedCode); - $code.html(formattedCode); + // replace with + $codeTag + .addClass($code.attr('class')) + .html(formattedCode) + ; + + $code + .replaceWith($codeTag) + ; + $code = $codeTag; + + console.log($code, formattedCode); + $code + .html(formattedCode) + ; // wrap $code = $code @@ -799,14 +814,14 @@ semantic.ready = function() { $('
') .addClass('ui attached top label') .html('' + title + '' + '' + (displayType[contentType] || contentType) + '') - .prependTo( $(this).closest('.segment') ) + .prependTo( $code.closest('.segment') ) ; } if(label) { $('
') .addClass('ui pointing below language label') .html(displayType[contentType] || contentType) - .insertBefore ( $(this).closest('.segment') ) + .insertBefore ( $code.closest('.segment') ) ; } // add run code button @@ -817,13 +832,13 @@ semantic.ready = function() { .on('click', function() { eval(code); }) - .insertBefore ( $(this).closest('.segment') ) + .insertBefore ( $code.closest('.segment') ) ; } // add preview if specified if(preview) { $(code) - .insertAfter( $(this).closest('.segment') ) + .insertAfter( $code.closest('.segment') ) ; } diff --git a/server/files/stylesheets/semantic.css b/server/files/stylesheets/semantic.css index 91db41ddf..3a30ad60e 100755 --- a/server/files/stylesheets/semantic.css +++ b/server/files/stylesheets/semantic.css @@ -112,14 +112,16 @@ code { padding: 2px 4px; vertical-align: baseline; } -.ui.message code { - background-color: rgba(255, 255, 255, 0.6); -} - pre code { border: none; padding: 0px; + font-size: 1em; +} +/* Code block */ +.ui.message code { + background-color: rgba(255, 255, 255, 0.6); } + p { margin: 1em 0em; } @@ -440,6 +442,7 @@ body#example.hide { width: 55px; height: auto; + white-space: nowrap; overflow: hidden; -webkit-transition: 0.3s width ease, @@ -465,7 +468,8 @@ body#example.hide { #example .fixed.launch.button .text { position: absolute; - top: 15px; + white-space: nowrap; + top: auto; left: 54px; opacity: 0; -webkit-transition: @@ -588,7 +592,7 @@ body#example.hide { #example .instructive.segment .title + em { float: right; } -#example .label + div.code { +#example .label + .code { margin-top: 1.5em; } @@ -977,6 +981,12 @@ body#example.hide { margin: 0 auto !important; max-width: 1140px; } + +#example .demo.row .button.demo > .buttons, +#example .demo.row .button.demo > .button, +#example .demo.row .button.demo > .segment > .button { + margin-bottom: 0.5em; +} #example .demo.row .ui.menu, #example .demo.row .ui.card { width: 100%; diff --git a/server/partials/examples/button.html b/server/partials/examples/button.html index e69de29bb..21961508c 100644 --- a/server/partials/examples/button.html +++ b/server/partials/examples/button.html @@ -0,0 +1,87 @@ +
+
+ View +
+
+ Add to Cart +
+
+ Save for Later +
+
+ + Rate +
+
Basic
+ + + +
+
Horizontal
+ +
+
+
Vertical
+ +
+
+
Fade In
+ +
+ + +
+
1
+
2
+
3
+
+ +
+
Cancel
+
+
Save
+
+ +
+
+
+
+
+
+ + +
Blue
+
Red
+
Teal
+ + +
Blue
+
Red
+
Teal
+ +
+
Inverted
+
Blue
+
Red
+ +
Basic
+
Blue
+
Red
+
+
+ \ No newline at end of file diff --git a/server/partials/examples/feed.html b/server/partials/examples/feed.html index c10135852..fccb26680 100644 --- a/server/partials/examples/feed.html +++ b/server/partials/examples/feed.html @@ -19,4 +19,96 @@ You added Username to the group Group Name
+
+
+ +
+
+
+ Time period ago +
+
+ Userrname added new photos +
+
+ +
+
+ +
+
+
+

+ +
+
+
+ +
+
+
+ You wrote something +
+ Time period ago +
+
+
+ Blockquote +
+
+ Metadata + Metadata +
+
+
+
+
+ +
+
+
+ You uploaded a photo +
+ Time period ago +
+
+
+ Metadata + Metadata +
+
+
+
+ +
+
+
+
+ Elliot Fu added Jenny Hess as a friend +
+
+
+
+
+
+ Stevie Feliciano added Elliot Fu as a friend +
+
+
+
+
+
+ Helen Troy added Christian Rocha as a friend +
+
+
+
+
+
+ Christian Rocha signed up for the site. +
+
+
\ No newline at end of file