You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

351 lines
6.2 KiB

11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
11 years ago
11 years ago
11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
Merge branch 'master' into css Conflicts: build/less/elements/basic.icon.less build/less/elements/button.less build/less/elements/header.less build/less/elements/icon.less build/less/elements/image.less build/less/elements/segment.less build/less/views/comment.less build/less/views/feed.less build/less/views/item.less build/less/views/list.less build/less/views/statistic.less build/minified/collections/breadcrumb.min.css build/minified/collections/form.min.css build/minified/collections/grid.min.css build/minified/collections/menu.min.css build/minified/collections/message.min.css build/minified/collections/table.min.css build/minified/elements/basic.icon.min.css build/minified/elements/button.min.css build/minified/elements/divider.min.css build/minified/elements/header.min.css build/minified/elements/icon.min.css build/minified/elements/image.min.css build/minified/elements/input.min.css build/minified/elements/label.min.css build/minified/elements/loader.min.css build/minified/elements/progress.min.css build/minified/elements/reveal.min.css build/minified/elements/segment.min.css build/minified/elements/step.min.css build/minified/modules/accordion.min.css build/minified/modules/behavior/form.min.js build/minified/modules/chatroom.min.css build/minified/modules/checkbox.min.css build/minified/modules/dimmer.min.css build/minified/modules/dropdown.min.css build/minified/modules/dropdown.min.js build/minified/modules/modal.min.css build/minified/modules/modal.min.js build/minified/modules/nag.min.css build/minified/modules/popup.min.css build/minified/modules/rating.min.css build/minified/modules/search.min.css build/minified/modules/shape.min.css build/minified/modules/sidebar.min.css build/minified/modules/tab.min.css build/minified/modules/transition.min.css build/minified/modules/transition.min.js build/minified/modules/video.min.css build/minified/views/comment.min.css build/minified/views/feed.min.css build/minified/views/item.min.css build/minified/views/list.min.css build/minified/views/statistic.min.css build/packaged/css/semantic.css build/packaged/css/semantic.min.css build/packaged/javascript/semantic.js build/packaged/javascript/semantic.min.js build/uncompressed/collections/form.css build/uncompressed/elements/segment.css build/uncompressed/modules/behavior/form.js build/uncompressed/modules/dropdown.js build/uncompressed/modules/modal.js build/uncompressed/modules/nag.css build/uncompressed/modules/sidebar.css build/uncompressed/modules/sidebar.js build/uncompressed/modules/transition.js rtl/less/elements/basic.icon.less rtl/less/elements/button.less rtl/less/elements/header.less rtl/less/elements/icon.less rtl/less/elements/image.less rtl/less/elements/segment.less rtl/minified/collections/breadcrumb.min.css rtl/minified/collections/form.min.css rtl/minified/collections/grid.min.css rtl/minified/collections/menu.min.css rtl/minified/collections/message.min.css rtl/minified/collections/table.min.css rtl/minified/elements/basic.icon.min.css rtl/minified/elements/button.min.css rtl/minified/elements/divider.min.css rtl/minified/elements/header.min.css rtl/minified/elements/icon.min.css rtl/minified/elements/image.min.css rtl/minified/elements/input.min.css rtl/minified/elements/label.min.css rtl/minified/elements/loader.min.css rtl/minified/elements/progress.min.css rtl/minified/elements/reveal.min.css rtl/minified/elements/segment.min.css rtl/minified/elements/step.min.css rtl/minified/modules/accordion.min.css rtl/minified/modules/chatroom.min.css rtl/minified/modules/checkbox.min.css rtl/minified/modules/dimmer.min.css rtl/minified/modules/dropdown.min.css rtl/minified/modules/modal.min.css rtl/minified/modules/nag.min.css rtl/minified/modules/popup.min.css rtl/minified/modules/rating.min.css rtl/minified/modules/search.min.css rtl/minified/modules/shape.min.css rtl/minified/modules/sidebar.min.css rtl/minified/modules/tab.min.css rtl/minified/modules/transition.min.css rtl/minified/modules/video.min.css rtl/minified/views/comment.min.css rtl/minified/views/feed.min.css rtl/minified/views/item.min.css rtl/minified/views/list.min.css rtl/minified/views/statistic.min.css rtl/packaged/css/semantic.min.css rtl/packaged/javascript/semantic.min.js server/documents/elements/segment.html.eco
11 years ago
11 years ago
11 years ago
11 years ago
11 years ago
11 years ago
11 years ago
11 years ago
11 years ago
11 years ago
11 years ago
11 years ago
11 years ago
11 years ago
  1. /*
  2. * # Semantic - Icon
  3. * http://github.com/jlukic/semantic-ui/
  4. *
  5. *
  6. * Copyright 2013 Contributors
  7. * Released under the MIT license
  8. * http://opensource.org/licenses/MIT
  9. *
  10. */
  11. /*!
  12. * Font Awesome 3.2.1
  13. * the iconic font designed for Bootstrap
  14. * ------------------------------------------------------------------------------
  15. * The full suite of pictographic icons, examples, and documentation can be
  16. * found at http://fon.io. Stay up to date on Twitter at
  17. * http://twitter.com/fon.
  18. *
  19. * License
  20. * ------------------------------------------------------------------------------
  21. * - The Font Awesome font is licensed under SIL OFL 1.1 -
  22. * http://scripts.sil.org/OFL
  23. /*******************************
  24. Theme
  25. *******************************/
  26. @type : 'element';
  27. @element : 'icon';
  28. @import '../semantic.config';
  29. /*******************************
  30. Icon
  31. *******************************/
  32. @font-face {
  33. font-family: 'Icons';
  34. src: url("@{iconFont}.eot");
  35. src: url("@{iconFont}.eot?#iefix") format('embedded-opentype'),
  36. url("@{iconFont}.woff") format('woff'),
  37. url("@{iconFont}.ttf") format('truetype'),
  38. url("@{iconFont}.svg#icons") format('svg');
  39. font-style: normal;
  40. font-weight: normal;
  41. font-variant: normal;
  42. text-decoration: inherit;
  43. text-transform: none;
  44. }
  45. i.icon {
  46. display: inline-block;
  47. opacity: @opacity;
  48. margin: 0em @margin 0em 0em;
  49. width: @width;
  50. height: @height;
  51. font-family: 'Icons';
  52. font-style: normal;
  53. line-height: 1;
  54. font-weight: normal;
  55. text-decoration: inherit;
  56. text-align: center;
  57. speak: none;
  58. -webkit-box-sizing: border-box;
  59. -moz-box-sizing: border-box;
  60. box-sizing: border-box;
  61. font-smoothing: antialiased;
  62. }
  63. /*******************************
  64. Types
  65. *******************************/
  66. /*--------------
  67. Loading
  68. ---------------*/
  69. i.icon.loading {
  70. -webkit-animation: icon-loading @loadingDuration linear infinite;
  71. animation: icon-loading @loadingDuration linear infinite;
  72. }
  73. @-webkit-keyframes icon-loading {
  74. from {
  75. -webkit-transform: rotate(0deg);
  76. transform: rotate(0deg);
  77. }
  78. to {
  79. -webkit-transform: rotate(360deg);
  80. transform: rotate(360deg);
  81. }
  82. }
  83. @keyframes icon-loading {
  84. from {
  85. -webkit-transform: rotate(0deg);
  86. -ms-transform: rotate(0deg);
  87. transform: rotate(0deg);
  88. }
  89. to {
  90. -webkit-transform: rotate(360deg);
  91. -ms-transform: rotate(360deg);
  92. transform: rotate(360deg);
  93. }
  94. }
  95. /*******************************
  96. States
  97. *******************************/
  98. i.icon.hover {
  99. opacity: 1;
  100. }
  101. i.icon.active {
  102. opacity: 1;
  103. }
  104. i.emphasized.icon {
  105. opacity: 1;
  106. }
  107. i.icon.disabled {
  108. opacity: @disabledOpacity;
  109. }
  110. /*******************************
  111. Variations
  112. *******************************/
  113. /*-------------------
  114. Link
  115. --------------------*/
  116. i.link.icon {
  117. cursor: pointer;
  118. opacity: @opacity;
  119. -webkit-transition: opacity @transitionDuration @transitionEasing;
  120. transition: opacity @transitionDuration @transitionEasing;
  121. }
  122. i.link.icon:hover {
  123. opacity: 1 !important;
  124. }
  125. /*-------------------
  126. Circular
  127. --------------------*/
  128. i.circular.icon {
  129. border-radius: 500em !important;
  130. padding: @circularPadding !important;
  131. -webkit-box-shadow: @circularShadow;
  132. box-shadow: @circularShadow;
  133. line-height: 1 !important;
  134. width: @circularSize !important;
  135. height: @circularSize !important;
  136. }
  137. i.circular.inverted.icon {
  138. border: none;
  139. -webkit-box-shadow: none;
  140. box-shadow: none;
  141. }
  142. /*-------------------
  143. Flipped
  144. --------------------*/
  145. i.flipped.icon,
  146. i.horizontally.flipped.icon {
  147. -webkit-transform: scale(-1, 1);
  148. -ms-transform: scale(-1, 1);
  149. transform: scale(-1, 1);
  150. }
  151. i.vertically.flipped.icon {
  152. -webkit-transform: scale(1, -1);
  153. -ms-transform: scale(1, -1);
  154. transform: scale(1, -1);
  155. }
  156. /*-------------------
  157. Rotated
  158. --------------------*/
  159. i.rotated.icon,
  160. i.right.rotated.icon,
  161. i.clockwise.rotated.icon {
  162. -webkit-transform: rotate(90deg);
  163. -ms-transform: rotate(90deg);
  164. transform: rotate(90deg);
  165. }
  166. i.left.rotated.icon,
  167. i.counterclockwise.rotated.icon {
  168. -webkit-transform: rotate(-90deg);
  169. -ms-transform: rotate(-90deg);
  170. transform: rotate(-90deg);
  171. }
  172. /*-------------------
  173. Square
  174. --------------------*/
  175. i.square.icon {
  176. width: @squareSize;
  177. height: @squareSize;
  178. padding: @squareSize !important;
  179. -webkit-box-shadow: @squareShadow;
  180. box-shadow: @squareShadow;
  181. vertical-align: baseline;
  182. }
  183. i.square.inverted.icon {
  184. border: none;
  185. -webkit-box-shadow: none;
  186. box-shadow: none;
  187. }
  188. /*-------------------
  189. Inverted
  190. --------------------*/
  191. i.inverted.icon {
  192. background-color: #222222;
  193. color: #FFFFFF;
  194. }
  195. /*-------------------
  196. Colors
  197. --------------------*/
  198. i.black.icon {
  199. color: @black !important;
  200. }
  201. i.blue.icon {
  202. color: @blue !important;
  203. }
  204. i.green.icon {
  205. color: @green !important;
  206. }
  207. i.orange.icon {
  208. color: @orange !important;
  209. }
  210. i.pink.icon {
  211. color: @pink !important;
  212. }
  213. i.purple.icon {
  214. color: @purple !important;
  215. }
  216. i.red.icon {
  217. color: @red !important;
  218. }
  219. i.teal.icon {
  220. color: @teal !important;
  221. }
  222. i.yellow.icon {
  223. color: @yellow !important;
  224. }
  225. /*-------------------
  226. Inverted Colors
  227. --------------------*/
  228. i.black.icon {
  229. background-color: @black !important;
  230. color: #FFFFFF !important;
  231. }
  232. i.blue.icon {
  233. background-color: @blue !important;
  234. color: #FFFFFF !important;
  235. }
  236. i.green.icon {
  237. background-color: @green !important;
  238. color: #FFFFFF !important;
  239. }
  240. i.orange.icon {
  241. background-color: @orange !important;
  242. color: #FFFFFF !important;
  243. }
  244. i.pink.icon {
  245. background-color: @pink !important;
  246. color: #FFFFFF !important;
  247. }
  248. i.purple.icon {
  249. background-color: @purple !important;
  250. color: #FFFFFF !important;
  251. }
  252. i.red.icon {
  253. background-color: @red !important;
  254. color: #FFFFFF !important;
  255. }
  256. i.teal.icon {
  257. background-color: @teal !important;
  258. color: #FFFFFF !important;
  259. }
  260. i.yellow.icon {
  261. background-color: @yellow !important;
  262. color: #FFFFFF !important;
  263. }
  264. /*-------------------
  265. Sizes
  266. --------------------*/
  267. i.small.icon {
  268. font-size: @small;
  269. }
  270. i.icon {
  271. font-size: @medium;
  272. }
  273. i.large.icon {
  274. font-size: @large;
  275. vertical-align: middle;
  276. }
  277. i.big.icon {
  278. font-size: @big;
  279. vertical-align: middle;
  280. }
  281. i.huge.icon {
  282. font-size: @huge;
  283. vertical-align: middle;
  284. }
  285. i.massive.icon {
  286. font-size: @massive;
  287. vertical-align: middle;
  288. }