Browse Source

weekend updates

Former-commit-id: e98a244e52
Former-commit-id: eb92f8f7cb
pull/258/head
jlukic 11 years ago
parent
commit
cd9423827e
21 changed files with 166 additions and 65 deletions
  1. 6
      build/minified/modules/behavior/state.js
  2. 6
      build/packaged/modules/behavior/state.js
  3. 3
      build/uncompressed/collections/grid.css
  4. 6
      build/uncompressed/modules/behavior/state.js
  5. 3
      build/uncompressed/modules/dropdown.css
  6. 12
      build/uncompressed/modules/modal.css
  7. 5
      node/package.json
  8. 54
      node/src/documents/collection.html
  9. 54
      node/src/documents/collections/message.html
  10. 3
      node/src/documents/elements/button.html
  11. 11
      node/src/documents/modules/modal.html
  12. 3
      node/src/files/components/semantic/collections/grid.css
  13. 6
      node/src/files/components/semantic/modules/behavior/state.js
  14. 3
      node/src/files/components/semantic/modules/dropdown.css
  15. 12
      node/src/files/components/semantic/modules/modal.css
  16. BIN
      node/src/files/images/bg3.jpg
  17. 10
      node/src/files/javascript/button.js
  18. 6
      src/collections/grid.less
  19. 6
      src/modules/behavior/state.js
  20. 4
      src/modules/dropdown.less
  21. 18
      src/modules/modal.less

6
build/minified/modules/behavior/state.js

@ -493,7 +493,7 @@ $.fn.state = function(parameters) {
module.performance.log(arguments);
}
else {
module.debug = Function.prototype.bind.call(console.info, console, settings.moduleName + ':');
module.debug = Function.prototype.bind.call(console.info, console, settings.name + ':');
module.debug.apply(console, arguments);
}
}
@ -504,13 +504,13 @@ $.fn.state = function(parameters) {
module.performance.log(arguments);
}
else {
module.verbose = Function.prototype.bind.call(console.info, console, settings.moduleName + ':');
module.verbose = Function.prototype.bind.call(console.info, console, settings.name + ':');
module.verbose.apply(console, arguments);
}
}
},
error: function() {
module.error = Function.prototype.bind.call(console.error, console, settings.moduleName + ':');
module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
module.error.apply(console, arguments);
},
performance: {

6
build/packaged/modules/behavior/state.js

@ -493,7 +493,7 @@ $.fn.state = function(parameters) {
module.performance.log(arguments);
}
else {
module.debug = Function.prototype.bind.call(console.info, console, settings.moduleName + ':');
module.debug = Function.prototype.bind.call(console.info, console, settings.name + ':');
module.debug.apply(console, arguments);
}
}
@ -504,13 +504,13 @@ $.fn.state = function(parameters) {
module.performance.log(arguments);
}
else {
module.verbose = Function.prototype.bind.call(console.info, console, settings.moduleName + ':');
module.verbose = Function.prototype.bind.call(console.info, console, settings.name + ':');
module.verbose.apply(console, arguments);
}
}
},
error: function() {
module.error = Function.prototype.bind.call(console.error, console, settings.moduleName + ':');
module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
module.error.apply(console, arguments);
},
performance: {

3
build/uncompressed/collections/grid.css

@ -518,6 +518,9 @@
display: none;
}
}
/*-------------------
Padded
--------------------*/
/*-------------------
Stackable
--------------------*/

6
build/uncompressed/modules/behavior/state.js

@ -493,7 +493,7 @@ $.fn.state = function(parameters) {
module.performance.log(arguments);
}
else {
module.debug = Function.prototype.bind.call(console.info, console, settings.moduleName + ':');
module.debug = Function.prototype.bind.call(console.info, console, settings.name + ':');
module.debug.apply(console, arguments);
}
}
@ -504,13 +504,13 @@ $.fn.state = function(parameters) {
module.performance.log(arguments);
}
else {
module.verbose = Function.prototype.bind.call(console.info, console, settings.moduleName + ':');
module.verbose = Function.prototype.bind.call(console.info, console, settings.name + ':');
module.verbose.apply(console, arguments);
}
}
},
error: function() {
module.error = Function.prototype.bind.call(console.error, console, settings.moduleName + ':');
module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
module.error.apply(console, arguments);
},
performance: {

3
build/uncompressed/modules/dropdown.css

@ -117,6 +117,9 @@
.ui.dropdown .menu .active.item {
background-color: rgba(0, 0, 0, 0.04);
border-left: none;
-webkit-box-shadow: none;
-moz-shadow: none;
box-shadow: none;
z-index: 12;
}
/* Default Text */

12
build/uncompressed/modules/modal.css

@ -82,7 +82,6 @@
---------------*/
.ui.modal .actions {
border-top: 1px solid rgba(0, 0, 0, 0.1);
background-color: #FFFFFF;
padding: 1rem 2rem;
text-align: right;
}
@ -92,6 +91,17 @@
/*******************************
Types
*******************************/
.ui.basic.modal {
background-color: transparent;
border: none;
color: #FFFFFF;
}
.ui.basic.modal .content {
background-color: transparent;
}
/*******************************
Variations
*******************************/
/* A modal that cannot fit on the page */
.ui.modal.scrolling {
position: absolute;

5
node/package.json

@ -4,8 +4,9 @@
"version": 0.1
},
"dependencies": {
"docpad": "~6.51.3",
"docpad-plugin-eco": "~2.0.2"
"docpad": "~6.51.6",
"docpad-plugin-eco": "~2.0.2",
"docpad-plugin-ghpages": "~2.3.0"
},
"devDependencies": {
"grunt": "~0.4.1",

54
node/src/documents/collection.html

@ -14,18 +14,24 @@ type : 'Semantic'
</div>
<div class="main container">
<h2 class="ui dividing header">Types of Collections</h2>
<div class="ui type two items">
<div class="item">
<div class="image">
<div class="ui fluid form">
<div class="field">
<label>Name</label>
<input class="ui input" placeholder="Name">
<div class="ui left icon input">
<i class="user icon"></i>
<input type="text" placeholder="Name">
</div>
</div>
<div class="field">
<label>E-mail</label>
<input class="ui input" placeholder="E-mail">
<div class="ui left icon input">
<i class="email icon"></i>
<input type="text" placeholder="E-mail">
</div>
</div>
</div>
</div>
@ -49,8 +55,18 @@ type : 'Semantic'
</div>
<div class="item">
<div class="image">
<div class="ui inverted three item menu">
<a class="item">Friends</a>
<div class="ui tabular three item menu">
<a class="active item">Friends</a>
<a class="item">Messages</a>
<a class="item">Profile</a>
</div>
<div class="ui secondary pointing three item menu">
<a class="active item">Friends</a>
<a class="item">Messages</a>
<a class="item">Profile</a>
</div>
<div class="ui three item menu">
<a class="active item">Friends</a>
<a class="item">Messages</a>
<a class="item">Profile</a>
</div>
@ -62,15 +78,22 @@ type : 'Semantic'
</div>
<div class="item">
<div class="image">
<table class="ui table">
<table class="ui celled definition table segment">
<thead>
<th>Name</th>
<tr><th>Name</th>
<th>Status</th>
</thead>
</tr></thead>
<tbody>
<tr>
<tr class="positive">
<td>John</td>
<td> Approved</td>
</tr><tr>
<td>John</td>
<td class="positive"><i class="icon check"></i> Approved</td>
<td> Unconfirmed</td>
</tr>
<tr class="negative">
<td>Sally</td>
<td> Denied</td>
</tr>
</tbody>
</table>
@ -82,9 +105,10 @@ type : 'Semantic'
</div>
<div class="item">
<div class="image">
<div class="ui warning message">
<div class="header">Alert</div>
<p>You forgot your name!</p>
<div class="ui error icon message">
<i class="heart icon"></i>
<div class="header">Hey, you forgot something</div>
<p>Do be do be do.</p>
</div>
</div>
<div class="content">
@ -92,7 +116,7 @@ type : 'Semantic'
<p class="description">Messages alert a user to something important.</p>
</div>
</div>
</div>
</div>

54
node/src/documents/collections/message.html

@ -13,7 +13,7 @@ type : 'UI Collection'
</div>
</div>
<div class="main container">
<div class="peek">
<div class="ui vertical pointing secondary menu">
<a class="active item">Types</a>
@ -21,9 +21,9 @@ type : 'UI Collection'
<a class="item">Variations</a>
</div>
</div>
<h2 class="ui dividing header">Types</h2>
<div class="example">
<h4 class="ui header">Text Message</h4>
<p>A basic message</p>
@ -39,7 +39,7 @@ type : 'UI Collection'
</p>
</div>
</div>
<div class="example">
<h4 class="ui header">List Message</h4>
<p>A message with a list</p>
@ -63,11 +63,11 @@ type : 'UI Collection'
<div class="header">
Have you heard about our mailing list?
</div>
Get all the best inventions in your e-mail every day. Sign up now!
<p>Get all the best inventions in your e-mail every day. Sign up now!</p>
</div>
</div>
</div>
<div class="example">
<h4 class="ui header">Dismissable Block</h4>
<p>A message that the user can choose to hide</p>
@ -79,16 +79,20 @@ type : 'UI Collection'
<p>This is a special notification which you can dismiss if you're bored with it.</p>
</div>
</div>
<h2 class="ui dividing header">States</h2>
<h4 class="ui header">Hidden</h4>
<p>Text Blocks can be hidden</p>
<div class="ui hidden message">
<p>You can't see me</p>
<div class="example">
<h4 class="ui header">Hidden</h4>
<p>Text Blocks can be hidden</p>
<div class="existing code">
<div class="ui hidden message">
<p>You can't see me</p>
</div>
</div>
</div>
<div class="example">
<h4 class="ui header">Visible</h4>
<p>Text Blocks can be set to visible if they need to force themselves to be shown.</p>
@ -96,9 +100,9 @@ type : 'UI Collection'
<p>You can always see me</p>
</div>
</div>
<h2 class="ui dividing header">Variations</h2>
<div class="example">
<h4 class="ui header">Floating</h4>
<p>A message can float above content that it is related to</p>
@ -106,7 +110,7 @@ type : 'UI Collection'
<p>Way to go!</p>
</div>
</div>
<div class="example">
<h4 class="ui header">Compact</h4>
<p>A message can only take up the width of its content.</p>
@ -114,7 +118,7 @@ type : 'UI Collection'
<p>Get all the best inventions in your e-mail every day. Sign up now!</p>
</div>
</div>
<div class="example">
<h4 class="ui header">Attached</h4>
<p>A message can be formatted to attach itself to other content</p>
@ -165,8 +169,8 @@ type : 'UI Collection'
<div class="ui green message">Green</div>
<div class="ui yellow message">Yellow</div>
</div>
<div class="example">
<h4 class="ui header">Warning</h4>
<p>A message may be formatted to display warning messages.</p>
@ -178,7 +182,7 @@ type : 'UI Collection'
Visit our registration page, then try again
</div>
</div>
<div class="example">
<h4 class="ui header">Info</h4>
<p>A message may be formatted to display information.</p>
@ -193,7 +197,7 @@ type : 'UI Collection'
</ul>
</div>
</div>
<div class="example">
<h4 class="ui header">Success</h4>
<p>A message may be formatted to display a success message.</p>
@ -204,7 +208,7 @@ type : 'UI Collection'
</div>
</div>
</div>
<div class="example">
<h4 class="ui header">Error</h4>
<p>A message may be formatted to display errors.</p>
@ -219,7 +223,7 @@ type : 'UI Collection'
</ul>
</div>
</div>
<div class="example">
<h4 class="ui header">Sizes</h4>
<p>A message can have different sizes</p>
@ -236,7 +240,7 @@ type : 'UI Collection'
This is massive
</div>
</div>
</div>
</div>

3
node/src/documents/elements/button.html

@ -26,7 +26,7 @@ type : 'UI Element'
</div>
<h2 class="ui dividing header">Types</h2>
<div class="example">
<div class="follow example">
<h4 class="ui header">Button</h4>
<p>A standard button</p>
<div class="ui button">
@ -97,7 +97,6 @@ type : 'UI Element'
<h4 class="ui header">Hover</h4>
<p>A button can change to show a user has hovered their mouse</p>
<div class="ui hover button">
<i class="add user icon"></i>
Follow
</div>
</div>

11
node/src/documents/modules/modal.html

@ -69,6 +69,11 @@ type : 'UI Module'
<h2 class="ui dividing header">Usage</h2>
<h3 class="ui header">Initializing a modal</h3>
<p>A modal can be included anywhere on the page. On initialization a modal's current size will be cached, and the element will be detached from the dom and moved inside a dimmer.</p>
<div class="ui info message">
<div class="header">Why move?</div>
<p>Moving a modal to inside the dimmer allows for 3D animations without having the 3D perspective settings alter the rest of the page content. Additionally, content outside the dimmer can be blurred or altered without affecting the modal's content.</p>
</div>
<div class="code" data-type="javascript">
$('.ui.modal')
.modal()
@ -99,7 +104,7 @@ type : 'UI Module'
<div class="no example">
<h4 class="ui header">Show</h4>
<p>A modal can show its menu</p>
<p>A modal can show itself</p>
<div class="code" data-demo="true">
$('.test.modal')
.modal('show')
@ -108,7 +113,7 @@ type : 'UI Module'
</div>
<div class="no example">
<h4 class="ui header">Hide</h4>
<p>A modal can hide its menu</p>
<p>A modal can hide itself</p>
<div class="code" data-demo="true">
$('.test.modal')
.modal('hide')
@ -160,7 +165,7 @@ type : 'UI Module'
<td>
body
</td>
<td>Selector or jquery object specifying the are to dim</td>
<td>Selector or jquery object specifying the area to dim</td>
</tr>
<tr>
<td>closable</td>

3
node/src/files/components/semantic/collections/grid.css

@ -518,6 +518,9 @@
display: none;
}
}
/*-------------------
Padded
--------------------*/
/*-------------------
Stackable
--------------------*/

6
node/src/files/components/semantic/modules/behavior/state.js

@ -493,7 +493,7 @@ $.fn.state = function(parameters) {
module.performance.log(arguments);
}
else {
module.debug = Function.prototype.bind.call(console.info, console, settings.moduleName + ':');
module.debug = Function.prototype.bind.call(console.info, console, settings.name + ':');
module.debug.apply(console, arguments);
}
}
@ -504,13 +504,13 @@ $.fn.state = function(parameters) {
module.performance.log(arguments);
}
else {
module.verbose = Function.prototype.bind.call(console.info, console, settings.moduleName + ':');
module.verbose = Function.prototype.bind.call(console.info, console, settings.name + ':');
module.verbose.apply(console, arguments);
}
}
},
error: function() {
module.error = Function.prototype.bind.call(console.error, console, settings.moduleName + ':');
module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
module.error.apply(console, arguments);
},
performance: {

3
node/src/files/components/semantic/modules/dropdown.css

@ -117,6 +117,9 @@
.ui.dropdown .menu .active.item {
background-color: rgba(0, 0, 0, 0.04);
border-left: none;
-webkit-box-shadow: none;
-moz-shadow: none;
box-shadow: none;
z-index: 12;
}
/* Default Text */

12
node/src/files/components/semantic/modules/modal.css

@ -82,7 +82,6 @@
---------------*/
.ui.modal .actions {
border-top: 1px solid rgba(0, 0, 0, 0.1);
background-color: #FFFFFF;
padding: 1rem 2rem;
text-align: right;
}
@ -92,6 +91,17 @@
/*******************************
Types
*******************************/
.ui.basic.modal {
background-color: transparent;
border: none;
color: #FFFFFF;
}
.ui.basic.modal .content {
background-color: transparent;
}
/*******************************
Variations
*******************************/
/* A modal that cannot fit on the page */
.ui.modal.scrolling {
position: absolute;

BIN
node/src/files/images/bg3.jpg

Before After
Width: 102  |  Height: 102  |  Size: 6.4 KiB

10
node/src/files/javascript/button.js

@ -7,6 +7,7 @@ semantic.button.ready = function() {
var
$buttons = $('.ui.buttons .button'),
$toggle = $('.ui.toggle.button'),
$follow = $('.follow.example .button'),
$button = $('.ui.button').not($buttons).not($toggle),
// alias
handler = {
@ -26,6 +27,15 @@ semantic.button.ready = function() {
.on('click', handler.activate)
;
$follow
.state({
text: {
inactive : 'Follow',
active : 'Following'
}
})
;
$toggle
.state({
text: {

6
src/collections/grid.less

@ -604,6 +604,12 @@
}
/*-------------------
Padded
--------------------*/
/*-------------------
Stackable
--------------------*/

6
src/modules/behavior/state.js

@ -493,7 +493,7 @@ $.fn.state = function(parameters) {
module.performance.log(arguments);
}
else {
module.debug = Function.prototype.bind.call(console.info, console, settings.moduleName + ':');
module.debug = Function.prototype.bind.call(console.info, console, settings.name + ':');
module.debug.apply(console, arguments);
}
}
@ -504,13 +504,13 @@ $.fn.state = function(parameters) {
module.performance.log(arguments);
}
else {
module.verbose = Function.prototype.bind.call(console.info, console, settings.moduleName + ':');
module.verbose = Function.prototype.bind.call(console.info, console, settings.name + ':');
module.verbose.apply(console, arguments);
}
}
},
error: function() {
module.error = Function.prototype.bind.call(console.error, console, settings.moduleName + ':');
module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
module.error.apply(console, arguments);
},
performance: {

4
src/modules/dropdown.less

@ -158,6 +158,10 @@
.ui.dropdown .menu .active.item {
background-color: rgba(0, 0, 0, 0.04);
border-left: none;
-webkit-box-shadow: none;
-moz-shadow: none;
box-shadow: none;
z-index: 12;
}

18
src/modules/modal.less

@ -106,7 +106,6 @@
.ui.modal .actions {
border-top: 1px solid rgba(0, 0, 0, 0.1);
background-color: #FFFFFF;
padding: 1rem 2rem;
text-align: right;
}
@ -120,12 +119,29 @@
Types
*******************************/
.ui.basic.modal {
background-color: transparent;
border: none;
color: #FFFFFF;
}
.ui.basic.modal .content {
background-color: transparent;
}
/*******************************
Variations
*******************************/
/* A modal that cannot fit on the page */
.ui.modal.scrolling {
position: absolute;
margin-top: 100px;
}
/*******************************
States
*******************************/

Loading…
Cancel
Save