Browse Source

Fixes to grid, doubling grid, divided grid, slight changes to message

pull/912/head
jlukic 10 years ago
parent
commit
7fb2344357
7 changed files with 137 additions and 116 deletions
  1. 251
      src/definitions/collections/grid.less
  2. 2
      src/definitions/collections/message.less
  3. 0
      src/themes/packages/default/collections/form.overrides
  4. 0
      src/themes/packages/default/collections/grid.overrides
  5. 0
      src/themes/packages/default/collections/grid.variables
  6. 0
      src/themes/packages/default/collections/menu.overrides
  7. 0
      src/themes/packages/default/collections/menu.variables

251
src/definitions/collections/grid.less

@ -157,6 +157,133 @@ body > .ui.grid {
}
}
/*-------------------
Column Count
--------------------*/
/* Grid Based */
.ui.one.column.grid > .row > .column,
.ui.one.column.grid > .column {
width: @oneColumn;
}
.ui.two.column.grid > .row > .column,
.ui.two.column.grid > .column {
width: @twoColumn;
}
.ui.three.column.grid > .row > .column,
.ui.three.column.grid > .column {
width: @threeColumn;
}
.ui.four.column.grid > .row > .column,
.ui.four.column.grid > .column {
width: @fourColumn;
}
.ui.five.column.grid > .row > .column,
.ui.five.column.grid > .column {
width: @fiveColumn;
}
.ui.six.column.grid > .row > .column,
.ui.six.column.grid > .column {
width: @sixColumn;
}
.ui.seven.column.grid > .row > .column,
.ui.seven.column.grid > .column {
width: @sevenColumn;
}
.ui.eight.column.grid > .row > .column,
.ui.eight.column.grid > .column {
width: @eightColumn;
}
.ui.nine.column.grid > .row > .column,
.ui.nine.column.grid > .column {
width: @nineColumn;
}
.ui.ten.column.grid > .row > .column,
.ui.ten.column.grid > .column {
width: @tenColumn;
}
.ui.eleven.column.grid > .row > .column,
.ui.eleven.column.grid > .column {
width: @elevenColumn;
}
.ui.twelve.column.grid > .row > .column,
.ui.twelve.column.grid > .column {
width: @twelveColumn;
}
.ui.thirteen.column.grid > .row > .column,
.ui.thirteen.column.grid > .column {
width: @thirteenColumn;
}
.ui.fourteen.column.grid > .row > .column,
.ui.fourteen.column.grid > .column {
width: @fourteenColumn;
}
.ui.fifteen.column.grid > .row > .column,
.ui.fifteen.column.grid > .column {
width: @fifteenColumn;
}
.ui.sixteen.column.grid > .row > .column,
.ui.sixteen.column.grid > .column {
width: @sixteenColumn;
}
/* Row Based Overrides */
.ui.grid > .one.column.row > .column {
width: @oneColumn !important;
}
.ui.grid > .two.column.row > .column {
width: @twoColumn !important;
}
.ui.grid > .three.column.row > .column {
width: @threeColumn !important;
}
.ui.grid > .four.column.row > .column {
width: @fourColumn !important;
}
.ui.grid > .five.column.row > .column {
width: @fiveColumn !important;
}
.ui.grid > .six.column.row > .column {
width: @sixColumn !important;
}
.ui.grid > .seven.column.row > .column {
width: @sevenColumn !important;
}
.ui.grid > .eight.column.row > .column {
width: @eightColumn !important;
}
.ui.grid > .nine.column.row > .column {
width: @nineColumn !important;
}
.ui.grid > .ten.column.row > .column {
width: @tenColumn !important;
}
.ui.grid > .eleven.column.row > .column {
width: @elevenColumn !important;
}
.ui.grid > .twelve.column.row > .column {
width: @twelveColumn !important;
}
.ui.grid > .thirteen.column.row > .column {
width: @thirteenColumn !important;
}
.ui.grid > .fourteen.column.row > .column {
width: @fourteenColumn !important;
}
.ui.grid > .fifteen.column.row > .column {
width: @fifteenColumn !important;
}
.ui.grid > .sixteen.column.row > .column {
width: @sixteenColumn !important;
}
/* Assume full width with one column */
.ui.grid > .column:only-child,
.ui.grid > .row > .column:only-child {
width: @oneColumn;
}
/*-------------------
Column Width
--------------------*/
@ -259,98 +386,6 @@ body > .ui.grid {
width: @sixteenWide !important;
}
/*-------------------
Column Count
--------------------*/
/* Assume full width with one column */
.ui.one.column.grid > .row > .column,
.ui.one.column.grid > .column,
.ui.grid > .one.column.row > .column {
width: @oneColumn;
}
.ui.two.column.grid > .row > .column,
.ui.two.column.grid > .column,
.ui.grid > .two.column.row > .column {
width: @twoColumn;
}
.ui.three.column.grid > .row > .column,
.ui.three.column.grid > .column,
.ui.grid > .three.column.row > .column {
width: @threeColumn;
}
.ui.four.column.grid > .row > .column,
.ui.four.column.grid > .column,
.ui.grid > .four.column.row > .column {
width: @fourColumn;
}
.ui.five.column.grid > .row > .column,
.ui.five.column.grid > .column,
.ui.grid > .five.column.row > .column {
width: @fiveColumn;
}
.ui.six.column.grid > .row > .column,
.ui.six.column.grid > .column,
.ui.grid > .six.column.row > .column {
width: @sixColumn;
}
.ui.seven.column.grid > .row > .column,
.ui.seven.column.grid > .column,
.ui.grid > .seven.column.row > .column {
width: @sevenColumn;
}
.ui.eight.column.grid > .row > .column,
.ui.eight.column.grid > .column,
.ui.grid > .eight.column.row > .column {
width: @eightColumn;
}
.ui.nine.column.grid > .row > .column,
.ui.nine.column.grid > .column,
.ui.grid > .nine.column.row > .column {
width: @nineColumn;
}
.ui.ten.column.grid > .row > .column,
.ui.ten.column.grid > .column,
.ui.grid > .ten.column.row > .column {
width: @tenColumn;
}
.ui.eleven.column.grid > .row > .column,
.ui.eleven.column.grid > .column,
.ui.grid > .eleven.column.row > .column {
width: @elevenColumn;
}
.ui.twelve.column.grid > .row > .column,
.ui.twelve.column.grid > .column,
.ui.grid > .twelve.column.row > .column {
width: @twelveColumn;
}
.ui.thirteen.column.grid > .row > .column,
.ui.thirteen.column.grid > .column,
.ui.grid > .thirteen.column.row > .column {
width: @thirteenColumn;
}
.ui.fourteen.column.grid > .row > .column,
.ui.fourteen.column.grid > .column,
.ui.grid > .fourteen.column.row > .column {
width: @fourteenColumn;
}
.ui.fifteen.column.grid > .row > .column,
.ui.fifteen.column.grid > .column,
.ui.grid > .fifteen.column.row > .column {
width: @fifteenColumn;
}
.ui.sixteen.column.grid > .row > .column,
.ui.sixteen.column.grid > .column,
.ui.grid > .sixteen.column.row > .column {
width: @sixteenColumn;
}
/* Assume full width with one column */
.ui.grid > .column:only-child,
.ui.grid > .row > .column:only-child {
width: @oneColumn;
}
/*----------------------
Centered
-----------------------*/
@ -416,9 +451,6 @@ body > .ui.grid {
.ui.divided.grid:not(.vertically) > .row > .column {
box-shadow: @dividedBorder;
}
.ui.divided.grid:not(.vertically) > .column.row {
display: table;
}
.ui.divided.grid:not(.vertically) > .column:first-child,
.ui.divided.grid:not(.vertically) > .row > .column:first-child {
@ -474,11 +506,13 @@ body > .ui.grid {
}
/* Fitted */
/*
.ui.vertically.divided.fitted.grid > .row:before {
margin-left: 0%;
margin-right: 0%;
width: 100%;
}
*/
/*----------------------
Celled
@ -487,6 +521,8 @@ body > .ui.grid {
.ui.celled.grid {
display: table;
max-width: 100%;
margin-left: 0%;
margin-right: 0%;
box-shadow: 0px 0px 0px @celledWidth @celledBorderColor;
}
.ui.celled.grid > .row,
@ -604,21 +640,15 @@ body > .ui.grid {
.ui.grid > .row > .mobile.only.column {
display: inline-block !important;
}
.ui.divided.mobile.only.grid,
.ui.celled.mobile.only.grid,
.ui.divided.mobile.only.grid .row,
.ui.celled.mobile.only.grid .row,
.ui.divided.grid .mobile.only.row,
.ui.celled.grid .mobile.only.row,
.ui.grid .mobile.only.equal.height.row,
.ui.mobile.only.grid .equal.height.row {
display: table !important;
}
.ui.divided.grid > .row > .mobile.only.column,
.ui.celled.grid > .row > .mobile.only.column,
.ui.divided.mobile.only.grid > .row > .column,
.ui.celled.mobile.only.grid > .row > .column,
.ui.divided.mobile.only.grid > .column,
.ui.celled.mobile.only.grid > .column {
display: table-cell !important;
}
@ -640,21 +670,15 @@ body > .ui.grid {
.ui.grid > .row > .tablet.only.column {
display: inline-block !important;
}
.ui.divided.tablet.only.grid,
.ui.celled.tablet.only.grid,
.ui.divided.tablet.only.grid .row,
.ui.celled.tablet.only.grid .row,
.ui.divided.grid .tablet.only.row,
.ui.celled.grid .tablet.only.row,
.ui.grid .tablet.only.equal.height.row,
.ui.tablet.only.grid .equal.height.row {
display: table !important;
}
.ui.divided.grid > .row > .tablet.only.column,
.ui.celled.grid > .row > .tablet.only.column,
.ui.divided.tablet.only.grid > .row > .column,
.ui.celled.tablet.only.grid > .row > .column,
.ui.divided.tablet.only.grid > .column,
.ui.celled.tablet.only.grid > .column {
display: table-cell !important;
}
@ -676,21 +700,15 @@ body > .ui.grid {
.ui.grid > .row > .computer.only.column {
display: inline-block !important;
}
.ui.divided.computer.only.grid,
.ui.celled.computer.only.grid,
.ui.divided.computer.only.grid .row,
.ui.celled.computer.only.grid .row,
.ui.divided.grid .computer.only.row,
.ui.celled.grid .computer.only.row,
.ui.grid .computer.only.equal.height.row,
.ui.computer.only.grid .equal.height.row {
display: table !important;
}
.ui.divided.grid > .row > .computer.only.column,
.ui.celled.grid > .row > .computer.only.column,
.ui.divided.computer.only.grid > .row > .column,
.ui.celled.computer.only.grid > .row > .column,
.ui.divided.computer.only.grid > .column,
.ui.celled.computer.only.grid > .column {
display: table-cell !important;
}
@ -715,6 +733,9 @@ body > .ui.grid {
.ui.doubling.grid > .row {
display: inline;
}
.ui.doubling.grid > .row > .column {
margin-bottom: @stackableRowMargin;
}
.ui.two.column.doubling.grid > .row > .column,
.ui.two.column.doubling.grid > .column,
.ui.grid > .two.column.doubling.row > .column {
@ -852,7 +873,7 @@ body > .ui.grid {
.ui.stackable.grid {
display: block !important;
padding: 0em;
margin: 0em;
margin: 0em !important;
}
.ui.stackable.grid > .row > .wide.column,
.ui.stackable.grid > .wide.column,

2
src/definitions/collections/message.less

@ -313,7 +313,7 @@
.ui.yellow.message,
.ui.warning.message {
background-color: #F6F3D5;
color: #96904D;
color: #352F00;
}
/* Red Text Block */
.ui.red.message {

0
src/themes/packages/default/collections/form.overrides

0
src/themes/packages/default/collections/grid.overrides

0
src/themes/packages/default/collections/grid.variables

0
src/themes/packages/default/collections/menu.overrides

0
src/themes/packages/default/collections/menu.variables

Loading…
Cancel
Save