From 356c04e4ec97f4731038655cedaf09db5ab5d786 Mon Sep 17 00:00:00 2001 From: Jack Lukic Date: Mon, 6 May 2013 18:52:07 -0400 Subject: [PATCH] grid: iterating on grid docs/ui --- node/src/documents/collections/grid.html | 221 +++++++++++++-- node/src/documents/index.html | 6 +- .../semantic/src/collections/grid.css | 251 +++++++++++++++--- .../semantic/src/collections/menu.css | 4 +- .../semantic/src/elements/label.css | 28 +- node/src/files/javascript/semantic.js | 12 +- node/src/files/stylesheets/semantic.css | 18 +- src/collections/grid.css | 251 +++++++++++++++--- src/collections/menu.css | 4 +- src/elements/label.css | 28 +- 10 files changed, 684 insertions(+), 139 deletions(-) diff --git a/node/src/documents/collections/grid.html b/node/src/documents/collections/grid.html index eb04530eb..395a655f9 100755 --- a/node/src/documents/collections/grid.html +++ b/node/src/documents/collections/grid.html @@ -7,47 +7,214 @@ type : 'UI Collection' ---
-
-

Grid

-

A grid is a set of elements without a visual definition, that creates a structure to harmonize negative space in a layout.

-
-
-
- -
-
- Standard - States - Variations - Groups +
+
+

Grid

+

A grid is a set of elements without a visual definition, that creates a structure to harmonize negative space in a layout.

+
+
+

Collection

-

A grid is made up of a collection of divisions. If divisions are of equal size, the grid can specify this by using the classname "split" along with how many divisions to use.

-

Otherwise a grid is assumed to have 12 sub divisions by default. Individual divisions can then specify -

-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum iaculis sapien sed dui porta id sagittis sapien imperdiet. Quisque suscipit dui vel sapien dapibus a faucibus sapien mattis. Nulla facilisi. Aliquam vitae ante a quam tincidunt blandit. Duis adipiscing, metus at dictum auctor, odio enim ornare urna, quis aliquam arcu nibh vitae felis. Donec gravida aliquam enim in mattis. Phasellus risus purus, luctus quis lobortis eget, dignissim quis ante.

+ +
+

Grid

+

A grid is made up of columns of content. By default a grid must assume a certain number of columns. The semantic library assumes 12 columns by default.

+
+
+ 1 +
+
+ 2 +
+
+ 3 +
+
+ 4 +
+
+ 5 +
+
+ 6 +
+
+ 7 +
+
+ 8 +
+
+ 9 +
+
+ 10 +
+
+ 11 +
+
+ 12 +
-
-

Aliquam lobortis commodo sem ac accumsan. Vestibulum non faucibus lorem. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Curabitur sed lorem lorem. Nam augue erat, dignissim nec aliquam vel, congue et sapien. Integer viverra justo vel nibh suscipit commodo. Nullam ut turpis nibh, in luctus risus. Sed ut risus nec dui mattis porta. Nam nisi magna, ornare mollis congue a, suscipit at nisl.

+
+
+

Rows

+

A basic grid has padding on the first and last columns of each row. If no rows are specified, a grid will assume only one row. A row must always have the same number of columns as the grid.

+
+
+
+ 1a +
+
+ 2a +
+
+ 3a +
+
+ 4a +
+
+ 5a +
+
+ 6a +
+
+ 7a +
+
+ 8a +
+
+ 9a +
+
+ 10a +
+
+ 11a +
+
+ 12a +
+
+
+
+ 1b +
+
+ 2b +
+
+ 3b +
+
+ 4b +
+
+ 5b +
+
+ 6b +
+
+ 7b +
+
+ 8b +
+
+ 9b +
+
+ 10b +
+
+ 11b +
+
+ 12b +
+
-
-

Donec semper mollis condimentum. Aenean eget rutrum magna. Mauris ornare nibh scelerisque turpis lobortis dignissim. Etiam eleifend justo eget quam semper vulputate. Nulla et risus convallis velit molestie iaculis. Aliquam erat volutpat. Pellentesque aliquet pellentesque nibh ut tincidunt. Nunc faucibus euismod tincidunt. Etiam convallis adipiscing est, id rutrum erat facilisis eu. Mauris in porttitor diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nam consectetur orci nec quam semper sit amet bibendum nulla feugiat. Nam vehicula, arcu blandit semper sodales, nisi nisl imperdiet dolor, nec hendrerit dui lorem id felis. Integer diam ante, tempus dictum varius in, bibendum vitae nibh. Sed placerat, libero quis ultricies tempor, nisl ipsum semper orci, vitae viverra mauris lectus nec enim. Quisque eget massa eu ligula blandit molestie.

+
+

Grid

+

A grid will automatically center any columns that do not match a full row width. This is useful for centering content

+
+
+ 1 +
+
+ 2 +
+
+ 3 +
+
+ 4 +
+
-
-

States

+

Variations

-

TBD

+

Grid

-

Variations

+
+

Evenly Divided Grid

+

A grid can be divided into equal parts.

+
+
+

Colume One Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum iaculis sapien sed dui porta id sagittis sapien imperdiet. Quisque suscipit dui vel sapien dapibus a faucibus sapien mattis. Nulla facilisi. Aliquam vitae ante a quam tincidunt blandit. Duis adipiscing, metus at dictum auctor, odio enim ornare urna, quis aliquam arcu nibh vitae felis. Donec gravida aliquam enim in mattis. Phasellus risus purus, luctus quis lobortis eget, dignissim quis ante.

+
+
+

Colume Two Aliquam lobortis commodo sem ac accumsan. Vestibulum non faucibus lorem. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Curabitur sed lorem lorem. Nam augue erat, dignissim nec aliquam vel, congue et sapien. Integer viverra justo vel nibh suscipit commodo. Nullam ut turpis nibh, in luctus risus. Sed ut risus nec dui mattis porta. Nam nisi magna, ornare mollis congue a, suscipit at nisl.

+
+
+

Colume Three Donec semper mollis condimentum. Aenean eget rutrum magna. Mauris ornare nibh scelerisque turpis lobortis dignissim. Etiam eleifend justo eget quam semper vulputate. Nulla et risus convallis velit molestie iaculis. Aliquam erat volutpat. Pellentesque aliquet pellentesque nibh ut tincidunt. Nunc faucibus euismod tincidunt. Etiam convallis adipiscing est, id rutrum erat facilisis eu. Mauris in porttitor diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nam consectetur orci nec quam semper sit amet bibendum nulla feugiat. Nam vehicula, arcu blandit semper sodales, nisi nisl imperdiet dolor, nec hendrerit dui lorem id felis. Integer diam ante, tempus dictum varius in, bibendum vitae nibh. Sed placerat, libero quis ultricies tempor, nisl ipsum semper orci, vitae viverra mauris lectus nec enim. Quisque eget massa eu ligula blandit molestie.

+
+
+
-

TBD

+
+
+
+

Colume One Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum iaculis sapien sed dui porta id sagittis sapien imperdiet. Quisque suscipit dui vel sapien dapibus a faucibus sapien mattis. Nulla facilisi. Aliquam vitae ante a quam tincidunt blandit. Duis adipiscing, metus at dictum auctor, odio enim ornare urna, quis aliquam arcu nibh vitae felis. Donec gravida aliquam enim in mattis. Phasellus risus purus, luctus quis lobortis eget, dignissim quis ante.

+
+
+

Colume Two Aliquam lobortis commodo sem ac accumsan. Vestibulum non faucibus lorem. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Curabitur sed lorem lorem. Nam augue erat, dignissim nec aliquam vel, congue et sapien. Integer viverra justo vel nibh suscipit commodo. Nullam ut turpis nibh, in luctus risus. Sed ut risus nec dui mattis porta. Nam nisi magna, ornare mollis congue a, suscipit at nisl.

+
+
+

Colume Three Donec semper mollis condimentum. Aenean eget rutrum magna. Mauris ornare nibh scelerisque turpis lobortis dignissim. Etiam eleifend justo eget quam semper vulputate. Nulla et risus convallis velit molestie iaculis. Aliquam erat volutpat. Pellentesque aliquet pellentesque nibh ut tincidunt. Nunc faucibus euismod tincidunt. Etiam convallis adipiscing est, id rutrum erat facilisis eu. Mauris in porttitor diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nam consectetur orci nec quam semper sit amet bibendum nulla feugiat. Nam vehicula, arcu blandit semper sodales, nisi nisl imperdiet dolor, nec hendrerit dui lorem id felis. Integer diam ante, tempus dictum varius in, bibendum vitae nibh. Sed placerat, libero quis ultricies tempor, nisl ipsum semper orci, vitae viverra mauris lectus nec enim. Quisque eget massa eu ligula blandit molestie.

+
+
+
+

Columns

+
+

Spanning Column

+

A grid column can span across multiple column rows.

+
+
+

Colume One Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum iaculis sapien sed dui porta id sagittis sapien imperdiet. Quisque suscipit dui vel sapien dapibus a faucibus sapien mattis. Nulla facilisi. Aliquam vitae ante a quam tincidunt blandit. Duis adipiscing, metus at dictum auctor, odio enim ornare urna, quis aliquam arcu nibh vitae felis. Donec gravida aliquam enim in mattis. Phasellus risus purus, luctus quis lobortis eget, dignissim quis ante.

+
+
+

Colume Two Aliquam lobortis commodo sem ac accumsan. Vestibulum non faucibus lorem. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Curabitur sed lorem lorem. Nam augue erat, dignissim nec aliquam vel, congue et sapien. Integer viverra justo vel nibh suscipit commodo. Nullam ut turpis nibh, in luctus risus. Sed ut risus nec dui mattis porta. Nam nisi magna, ornare mollis congue a, suscipit at nisl.

+
+
+

Colume Three Donec semper mollis condimentum. Aenean eget rutrum magna. Mauris ornare nibh scelerisque turpis lobortis dignissim. Etiam eleifend justo eget quam semper vulputate. Nulla et risus convallis velit molestie iaculis. Aliquam erat volutpat. Pellentesque aliquet pellentesque nibh ut tincidunt. Nunc faucibus euismod tincidunt. Etiam convallis adipiscing est, id rutrum erat facilisis eu. Mauris in porttitor diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nam consectetur orci nec quam semper sit amet bibendum nulla feugiat. Nam vehicula, arcu blandit semper sodales, nisi nisl imperdiet dolor, nec hendrerit dui lorem id felis. Integer diam ante, tempus dictum varius in, bibendum vitae nibh. Sed placerat, libero quis ultricies tempor, nisl ipsum semper orci, vitae viverra mauris lectus nec enim. Quisque eget massa eu ligula blandit molestie.

+
+
+
+ +
diff --git a/node/src/documents/index.html b/node/src/documents/index.html index d5f14d17d..0a2384034 100755 --- a/node/src/documents/index.html +++ b/node/src/documents/index.html @@ -23,7 +23,11 @@ type : 'Library'

What is Semantic?

-

Semantic has two parts. The semantic specification, and the semantic library.

+

Most developers create similar types of interface elements in their codebase, things like navigation menus, buttons, and forms, but each programmer may have different ways of structuring and classifying these elements.

+

The semantic specification is a set of standards designed to help developers share a common language for defining interface elements. The semantic library is a first draft at a UI library implementing these standards.

+ +

With a community developed standard for interface elements, anyone can share a style definition of a UI element, without having to restructure their websites' codebase to match.

+

Developing a standard for defining UI modules like chat rooms, pop-ups, and modals, along with a consensus on

The UI Specification

diff --git a/node/src/files/components/semantic/src/collections/grid.css b/node/src/files/components/semantic/src/collections/grid.css index 91b20d05b..7dc2bc2d3 100644 --- a/node/src/files/components/semantic/src/collections/grid.css +++ b/node/src/files/components/semantic/src/collections/grid.css @@ -1,14 +1,46 @@ +/* + * # Semantic Grid + * http://github.com/quirkyinc/semantic + * + * + * Copyright 2013 Contributors + * Released under the MIT license + * http://opensource.org/licenses/MIT + * + * Released: May 6 2013 + */ + /******************************* - Grid + Grid *******************************/ -/* Classic 12 section grid */ .ui.grid { width: 100%; - display: table; + display: block; + text-align: center; + + padding: 0% 5.55555%; + font-size: 0em; + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; } -.ui.grid > .division { - display: table-cell; + +/*------------------- + Columns +--------------------*/ + +.ui.grid > .column, +.ui.grid > .row > .column { + + display: inline-block; + text-align: left; + font-size: 1rem; + + padding-left: 1em; + padding-right: 1em; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -17,70 +49,217 @@ vertical-align: top; } -.ui.grid .division:first-child { - padding-left: 0% !important; +.ui.grid > .column:first-child, +.ui.grid > .row > .column:first-child { + padding-left: 0%; +} +.ui.grid > .column:last-child, +.ui.grid > .row > .column:last-child { + padding-right: 0%; } -.ui.grid .division:last-child { - padding-right: 0% !important; + +/*------------------- + Rows +--------------------*/ + +.ui.grid > .row { + padding-top: 2.55%; } +.ui.grid > .row:first-child { + padding-top: 0px; +} + + +/******************************* + Variations +*******************************/ + + /* Sizing Combinations */ -.ui.grid .division, -.ui.grid .one.wide.division { - width: 8.3333%; - padding-left: 1.5%; - padding-right: 1.5%; -} -.ui.six.part.grid .division, -.ui.grid .two.wide.division { +.ui.grid .two.across.column { width: 16.66667%; } -.ui.four.part.grid .division, -.ui.grid .three.wide.division { +.ui.grid .three.across.column { width: 25%; } -.ui.three.part.grid .division, -.ui.grid .four.wide.division { +.ui.grid .four.across.column { width: 33.3333%; } -.ui.grid .five.wide.division { +.ui.grid .five.across.column { width: 41.6666%; } -.ui.two.part.grid .division, -.ui.grid .six.wide.division { +.ui.grid .six.across.column { width: 50%; } -.ui.grid .seven.wide.division { +.ui.grid .seven.across.column { width: 58.3333%; } -.ui.grid .eight.wide.division { +.ui.grid .eight.across.column { width: 66.6666%; } -.ui.grid .nine.wide.division { +.ui.grid .nine.across.column { width: 75%; } -.ui.grid .ten.wide.division { +.ui.grid .ten.across.column { width: 83.3333%; } -.ui.grid .eleven.wide.division { +.ui.grid .eleven.across.column { width: 91.666%; } -.ui.grid .twelve.wide.division { +.ui.grid .twelve.across.column { width: 100%; } -/* Variations */ +/*------------------- + Column Count +--------------------*/ + +/* Standard */ +.ui.grid > .column, +.ui.grid > .row > .column { + width: 8.3333%; +} + +.ui.two.column.grid .column { + width: 50%; +} +.ui.two.column.grid .column:nth-child(2n+1) { + padding-left: 0%; +} +.ui.two.column.grid .column:nth-child(2n) { + padding-right: 0%; +} + +.ui.three.column.grid .column { + width: 33.3333%; +} +.ui.three.column.grid .column:nth-child(3n+1) { + padding-left: 0%; +} +.ui.three.column.grid .column:nth-child(3n) { + padding-right: 0%; +} + +.ui.four.column.grid .column { + width: 25%; +} +.ui.four.column.grid .column:nth-child(4n+1) { + padding-left: 0%; +} +.ui.four.column.grid .column:nth-child(4n) { + padding-right: 0%; +} + +.ui.five.column.grid .column { + width: 20%; +} +.ui.five.column.grid .column:nth-child(5n+1) { + padding-left: 0%; +} +.ui.five.column.grid .column:nth-child(5n) { + padding-right: 0%; +} + +.ui.six.column.grid .column { + width: 16.66667%; +} +.ui.six.column.grid .column:nth-child(6n+1) { + padding-left: 0%; +} +.ui.six.column.grid .column:nth-child(6n) { + padding-right: 0%; +} + +.ui.seven.column.grid .column { + width: 14.2857%; +} +.ui.seven.column.grid .column:nth-child(7n+1) { + padding-left: 0%; +} +.ui.seven.column.grid .column:nth-child(7n) { + padding-right: 0%; +} +.ui.eight.column.grid .column { + width: 12.5%; +} +.ui.eight.column.grid .column:nth-child(8n+1) { + padding-left: 0%; +} +.ui.eight.column.grid .column:nth-child(8n) { + padding-right: 0%; +} -/* Fitted grid */ -.ui.fitted.grid .division, -.ui.grid .fitted.division { +.ui.nine.column.grid .column { + width: 11.1111%; +} +.ui.nine.column.grid .column:nth-child(9n+1) { padding-left: 0%; +} +.ui.nine.column.grid .column:nth-child(9n) { padding-right: 0%; } +.ui.ten.column.grid .column { + width: 10%; +} +.ui.ten.column.grid .column:nth-child(10n+1) { + padding-left: 0%; +} +.ui.ten.column.grid .column:nth-child(10n) { + padding-right: 0%; +} + +.ui.eleven.column.grid .column { + width: 9.0909%; +} +.ui.eleven.column.grid .column:nth-child(11n+1) { + padding-left: 0%; +} +.ui.eleven.column.grid .column:nth-child(11n) { + padding-right: 0%; +} + + +/*------------------- + Fitted +--------------------*/ + +.ui.fitted.grid { + padding: 0%; +} +.ui.fitted.grid .column, +.ui.grid .fitted.column { + padding-left: 0%; + padding-right: 0%; +} + +/*------------------- + Padded +--------------------*/ + + +/*---------------------- + Vertically Centered +-----------------------*/ + + /* Vertical Centered */ -.ui.centered.grid .division, -.ui.centered.division { +.ui.centered.grid .column, +.ui.centered.column { + display: table-cell; vertical-align: middle; } + + +@media only screen and (max-width : 1000px) { + .ui.folding.grid { + display: block !important; + } + .ui.folding.grid .column { + display: block !important; + width: 100% !important; + padding: 0% !important; + } +} \ No newline at end of file diff --git a/node/src/files/components/semantic/src/collections/menu.css b/node/src/files/components/semantic/src/collections/menu.css index 924508336..80df7fadc 100644 --- a/node/src/files/components/semantic/src/collections/menu.css +++ b/node/src/files/components/semantic/src/collections/menu.css @@ -48,7 +48,7 @@ -webkit-tap-highlight-color: rgba(0, 0, 0, 0); vertical-align: middle; - min-height: 1.25em; + min-height: 1.3em; -webkit-transition: opacity 0.1s linear, @@ -121,6 +121,7 @@ border-radius: 0px; } + /*-------------- Items ---------------*/ @@ -244,7 +245,6 @@ position: absolute; top: 100%; left: 0px; - margin: 1px 0px 0px 0px; background-color: #FFFFFF; opacity: 0; diff --git a/node/src/files/components/semantic/src/elements/label.css b/node/src/files/components/semantic/src/elements/label.css index 8a56db5d8..926f3a209 100644 --- a/node/src/files/components/semantic/src/elements/label.css +++ b/node/src/files/components/semantic/src/elements/label.css @@ -92,6 +92,11 @@ a.ui.label { Variations *******************************/ + +/*------------------- + Tag +--------------------*/ + .ui.tag.labels .label, .ui.tag.label { margin-left: 1em; @@ -158,9 +163,9 @@ a.ui.label { border-radius: 100px 100px 100px 100px; } -/******************************* - Attached -*******************************/ +/*------------------- + Attached +--------------------*/ .ui.attached.label { position: absolute; @@ -198,11 +203,9 @@ a.ui.label { } - - -/******************************* - Colors -*******************************/ +/*------------------- + Colors +--------------------*/ /*--- Standard ---*/ @@ -461,6 +464,7 @@ a.ui.teal.tag.label:hover:before { /*------------------ Floating Label -------------------*/ + .ui.floating.label { position: absolute; z-index: 100; @@ -473,11 +477,9 @@ a.ui.teal.tag.label:hover:before { box-shadow: 0px -2px 0 0px rgba(0, 0, 0, 0.1) inset; } - - -/******************************* - Sizes -*******************************/ +/*------------------- + Sizes +--------------------*/ .ui.label { font-size: 13px; diff --git a/node/src/files/javascript/semantic.js b/node/src/files/javascript/semantic.js index 59bd90760..9e2498671 100755 --- a/node/src/files/javascript/semantic.js +++ b/node/src/files/javascript/semantic.js @@ -43,8 +43,7 @@ semantic.ready = function() { createCode: function() { var $example = $(this).closest('.example'), - $shape = $example.find('.shape.module'), - $demo = $example.children().slice(3).not('.annotated, .ignore'), + $demo = $example.children().not('p, h4, i.code, .annotated, .ignore'), $annotated = $example.find('.annotated'), $code = $annotated.find('.code'), whiteSpace = new RegExp('\\n\\s{4}', 'g'), @@ -99,13 +98,13 @@ semantic.ready = function() { contentType = $code.data('type') || 'javascript', editor = ace.edit($code[0]), editorSession = editor.getSession(), - padding = -1, + padding = 4, codeHeight = editor.getSession().getScreenLength() * (editor.renderer.lineHeight) + editor.renderer.scrollBar.getWidth() + padding ; editor.setTheme('ace/theme/github'); editor.setShowPrintMargin(false); editor.setReadOnly(true); - //editor.renderer.setShowGutter(false); + editor.renderer.setShowGutter(false); editor.setHighlightActiveLine(false); editorSession.setUseWrapMode(true); @@ -288,11 +287,10 @@ semantic.ready = function() { $peek .waypoint('sticky', { - offset: 85, - stuckClass: 'stuck' + offset : 85, + stuckClass : 'stuck' }) ; - console.log($peekItem); $peekItem .state('destroy') .on('click', handler.peek) diff --git a/node/src/files/stylesheets/semantic.css b/node/src/files/stylesheets/semantic.css index 2c525866e..f41f560e3 100755 --- a/node/src/files/stylesheets/semantic.css +++ b/node/src/files/stylesheets/semantic.css @@ -387,6 +387,7 @@ box-shadow: 3px 0px 2px rgba(0, 0, 0, 0.2); */ position: relative; width: 100%; height: 200px; + text-align: left; } #example div.code { font-size: 14px; @@ -433,12 +434,12 @@ box-shadow: 3px 0px 2px rgba(0, 0, 0, 0.2); */ #example div.code .ace_attribute-name { color: #934E4E; } -/* + #example div.code .ace_gutter, #example div.code .ace_scroller { margin: 14px 10px; } -*/ + #example div.code .ace_content { } #example div.code .ace_string { @@ -471,6 +472,9 @@ box-shadow: 3px 0px 2px rgba(0, 0, 0, 0.2); */ #example .example { position: relative; } +#example .example .grid i.code { + right: 25%; +} #example .example i.code { cursor: pointer; position: absolute; @@ -515,3 +519,13 @@ box-shadow: 3px 0px 2px rgba(0, 0, 0, 0.2); */ } } +@media only screen and (max-width : 1000px) { + #example .fixed .section, + #example .fixed .title b { + display: none; + } + #example .fixed .container { + width: auto; + margin: 0px auto; + } +} \ No newline at end of file diff --git a/src/collections/grid.css b/src/collections/grid.css index 91b20d05b..7dc2bc2d3 100755 --- a/src/collections/grid.css +++ b/src/collections/grid.css @@ -1,14 +1,46 @@ +/* + * # Semantic Grid + * http://github.com/quirkyinc/semantic + * + * + * Copyright 2013 Contributors + * Released under the MIT license + * http://opensource.org/licenses/MIT + * + * Released: May 6 2013 + */ + /******************************* - Grid + Grid *******************************/ -/* Classic 12 section grid */ .ui.grid { width: 100%; - display: table; + display: block; + text-align: center; + + padding: 0% 5.55555%; + font-size: 0em; + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; } -.ui.grid > .division { - display: table-cell; + +/*------------------- + Columns +--------------------*/ + +.ui.grid > .column, +.ui.grid > .row > .column { + + display: inline-block; + text-align: left; + font-size: 1rem; + + padding-left: 1em; + padding-right: 1em; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -17,70 +49,217 @@ vertical-align: top; } -.ui.grid .division:first-child { - padding-left: 0% !important; +.ui.grid > .column:first-child, +.ui.grid > .row > .column:first-child { + padding-left: 0%; +} +.ui.grid > .column:last-child, +.ui.grid > .row > .column:last-child { + padding-right: 0%; } -.ui.grid .division:last-child { - padding-right: 0% !important; + +/*------------------- + Rows +--------------------*/ + +.ui.grid > .row { + padding-top: 2.55%; } +.ui.grid > .row:first-child { + padding-top: 0px; +} + + +/******************************* + Variations +*******************************/ + + /* Sizing Combinations */ -.ui.grid .division, -.ui.grid .one.wide.division { - width: 8.3333%; - padding-left: 1.5%; - padding-right: 1.5%; -} -.ui.six.part.grid .division, -.ui.grid .two.wide.division { +.ui.grid .two.across.column { width: 16.66667%; } -.ui.four.part.grid .division, -.ui.grid .three.wide.division { +.ui.grid .three.across.column { width: 25%; } -.ui.three.part.grid .division, -.ui.grid .four.wide.division { +.ui.grid .four.across.column { width: 33.3333%; } -.ui.grid .five.wide.division { +.ui.grid .five.across.column { width: 41.6666%; } -.ui.two.part.grid .division, -.ui.grid .six.wide.division { +.ui.grid .six.across.column { width: 50%; } -.ui.grid .seven.wide.division { +.ui.grid .seven.across.column { width: 58.3333%; } -.ui.grid .eight.wide.division { +.ui.grid .eight.across.column { width: 66.6666%; } -.ui.grid .nine.wide.division { +.ui.grid .nine.across.column { width: 75%; } -.ui.grid .ten.wide.division { +.ui.grid .ten.across.column { width: 83.3333%; } -.ui.grid .eleven.wide.division { +.ui.grid .eleven.across.column { width: 91.666%; } -.ui.grid .twelve.wide.division { +.ui.grid .twelve.across.column { width: 100%; } -/* Variations */ +/*------------------- + Column Count +--------------------*/ + +/* Standard */ +.ui.grid > .column, +.ui.grid > .row > .column { + width: 8.3333%; +} + +.ui.two.column.grid .column { + width: 50%; +} +.ui.two.column.grid .column:nth-child(2n+1) { + padding-left: 0%; +} +.ui.two.column.grid .column:nth-child(2n) { + padding-right: 0%; +} + +.ui.three.column.grid .column { + width: 33.3333%; +} +.ui.three.column.grid .column:nth-child(3n+1) { + padding-left: 0%; +} +.ui.three.column.grid .column:nth-child(3n) { + padding-right: 0%; +} + +.ui.four.column.grid .column { + width: 25%; +} +.ui.four.column.grid .column:nth-child(4n+1) { + padding-left: 0%; +} +.ui.four.column.grid .column:nth-child(4n) { + padding-right: 0%; +} + +.ui.five.column.grid .column { + width: 20%; +} +.ui.five.column.grid .column:nth-child(5n+1) { + padding-left: 0%; +} +.ui.five.column.grid .column:nth-child(5n) { + padding-right: 0%; +} + +.ui.six.column.grid .column { + width: 16.66667%; +} +.ui.six.column.grid .column:nth-child(6n+1) { + padding-left: 0%; +} +.ui.six.column.grid .column:nth-child(6n) { + padding-right: 0%; +} + +.ui.seven.column.grid .column { + width: 14.2857%; +} +.ui.seven.column.grid .column:nth-child(7n+1) { + padding-left: 0%; +} +.ui.seven.column.grid .column:nth-child(7n) { + padding-right: 0%; +} +.ui.eight.column.grid .column { + width: 12.5%; +} +.ui.eight.column.grid .column:nth-child(8n+1) { + padding-left: 0%; +} +.ui.eight.column.grid .column:nth-child(8n) { + padding-right: 0%; +} -/* Fitted grid */ -.ui.fitted.grid .division, -.ui.grid .fitted.division { +.ui.nine.column.grid .column { + width: 11.1111%; +} +.ui.nine.column.grid .column:nth-child(9n+1) { padding-left: 0%; +} +.ui.nine.column.grid .column:nth-child(9n) { padding-right: 0%; } +.ui.ten.column.grid .column { + width: 10%; +} +.ui.ten.column.grid .column:nth-child(10n+1) { + padding-left: 0%; +} +.ui.ten.column.grid .column:nth-child(10n) { + padding-right: 0%; +} + +.ui.eleven.column.grid .column { + width: 9.0909%; +} +.ui.eleven.column.grid .column:nth-child(11n+1) { + padding-left: 0%; +} +.ui.eleven.column.grid .column:nth-child(11n) { + padding-right: 0%; +} + + +/*------------------- + Fitted +--------------------*/ + +.ui.fitted.grid { + padding: 0%; +} +.ui.fitted.grid .column, +.ui.grid .fitted.column { + padding-left: 0%; + padding-right: 0%; +} + +/*------------------- + Padded +--------------------*/ + + +/*---------------------- + Vertically Centered +-----------------------*/ + + /* Vertical Centered */ -.ui.centered.grid .division, -.ui.centered.division { +.ui.centered.grid .column, +.ui.centered.column { + display: table-cell; vertical-align: middle; } + + +@media only screen and (max-width : 1000px) { + .ui.folding.grid { + display: block !important; + } + .ui.folding.grid .column { + display: block !important; + width: 100% !important; + padding: 0% !important; + } +} \ No newline at end of file diff --git a/src/collections/menu.css b/src/collections/menu.css index 924508336..80df7fadc 100755 --- a/src/collections/menu.css +++ b/src/collections/menu.css @@ -48,7 +48,7 @@ -webkit-tap-highlight-color: rgba(0, 0, 0, 0); vertical-align: middle; - min-height: 1.25em; + min-height: 1.3em; -webkit-transition: opacity 0.1s linear, @@ -121,6 +121,7 @@ border-radius: 0px; } + /*-------------- Items ---------------*/ @@ -244,7 +245,6 @@ position: absolute; top: 100%; left: 0px; - margin: 1px 0px 0px 0px; background-color: #FFFFFF; opacity: 0; diff --git a/src/elements/label.css b/src/elements/label.css index 8a56db5d8..926f3a209 100755 --- a/src/elements/label.css +++ b/src/elements/label.css @@ -92,6 +92,11 @@ a.ui.label { Variations *******************************/ + +/*------------------- + Tag +--------------------*/ + .ui.tag.labels .label, .ui.tag.label { margin-left: 1em; @@ -158,9 +163,9 @@ a.ui.label { border-radius: 100px 100px 100px 100px; } -/******************************* - Attached -*******************************/ +/*------------------- + Attached +--------------------*/ .ui.attached.label { position: absolute; @@ -198,11 +203,9 @@ a.ui.label { } - - -/******************************* - Colors -*******************************/ +/*------------------- + Colors +--------------------*/ /*--- Standard ---*/ @@ -461,6 +464,7 @@ a.ui.teal.tag.label:hover:before { /*------------------ Floating Label -------------------*/ + .ui.floating.label { position: absolute; z-index: 100; @@ -473,11 +477,9 @@ a.ui.teal.tag.label:hover:before { box-shadow: 0px -2px 0 0px rgba(0, 0, 0, 0.1) inset; } - - -/******************************* - Sizes -*******************************/ +/*------------------- + Sizes +--------------------*/ .ui.label { font-size: 13px;