Skip to content

Commit

Permalink
Merge branch 'less' of github.com:Semantic-Org/Semantic-UI into next
Browse files Browse the repository at this point in the history
  • Loading branch information
jlukic committed Feb 11, 2015
2 parents c718d65 + 3dea109 commit 67061dc
Show file tree
Hide file tree
Showing 46 changed files with 446 additions and 110 deletions.
10 changes: 8 additions & 2 deletions src/definitions/collections/breadcrumb.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@
*
*/


/*******************************
Theme
*******************************/

.breadcrumb() {

@type : 'collection';
@element : 'breadcrumb';

@import '../../theme.config';
@import (multiple) '../../theme.config';


/*******************************
Breadcrumb
Expand Down Expand Up @@ -120,3 +122,7 @@
}

.loadUIOverrides();

}

.breadcrumb();
8 changes: 7 additions & 1 deletion src/definitions/collections/form.less
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
Theme
*******************************/

.form() {

@type : 'collection';
@element : 'form';

@import '../../theme.config';
@import (multiple) '../../theme.config';


/*******************************
Expand Down Expand Up @@ -879,3 +881,7 @@
}

.loadUIOverrides();

}

.form();
11 changes: 8 additions & 3 deletions src/definitions/collections/grid.less
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
Theme
*******************************/

.grid() {

@type : 'collection';
@element : 'grid';

@import '../../theme.config';

@import (multiple) '../../theme.config';

/*******************************
Standard
Expand Down Expand Up @@ -1775,4 +1776,8 @@
}
}

.loadUIOverrides();
.loadUIOverrides();

}

.grid();
9 changes: 8 additions & 1 deletion src/definitions/collections/menu.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@
*
*/


/*******************************
Theme
*******************************/

.menu() {

@type : 'collection';
@element : 'menu';

@import '../../theme.config';
@import (multiple) '../../theme.config';

/*******************************
Standard
Expand Down Expand Up @@ -1613,3 +1616,7 @@
}

.loadUIOverrides();

}

.menu();
12 changes: 9 additions & 3 deletions src/definitions/collections/message.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@
* http://opensource.org/licenses/MIT
*
*/

/*******************************
Theme
*******************************/

.message() {

@type : 'collection';
@element : 'message';

@import '../../theme.config';

@import (multiple) '../../theme.config';

/*******************************
Message
Expand Down Expand Up @@ -439,4 +441,8 @@
font-size: @relativeMassive;
}

.loadUIOverrides();
.loadUIOverrides();

}

.message();
10 changes: 8 additions & 2 deletions src/definitions/collections/table.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@
*
*/


/*******************************
Theme
*******************************/

.table() {

@type : 'collection';
@element : 'table';

@import '../../theme.config';

@import (multiple) '../../theme.config';

/*******************************
Table
Expand Down Expand Up @@ -997,3 +999,7 @@
}

.loadUIOverrides();

}

.table();
8 changes: 7 additions & 1 deletion src/definitions/elements/button.less
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
Theme
*******************************/

.button() {

@type : 'element';
@element : 'button';

@import '../../theme.config';
@import (multiple) '../../theme.config';

/*******************************
Button
Expand Down Expand Up @@ -2405,3 +2407,7 @@
}

.loadUIOverrides();

}

.button();
8 changes: 7 additions & 1 deletion src/definitions/elements/divider.less
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
Theme
*******************************/

.divider() {

@type : 'element';
@element : 'divider';

@import '../../theme.config';
@import (multiple) '../../theme.config';


/*******************************
Expand Down Expand Up @@ -252,3 +254,7 @@


.loadUIOverrides();

}

.divider();
15 changes: 14 additions & 1 deletion src/definitions/elements/flag.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,22 @@
*
*/


/*******************************
Theme
*******************************/

.flag() {

@type : 'element';
@element : 'flag';

@import '../../theme.config';
@import (multiple) '../../theme.config';


/*******************************
Flag
*******************************/

i.flag:not(.icon) {
display: inline-block;
Expand All @@ -35,6 +43,7 @@ i.flag:not(.icon) {
backface-visibility: hidden;
}

/* Sprite */
i.flag:not(.icon):before {
display: inline-block;
content: '';
Expand All @@ -44,3 +53,7 @@ i.flag:not(.icon):before {
}

.loadUIOverrides();

}

.flag();
12 changes: 10 additions & 2 deletions src/definitions/elements/header.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@
*
*/


/*******************************
Theme
*******************************/

.header() {

@type : 'element';
@element : 'header';

@import '../../theme.config';
@import (multiple) '../../theme.config';


/*******************************
Header
Expand Down Expand Up @@ -615,4 +619,8 @@ a.ui.inverted.yellow.header:hover {
font-size: @medium;
}

.loadUIOverrides();
.loadUIOverrides();

}

.header();
10 changes: 9 additions & 1 deletion src/definitions/elements/icon.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@
*
*/


/*******************************
Theme
*******************************/

.icon() {

@type : 'element';
@element : 'icon';

@import '../../theme.config';
@import (multiple) '../../theme.config';


/*******************************
Icon
Expand Down Expand Up @@ -343,3 +347,7 @@ i.massive.icon {
}

.loadUIOverrides();

}

.icon();
11 changes: 9 additions & 2 deletions src/definitions/elements/image.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@
*
*/


/*******************************
Theme
*******************************/

.image() {

@type : 'element';
@element : 'image';

@import '../../theme.config';
@import (multiple) '../../theme.config';

/*******************************
Image
Expand Down Expand Up @@ -284,4 +287,8 @@ img.ui.bordered.image {
margin: 0em @imageHorizontalMargin @imageVerticalMargin;
}

.loadUIOverrides();
.loadUIOverrides();

}

.image();
10 changes: 8 additions & 2 deletions src/definitions/elements/input.less
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
Theme
*******************************/

.input() {

@type : 'element';
@element : 'input';

@import '../../theme.config';
@import (multiple) '../../theme.config';


/*******************************
Expand Down Expand Up @@ -459,4 +461,8 @@
font-size: @massive;
}

.loadUIOverrides();
.loadUIOverrides();

}

.input();
9 changes: 8 additions & 1 deletion src/definitions/elements/label.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@
*
*/


/*******************************
Theme
*******************************/

.label() {

@type : 'element';
@element : 'label';

@import '../../theme.config';
@import (multiple) '../../theme.config';


/*******************************
Expand Down Expand Up @@ -939,3 +942,7 @@ a.ui.yellow.label:hover:before {
}

.loadUIOverrides();

}

.label();
Loading

0 comments on commit 67061dc

Please sign in to comment.