Browse Source

Adds fixed-width grid

pull/1191/head
jlukic 10 years ago
parent
commit
df0f7174d0
5 changed files with 58 additions and 24 deletions
  1. 12
      src/definitions/collections/grid.less
  2. 11
      src/definitions/modules/dropdown.js
  3. 31
      src/themes/default/collections/grid.variables
  4. 3
      src/themes/fixed-width/collections/grid.overrides
  5. 25
      src/themes/fixed-width/collections/grid.variables

12
src/definitions/collections/grid.less

@ -163,14 +163,16 @@
@media only screen and (max-width: (@largestMobileScreen)) { @media only screen and (max-width: (@largestMobileScreen)) {
.ui.page.grid { .ui.page.grid {
width: @mobileWidth; width: @mobileWidth;
padding-left: 0em;
padding-right: 0em;
padding-left: @mobileGutter;
padding-right: @mobileGutter;
margin: 0em; margin: 0em;
} }
} }
@media only screen and (min-width: @tabletBreakpoint) { @media only screen and (min-width: @tabletBreakpoint) {
.ui.page.grid { .ui.page.grid {
width: @tabletWidth; width: @tabletWidth;
margin-left: @tabletMargin;
margin-right: @tabletMargin;
padding-left: @tabletGutter; padding-left: @tabletGutter;
padding-right: @tabletGutter; padding-right: @tabletGutter;
} }
@ -178,6 +180,8 @@
@media only screen and (min-width: @computerBreakpoint) { @media only screen and (min-width: @computerBreakpoint) {
.ui.page.grid { .ui.page.grid {
width: @computerWidth; width: @computerWidth;
margin-left: @computerMargin;
margin-right: @computerMargin;
padding-left: @computerGutter; padding-left: @computerGutter;
padding-right: @computerGutter; padding-right: @computerGutter;
} }
@ -185,6 +189,8 @@
@media only screen and (min-width: @largeMonitorBreakpoint) { @media only screen and (min-width: @largeMonitorBreakpoint) {
.ui.page.grid { .ui.page.grid {
width: @largeMonitorWidth; width: @largeMonitorWidth;
margin-left: @largeMonitorMargin;
margin-right: @largeMonitorMargin;
padding-left: @largeMonitorGutter; padding-left: @largeMonitorGutter;
padding-right: @largeMonitorGutter; padding-right: @largeMonitorGutter;
} }
@ -192,6 +198,8 @@
@media only screen and (min-width: @widescreenMonitorBreakpoint) { @media only screen and (min-width: @widescreenMonitorBreakpoint) {
.ui.page.grid { .ui.page.grid {
width: @widescreenMonitorWidth; width: @widescreenMonitorWidth;
margin-left: @widescreenMargin;
margin-right: @widescreenMargin;
padding-left: @widescreenMonitorGutter; padding-left: @widescreenMonitorGutter;
padding-right: @widescreenMonitorGutter; padding-right: @widescreenMonitorGutter;
} }

11
src/definitions/modules/dropdown.js

@ -1324,7 +1324,10 @@ $.fn.dropdown = function(parameters) {
$.fn.dropdown.settings = { $.fn.dropdown.settings = {
/* Behavior */
debug : false,
verbose : true,
performance : true,
on : 'click', on : 'click',
action : 'activate', action : 'activate',
@ -1342,18 +1345,16 @@ $.fn.dropdown.settings = {
duration : 250, duration : 250,
/* Callbacks */ /* Callbacks */
onChange : function(value, text){}, onChange : function(value, text){},
onShow : function(){}, onShow : function(){},
onHide : function(){}, onHide : function(){},
/* Component */ /* Component */
name : 'Dropdown', name : 'Dropdown',
namespace : 'dropdown', namespace : 'dropdown',
debug : true,
verbose : true,
performance : true,
error : { error : {
action : 'You called a dropdown action that was not defined', action : 'You called a dropdown action that was not defined',
method : 'The method you called is not defined.', method : 'The method you called is not defined.',

31
src/themes/default/collections/grid.variables

@ -18,7 +18,10 @@
@gutterWidth: 2rem; @gutterWidth: 2rem;
@rowSpacing: 2rem; @rowSpacing: 2rem;
@tableWidth: ~"calc(100% + "@gutterWidth~")"; @tableWidth: ~"calc(100% + "@gutterWidth~")";
@relaxedTableWidth: ~"calc(100% + "@relaxedGutterWidth~")";
@veryRelaxedTableWidth: ~"calc(100% + "@veryRelaxedGutterWidth~")";
@columnMaxImageWidth: 100%; @columnMaxImageWidth: 100%;
@ -32,17 +35,23 @@
/* Column Gutters */ /* Column Gutters */
@mobileWidth: auto; @mobileWidth: auto;
@mobileMargin: 0em;
@mobileGutter: 0em;
@tabletWidth: auto; @tabletWidth: auto;
@tabletMargin: 0em;
@tabletGutter: 8%; @tabletGutter: 8%;
@computerWidth: auto; @computerWidth: auto;
@computerMargin: 0em;
@computerGutter: 13%; @computerGutter: 13%;
@largeMonitorWidth: auto; @largeMonitorWidth: auto;
@largeMonitorMargin: 0em;
@largeMonitorGutter: 18%; @largeMonitorGutter: 18%;
@widescreenMonitorWidth: auto; @widescreenMonitorWidth: auto;
@widescreenMargin: 0em;
@widescreenMonitorGutter: 23%; @widescreenMonitorGutter: 23%;
@ -53,27 +62,15 @@
@relaxedGutterWidth: 3rem; @relaxedGutterWidth: 3rem;
@veryRelaxedGutterWidth: 5rem; @veryRelaxedGutterWidth: 5rem;
@relaxedTableWidth: ~"calc(100% + "@relaxedGutterWidth~")";
@veryRelaxedTableWidth: ~"calc(100% + "@veryRelaxedGutterWidth~")";
/*-------------- /*--------------
Divided Divided
---------------*/ ---------------*/
@dividedBorder:
-1px 0px 0px 0px rgba(0, 0, 0, 0.1)
;
@verticallyDividedBorder:
0px -1px 0px 0px rgba(0, 0, 0, 0.1)
;
@dividedInvertedBorder:
-1px 0px 0px 0px rgba(255, 255, 255, 0.15)
;
@verticallyDividedInvertedBorder:
0px -1px 0px 0px rgba(255, 255, 255, 0.15)
;
@dividedBorder: -1px 0px 0px 0px rgba(0, 0, 0, 0.1);
@verticallyDividedBorder: 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
@dividedInvertedBorder: -1px 0px 0px 0px rgba(255, 255, 255, 0.15);
@verticallyDividedInvertedBorder: 0px -1px 0px 0px rgba(255, 255, 255, 0.15);
/*-------------- /*--------------
Celled Celled

3
src/themes/fixed-width/collections/grid.overrides

@ -0,0 +1,3 @@
/*******************************
Overrides
*******************************/

25
src/themes/fixed-width/collections/grid.variables

@ -0,0 +1,25 @@
/* Fixed Page Grid */
@mobileWidth: auto;
@mobileMargin: 0em;
@mobileGutter: 0em;
@tabletWidth: auto;
@tabletMargin: 0em;
@tabletGutter: 8%;
@computerWidth: 960px;
@computerMargin: auto;
@computerGutter: 0;
@largeMonitorWidth: 1180px;
@largeMonitorMargin: auto;
@largeMonitorGutter: 0;
@widescreenMonitorWidth: 1300px;
@widescreenMargin: auto;
@widescreenMonitorGutter: 0;
@tableWidth: '';
@relaxedTableWidth: '';
@veryRelaxedTableWidth: '';
Loading…
Cancel
Save