From af45f1a9a6f35c075166a8021cbcd112170d9d1a Mon Sep 17 00:00:00 2001 From: jlukic Date: Wed, 11 Feb 2015 12:44:35 -0500 Subject: [PATCH] Finish fixing scope in less --- src/definitions/collections/breadcrumb.less | 10 +++- src/definitions/collections/form.less | 8 ++- src/definitions/collections/grid.less | 11 +++- src/definitions/collections/menu.less | 9 ++- src/definitions/collections/message.less | 12 +++- src/definitions/collections/table.less | 10 +++- src/definitions/globals/reset.less | 9 ++- src/definitions/globals/site.less | 11 +++- src/definitions/modules/accordion.less | 10 +++- src/definitions/modules/checkbox.less | 11 +++- src/definitions/modules/dimmer.less | 11 +++- src/definitions/modules/dropdown.less | 12 +++- src/definitions/modules/modal.less | 11 +++- src/definitions/modules/nag.less | 10 +++- src/definitions/modules/popup.less | 9 ++- src/definitions/modules/progress.less | 12 +++- src/definitions/modules/rating.less | 12 +++- src/definitions/modules/search.less | 11 +++- src/definitions/modules/shape.less | 10 +++- src/definitions/modules/sidebar.less | 10 +++- src/definitions/modules/sticky.less | 9 ++- src/definitions/modules/tab.less | 9 ++- src/definitions/modules/transition.less | 14 +++-- src/definitions/modules/video.less | 10 +++- src/definitions/views/ad.less | 8 ++- src/definitions/views/card.less | 10 +++- src/definitions/views/comment.less | 10 +++- src/definitions/views/feed.less | 10 +++- src/definitions/views/item.less | 10 +++- src/definitions/views/statistic.less | 8 ++- src/semantic.less | 65 +++++++++++++++++++++ src/theme.config.example | 36 ++++++------ 32 files changed, 324 insertions(+), 84 deletions(-) create mode 100644 src/semantic.less diff --git a/src/definitions/collections/breadcrumb.less b/src/definitions/collections/breadcrumb.less index c58c07f72..10f9a33ea 100755 --- a/src/definitions/collections/breadcrumb.less +++ b/src/definitions/collections/breadcrumb.less @@ -9,16 +9,18 @@ * */ - /******************************* Theme *******************************/ -@type : 'collection'; +.breadcrumb() { + +@type : 'element'; @element : 'breadcrumb'; @import '../../theme.config'; + /******************************* Breadcrumb *******************************/ @@ -120,3 +122,7 @@ } .loadUIOverrides(); + +} + +.breadcrumb(); diff --git a/src/definitions/collections/form.less b/src/definitions/collections/form.less index 34b1704d8..b2baa258b 100755 --- a/src/definitions/collections/form.less +++ b/src/definitions/collections/form.less @@ -13,7 +13,9 @@ Theme *******************************/ -@type : 'collection'; +.form() { + +@type : 'element'; @element : 'form'; @import '../../theme.config'; @@ -879,3 +881,7 @@ } .loadUIOverrides(); + +} + +.form(); diff --git a/src/definitions/collections/grid.less b/src/definitions/collections/grid.less index 90b37befd..dbfc4c9da 100755 --- a/src/definitions/collections/grid.less +++ b/src/definitions/collections/grid.less @@ -13,12 +13,13 @@ Theme *******************************/ -@type : 'collection'; +.grid() { + +@type : 'element'; @element : 'grid'; @import '../../theme.config'; - /******************************* Standard *******************************/ @@ -1775,4 +1776,8 @@ } } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.grid(); \ No newline at end of file diff --git a/src/definitions/collections/menu.less b/src/definitions/collections/menu.less index 367e5c2fb..cee80f589 100755 --- a/src/definitions/collections/menu.less +++ b/src/definitions/collections/menu.less @@ -9,11 +9,14 @@ * */ + /******************************* Theme *******************************/ -@type : 'collection'; +.menu() { + +@type : 'element'; @element : 'menu'; @import '../../theme.config'; @@ -1613,3 +1616,7 @@ } .loadUIOverrides(); + +} + +.menu(); diff --git a/src/definitions/collections/message.less b/src/definitions/collections/message.less index 208fd9a30..83cb8a3ad 100755 --- a/src/definitions/collections/message.less +++ b/src/definitions/collections/message.less @@ -8,16 +8,18 @@ * http://opensource.org/licenses/MIT * */ + /******************************* Theme *******************************/ -@type : 'collection'; +.message() { + +@type : 'element'; @element : 'message'; @import '../../theme.config'; - /******************************* Message *******************************/ @@ -439,4 +441,8 @@ font-size: @relativeMassive; } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.message(); \ No newline at end of file diff --git a/src/definitions/collections/table.less b/src/definitions/collections/table.less index 2fb095d6b..1619968ab 100755 --- a/src/definitions/collections/table.less +++ b/src/definitions/collections/table.less @@ -9,16 +9,18 @@ * */ + /******************************* Theme *******************************/ -@type : 'collection'; +.table() { + +@type : 'element'; @element : 'table'; @import '../../theme.config'; - /******************************* Table *******************************/ @@ -997,3 +999,7 @@ } .loadUIOverrides(); + +} + +.table(); diff --git a/src/definitions/globals/reset.less b/src/definitions/globals/reset.less index 8c4513580..138a9ebfc 100755 --- a/src/definitions/globals/reset.less +++ b/src/definitions/globals/reset.less @@ -9,12 +9,13 @@ * */ - /******************************* Theme *******************************/ -@type : 'global'; +.reset() { + +@type : 'element'; @element : 'reset'; @import '../../theme.config'; @@ -40,3 +41,7 @@ input[type="text"], input[type="email"], input[type="search"], input[type="passw } .loadUIOverrides(); + +} + +.reset(); diff --git a/src/definitions/globals/site.less b/src/definitions/globals/site.less index 723ee23c4..bdbd6e59e 100755 --- a/src/definitions/globals/site.less +++ b/src/definitions/globals/site.less @@ -9,11 +9,14 @@ * */ + /******************************* Theme *******************************/ -@type : 'global'; +.site() { + +@type : 'element'; @element : 'site'; @import '../../theme.config'; @@ -142,4 +145,8 @@ input::selection { } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.site(); \ No newline at end of file diff --git a/src/definitions/modules/accordion.less b/src/definitions/modules/accordion.less index 5d67e0229..0a3e9c485 100755 --- a/src/definitions/modules/accordion.less +++ b/src/definitions/modules/accordion.less @@ -8,17 +8,17 @@ * http://opensource.org/licenses/MIT * */ - /******************************* Theme *******************************/ -@type : 'module'; +.accordion() { + +@type : 'element'; @element : 'accordion'; @import '../../theme.config'; - /******************************* Accordion *******************************/ @@ -219,3 +219,7 @@ } .loadUIOverrides(); + +} + +.accordion(); diff --git a/src/definitions/modules/checkbox.less b/src/definitions/modules/checkbox.less index 1128f190e..fa1600957 100755 --- a/src/definitions/modules/checkbox.less +++ b/src/definitions/modules/checkbox.less @@ -13,12 +13,13 @@ Theme *******************************/ -@type : 'module'; +.checkbox() { + +@type : 'element'; @element : 'checkbox'; @import '../../theme.config'; - /******************************* Checkbox *******************************/ @@ -488,4 +489,8 @@ width: @sliderWidth; } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.checkbox(); \ No newline at end of file diff --git a/src/definitions/modules/dimmer.less b/src/definitions/modules/dimmer.less index 90b4fe4c3..548798906 100755 --- a/src/definitions/modules/dimmer.less +++ b/src/definitions/modules/dimmer.less @@ -13,12 +13,13 @@ Theme *******************************/ -@type : 'module'; +.dimmer() { + +@type : 'element'; @element : 'dimmer'; @import '../../theme.config'; - /******************************* Dimmer *******************************/ @@ -177,4 +178,8 @@ body.dimmed.dimmable > :not(.dimmer) { background: @simpleInvertedEndBackground; } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.dimmer(); \ No newline at end of file diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less index 73df5aa7f..855fc6bf7 100755 --- a/src/definitions/modules/dropdown.less +++ b/src/definitions/modules/dropdown.less @@ -9,16 +9,18 @@ * */ + /******************************* Theme *******************************/ -@type : 'module'; +.dropdown() { + +@type : 'element'; @element : 'dropdown'; @import '../../theme.config'; - /******************************* Dropdown *******************************/ @@ -1029,4 +1031,8 @@ select.ui.dropdown { right: @pointingArrowDistanceFromEdge; } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.dropdown(); \ No newline at end of file diff --git a/src/definitions/modules/modal.less b/src/definitions/modules/modal.less index 581ab2df3..58e4eba2f 100755 --- a/src/definitions/modules/modal.less +++ b/src/definitions/modules/modal.less @@ -9,11 +9,14 @@ * */ + /******************************* Theme *******************************/ -@type : 'module'; +.modal() { + +@type : 'element'; @element : 'modal'; @import '../../theme.config'; @@ -433,4 +436,8 @@ } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.modal(); \ No newline at end of file diff --git a/src/definitions/modules/nag.less b/src/definitions/modules/nag.less index 3b1df7817..41e9d146c 100755 --- a/src/definitions/modules/nag.less +++ b/src/definitions/modules/nag.less @@ -9,16 +9,18 @@ * */ + /******************************* Theme *******************************/ -@type : 'module'; +.nag() { + +@type : 'element'; @element : 'nag'; @import '../../theme.config'; - /******************************* Nag *******************************/ @@ -157,3 +159,7 @@ a.ui.nag { } .loadUIOverrides(); + +} + +.nag(); diff --git a/src/definitions/modules/popup.less b/src/definitions/modules/popup.less index bd930bbb1..1b6a91983 100755 --- a/src/definitions/modules/popup.less +++ b/src/definitions/modules/popup.less @@ -9,11 +9,14 @@ * */ + /******************************* Theme *******************************/ -@type : 'module'; +.popup() { + +@type : 'element'; @element : 'popup'; @import '../../theme.config'; @@ -291,3 +294,7 @@ .loadUIOverrides(); + +} + +.popup(); diff --git a/src/definitions/modules/progress.less b/src/definitions/modules/progress.less index e1e0f8972..334e620b6 100755 --- a/src/definitions/modules/progress.less +++ b/src/definitions/modules/progress.less @@ -9,16 +9,18 @@ * */ + /******************************* Theme *******************************/ -@type : 'module'; +.progress() { + +@type : 'element'; @element : 'progress'; @import '../../theme.config'; - /******************************* Progress *******************************/ @@ -434,4 +436,8 @@ height: @bigBarHeight; } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.progress(); \ No newline at end of file diff --git a/src/definitions/modules/rating.less b/src/definitions/modules/rating.less index d6abae1e5..03fc0421d 100755 --- a/src/definitions/modules/rating.less +++ b/src/definitions/modules/rating.less @@ -9,16 +9,18 @@ * */ + /******************************* Theme *******************************/ -@type : 'module'; +.rating() { + +@type : 'element'; @element : 'rating'; @import '../../theme.config'; - /******************************* Rating *******************************/ @@ -195,4 +197,8 @@ vertical-align: @oversizedVerticalAlign; } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.rating(); \ No newline at end of file diff --git a/src/definitions/modules/search.less b/src/definitions/modules/search.less index 051fe67b7..fdeb1b75a 100755 --- a/src/definitions/modules/search.less +++ b/src/definitions/modules/search.less @@ -9,11 +9,14 @@ * */ + /******************************* Theme *******************************/ -@type : 'module'; +.search() { + +@type : 'element'; @element : 'search'; @import '../../theme.config'; @@ -335,4 +338,8 @@ font-size: @large; } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.search(); \ No newline at end of file diff --git a/src/definitions/modules/shape.less b/src/definitions/modules/shape.less index c283a72d1..6d6799522 100755 --- a/src/definitions/modules/shape.less +++ b/src/definitions/modules/shape.less @@ -10,16 +10,18 @@ */ + /******************************* Theme *******************************/ -@type : 'module'; +.shape() { + +@type : 'element'; @element : 'shape'; @import '../../theme.config'; - /******************************* Shape *******************************/ @@ -150,3 +152,7 @@ } .loadUIOverrides(); + +} + +.shape(); diff --git a/src/definitions/modules/sidebar.less b/src/definitions/modules/sidebar.less index 3dd27066c..5590c7116 100755 --- a/src/definitions/modules/sidebar.less +++ b/src/definitions/modules/sidebar.less @@ -10,16 +10,18 @@ */ + /******************************* Theme *******************************/ -@type : 'module'; +.sidebar() { + +@type : 'element'; @element : 'sidebar'; @import '../../theme.config'; - /******************************* Sidebar *******************************/ @@ -548,3 +550,7 @@ html.ios { } .loadUIOverrides(); + +} + +.sidebar(); diff --git a/src/definitions/modules/sticky.less b/src/definitions/modules/sticky.less index e3007eedc..8d299acb4 100755 --- a/src/definitions/modules/sticky.less +++ b/src/definitions/modules/sticky.less @@ -9,11 +9,14 @@ * */ + /******************************* Theme *******************************/ -@type : 'module'; +.sticky() { + +@type : 'element'; @element : 'sticky'; @import '../../theme.config'; @@ -72,3 +75,7 @@ } .loadUIOverrides(); + +} + +.sticky(); diff --git a/src/definitions/modules/tab.less b/src/definitions/modules/tab.less index 77c2472f4..ed3aac94f 100755 --- a/src/definitions/modules/tab.less +++ b/src/definitions/modules/tab.less @@ -9,11 +9,14 @@ * */ + /******************************* Theme *******************************/ -@type : 'module'; +.tab() { + +@type : 'element'; @element : 'tab'; @import '../../theme.config'; @@ -92,3 +95,7 @@ } .loadUIOverrides(); + +} + +.tab(); diff --git a/src/definitions/modules/transition.less b/src/definitions/modules/transition.less index 6a7ef1e68..893fa2deb 100755 --- a/src/definitions/modules/transition.less +++ b/src/definitions/modules/transition.less @@ -9,16 +9,18 @@ * */ + /******************************* Theme *******************************/ -@type : 'module'; +.transition() { + +@type : 'element'; @element : 'transition'; @import '../../theme.config'; - /******************************* Transitions *******************************/ @@ -77,8 +79,8 @@ } -/******************************* - Types -*******************************/ - .loadUIOverrides(); + +} + +.transition(); diff --git a/src/definitions/modules/video.less b/src/definitions/modules/video.less index 7879ad772..5b0f9af30 100755 --- a/src/definitions/modules/video.less +++ b/src/definitions/modules/video.less @@ -9,16 +9,18 @@ * */ + /******************************* Theme *******************************/ -@type : 'module'; +.video() { + +@type : 'element'; @element : 'video'; @import '../../theme.config'; - /******************************* Video *******************************/ @@ -123,3 +125,7 @@ } .loadUIOverrides(); + +} + +.button(); diff --git a/src/definitions/views/ad.less b/src/definitions/views/ad.less index 2e5fcae41..7b55741ec 100644 --- a/src/definitions/views/ad.less +++ b/src/definitions/views/ad.less @@ -13,7 +13,9 @@ Theme *******************************/ -@type : 'view'; +.ad() { + +@type : 'element'; @element : 'ad'; @import '../../theme.config'; @@ -266,3 +268,7 @@ } .loadUIOverrides(); + +} + +.ad(); diff --git a/src/definitions/views/card.less b/src/definitions/views/card.less index 58c65ca03..6d2c2e527 100755 --- a/src/definitions/views/card.less +++ b/src/definitions/views/card.less @@ -13,7 +13,9 @@ Theme *******************************/ -@type : 'view'; +.card() { + +@type : 'element'; @element : 'card'; @import '../../theme.config'; @@ -742,4 +744,8 @@ a.ui.card:hover, font-size: @medium; } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.card(); \ No newline at end of file diff --git a/src/definitions/views/comment.less b/src/definitions/views/comment.less index 7aee128db..cd6e78b6a 100755 --- a/src/definitions/views/comment.less +++ b/src/definitions/views/comment.less @@ -9,16 +9,18 @@ * */ + /******************************* Theme *******************************/ -@type : 'view'; +.comment() { + +@type : 'element'; @element : 'comment'; @import '../../theme.config'; - /******************************* Standard *******************************/ @@ -254,3 +256,7 @@ } .loadUIOverrides(); + +} + +.comment(); diff --git a/src/definitions/views/feed.less b/src/definitions/views/feed.less index 1855f4ff0..c70637b12 100755 --- a/src/definitions/views/feed.less +++ b/src/definitions/views/feed.less @@ -13,7 +13,9 @@ Theme *******************************/ -@type : 'view'; +.feed() { + +@type : 'element'; @element : 'feed'; @import '../../theme.config'; @@ -269,4 +271,8 @@ font-size: @large; } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.feed(); \ No newline at end of file diff --git a/src/definitions/views/item.less b/src/definitions/views/item.less index 5e950a298..e9c8f84d4 100755 --- a/src/definitions/views/item.less +++ b/src/definitions/views/item.less @@ -13,7 +13,9 @@ Theme *******************************/ -@type : 'view'; +.item() { + +@type : 'element'; @element : 'item'; @import '../../theme.config'; @@ -463,4 +465,8 @@ font-size: @medium; } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); + +} + +.item(); \ No newline at end of file diff --git a/src/definitions/views/statistic.less b/src/definitions/views/statistic.less index cbb2f1f1b..31d14e496 100755 --- a/src/definitions/views/statistic.less +++ b/src/definitions/views/statistic.less @@ -13,7 +13,9 @@ Theme *******************************/ -@type : 'view'; +.statistic() { + +@type : 'element'; @element : 'statistic'; @import '../../theme.config'; @@ -414,3 +416,7 @@ .loadUIOverrides(); + +} + +.statistic(); diff --git a/src/semantic.less b/src/semantic.less new file mode 100644 index 000000000..2573d8bc9 --- /dev/null +++ b/src/semantic.less @@ -0,0 +1,65 @@ +/* + +███████╗███████╗███╗ ███╗ █████╗ ███╗ ██╗████████╗██╗ ██████╗ ██╗ ██╗██╗ +██╔════╝██╔════╝████╗ ████║██╔══██╗████╗ ██║╚══██╔══╝██║██╔════╝ ██║ ██║██║ +███████╗█████╗ ██╔████╔██║███████║██╔██╗ ██║ ██║ ██║██║ ██║ ██║██║ +╚════██║██╔══╝ ██║╚██╔╝██║██╔══██║██║╚██╗██║ ██║ ██║██║ ██║ ██║██║ +███████║███████╗██║ ╚═╝ ██║██║ ██║██║ ╚████║ ██║ ██║╚██████╗ ╚██████╔╝██║ +╚══════╝╚══════╝╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═══╝ ╚═╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ + + Import this file into your LESS project to use Semantic UI without build tools +*/ + +/* Global */ +@import "definitions/globals/reset"; +@import "definitions/globals/site"; + +/* Elements */ +@import "definitions/elements/button"; +@import "definitions/elements/divider"; +@import "definitions/elements/flag"; +@import "definitions/elements/header"; +@import "definitions/elements/icon"; +@import "definitions/elements/image"; +@import "definitions/elements/input"; +@import "definitions/elements/label"; +@import "definitions/elements/list"; +@import "definitions/elements/loader"; +@import "definitions/elements/rail"; +@import "definitions/elements/reveal"; +@import "definitions/elements/segment"; +@import "definitions/elements/step"; + +/* Collections */ +@import "definitions/collections/breadcrumb"; +@import "definitions/collections/form"; +@import "definitions/collections/grid"; +@import "definitions/collections/menu"; +@import "definitions/collections/message"; +@import "definitions/collections/table"; + +/* Views */ +@import "definitions/views/ad"; +@import "definitions/views/card"; +@import "definitions/views/comment"; +@import "definitions/views/feed"; +@import "definitions/views/item"; +@import "definitions/views/statistic"; + +/* Modules */ +@import "definitions/modules/accordion"; +@import "definitions/modules/checkbox"; +@import "definitions/modules/dimmer"; +@import "definitions/modules/dropdown"; +@import "definitions/modules/modal"; +@import "definitions/modules/nag"; +@import "definitions/modules/popup"; +@import "definitions/modules/progress"; +@import "definitions/modules/rating"; +@import "definitions/modules/search"; +@import "definitions/modules/shape"; +@import "definitions/modules/sidebar"; +@import "definitions/modules/sticky"; +@import "definitions/modules/tab"; +@import "definitions/modules/transition"; +@import "definitions/modules/video"; \ No newline at end of file diff --git a/src/theme.config.example b/src/theme.config.example index bf17b37ab..6507646e2 100644 --- a/src/theme.config.example +++ b/src/theme.config.example @@ -1,33 +1,20 @@ /* -███████╗███████╗███╗ ███╗ █████╗ ███╗ ██╗████████╗██╗ ██████╗ ██╗ ██╗██╗ -██╔════╝██╔════╝████╗ ████║██╔══██╗████╗ ██║╚══██╔══╝██║██╔════╝ ██║ ██║██║ -███████╗█████╗ ██╔████╔██║███████║██╔██╗ ██║ ██║ ██║██║ ██║ ██║██║ -╚════██║██╔══╝ ██║╚██╔╝██║██╔══██║██║╚██╗██║ ██║ ██║██║ ██║ ██║██║ -███████║███████╗██║ ╚═╝ ██║██║ ██║██║ ╚████║ ██║ ██║╚██████╗ ╚██████╔╝██║ -╚══════╝╚══════╝╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═══╝ ╚═╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ +████████╗██╗ ██╗███████╗███╗ ███╗███████╗███████╗ +╚══██╔══╝██║ ██║██╔════╝████╗ ████║██╔════╝██╔════╝ + ██║ ███████║█████╗ ██╔████╔██║█████╗ ███████╗ + ██║ ██╔══██║██╔══╝ ██║╚██╔╝██║██╔══╝ ╚════██║ + ██║ ██║ ██║███████╗██║ ╚═╝ ██║███████╗███████║ + ╚═╝ ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝╚══════╝╚══════╝ */ -/******************************* - Folders -*******************************/ - -/* Path to theme packages */ -@themesFolder : 'themes/'; - -/* Path to site override folder */ -@siteFolder : 'site/'; - - /******************************* Theme Selection *******************************/ /* To override a theme for an individual element specify theme name below - - Be sure to update the user folder name (see README) */ /* Global */ @@ -85,6 +72,17 @@ @statistic : 'default'; +/******************************* + Folders +*******************************/ + +/* Path to theme packages */ +@themesFolder : 'themes/'; + +/* Path to site override folder */ +@siteFolder : 'site/'; + + /******************************* Import Theme *******************************/