From 724d04e2f07744e7fd50b30382c2b30f5f650a6c Mon Sep 17 00:00:00 2001 From: jlukic Date: Wed, 2 Oct 2013 18:54:56 -0400 Subject: [PATCH] Adds remove to dimmer destroy fixes #151, removes right margin changes to icon sizes, removes fixed height from menus fixing #141, tweaks input positioning in menus. Former-commit-id: 5f26c0eb609d4532a86c291fac1eeebaaf83e8f2 Former-commit-id: d436750639ba4c54a3c9cb45935cf0f67d5099b2 --- .../less/collections/menu.less.REMOVED.git-id | 2 +- build/less/elements/icon.less | 3 --- build/less/modules/dimmer.js | 1 + build/minified/modules/dimmer.js | 1 + .../packaged/css/semantic.css.REMOVED.git-id | 2 +- .../javascript/semantic.js.REMOVED.git-id | 2 +- build/uncompressed/collections/menu.css | 11 ++++---- build/uncompressed/elements/icon.css | 3 --- build/uncompressed/modules/dimmer.js | 1 + node/src/documents/collections/menu.html.eco | 25 ++++++++++++++++--- .../less/collections/menu.less.REMOVED.git-id | 2 +- node/src/files/build/less/elements/icon.less | 3 --- node/src/files/build/less/modules/dimmer.js | 1 + .../files/build/minified/modules/dimmer.js | 1 + .../packaged/css/semantic.css.REMOVED.git-id | 2 +- .../javascript/semantic.js.REMOVED.git-id | 2 +- .../build/uncompressed/collections/menu.css | 11 ++++---- .../build/uncompressed/elements/icon.css | 3 --- .../build/uncompressed/modules/dimmer.js | 1 + node/src/files/stylesheets/semantic.css | 2 +- src/collections/menu.less.REMOVED.git-id | 2 +- src/elements/icon.less | 3 --- src/modules/dimmer.js | 1 + 23 files changed, 47 insertions(+), 38 deletions(-) diff --git a/build/less/collections/menu.less.REMOVED.git-id b/build/less/collections/menu.less.REMOVED.git-id index 717aeb6e8..4f586d432 100644 --- a/build/less/collections/menu.less.REMOVED.git-id +++ b/build/less/collections/menu.less.REMOVED.git-id @@ -1 +1 @@ -ae5be9219aa61370d76209f2c0efe1730f7a4f8a \ No newline at end of file +938a77368926e4c24478b94333049fc8a2662ad5 \ No newline at end of file diff --git a/build/less/elements/icon.less b/build/less/elements/icon.less index 1a4ea17d1..a30d82dfe 100644 --- a/build/less/elements/icon.less +++ b/build/less/elements/icon.less @@ -756,16 +756,13 @@ i.icon { } i.large.icon { font-size: 2em; - margin-right: 0.5em; vertical-align: middle; } i.huge.icon { font-size: 4em; - margin-right: 0.75em; vertical-align: middle; } i.massive.icon { font-size: 8em; - margin-right: 1em; vertical-align: middle; } diff --git a/build/less/modules/dimmer.js b/build/less/modules/dimmer.js index 8d24f0480..13141528e 100644 --- a/build/less/modules/dimmer.js +++ b/build/less/modules/dimmer.js @@ -115,6 +115,7 @@ $.fn.dimmer = function(parameters) { ; $dimmer .off(eventNamespace) + .remove() ; }, diff --git a/build/minified/modules/dimmer.js b/build/minified/modules/dimmer.js index 8d24f0480..13141528e 100644 --- a/build/minified/modules/dimmer.js +++ b/build/minified/modules/dimmer.js @@ -115,6 +115,7 @@ $.fn.dimmer = function(parameters) { ; $dimmer .off(eventNamespace) + .remove() ; }, diff --git a/build/packaged/css/semantic.css.REMOVED.git-id b/build/packaged/css/semantic.css.REMOVED.git-id index 22315008a..3f320ef5f 100644 --- a/build/packaged/css/semantic.css.REMOVED.git-id +++ b/build/packaged/css/semantic.css.REMOVED.git-id @@ -1 +1 @@ -4d1a687e483032ac1b73bd5fb89fd157574e7a35 \ No newline at end of file +f6954ada100fee5816c6469d55133bbaee195cb0 \ No newline at end of file diff --git a/build/packaged/javascript/semantic.js.REMOVED.git-id b/build/packaged/javascript/semantic.js.REMOVED.git-id index 3bebb62dd..13b7053ae 100644 --- a/build/packaged/javascript/semantic.js.REMOVED.git-id +++ b/build/packaged/javascript/semantic.js.REMOVED.git-id @@ -1 +1 @@ -cc8df66b4e0febc22293c8109ba70d035b958c5f \ No newline at end of file +263cdcca09a4b62ed0dfc6de95dab1efdf34eff3 \ No newline at end of file diff --git a/build/uncompressed/collections/menu.css b/build/uncompressed/collections/menu.css index 89301c478..d0a330185 100644 --- a/build/uncompressed/collections/menu.css +++ b/build/uncompressed/collections/menu.css @@ -173,14 +173,13 @@ width: 100%; } .ui.menu .ui.input > .icon { - padding-top: 0em; + padding-top: 0.1em; height: auto; } .ui.menu .item > .input input, .ui.menu .item > input[type="text"] { position: relative; - top: -0.45em; - margin: 0em; + margin: -0.45em 0em; padding-top: 0.45em; padding-bottom: 0.45em; } @@ -453,10 +452,11 @@ .ui.tiered.menu > .menu .item.active:after { position: absolute; content: ''; + margin-top: -1px; top: 100%; left: 0px; width: 100%; - height: 1px; + height: 2px; background-color: #FBFBFB; } .ui.tiered.menu .sub.menu { @@ -578,7 +578,7 @@ } .ui.pagination.menu .item { min-width: 2.7em; - min-height: 2.66em; + min-height: 2.7em; text-align: center; } .ui.pagination.menu.floated { @@ -1398,7 +1398,6 @@ } .ui.menu .item { font-size: 1rem; - height: 2.66em; } .ui.vertical.menu { width: 15rem; diff --git a/build/uncompressed/elements/icon.css b/build/uncompressed/elements/icon.css index be30394ca..f5880db4b 100644 --- a/build/uncompressed/elements/icon.css +++ b/build/uncompressed/elements/icon.css @@ -1424,16 +1424,13 @@ i.icon { } i.large.icon { font-size: 2em; - margin-right: 0.5em; vertical-align: middle; } i.huge.icon { font-size: 4em; - margin-right: 0.75em; vertical-align: middle; } i.massive.icon { font-size: 8em; - margin-right: 1em; vertical-align: middle; } diff --git a/build/uncompressed/modules/dimmer.js b/build/uncompressed/modules/dimmer.js index 8d24f0480..13141528e 100644 --- a/build/uncompressed/modules/dimmer.js +++ b/build/uncompressed/modules/dimmer.js @@ -115,6 +115,7 @@ $.fn.dimmer = function(parameters) { ; $dimmer .off(eventNamespace) + .remove() ; }, diff --git a/node/src/documents/collections/menu.html.eco b/node/src/documents/collections/menu.html.eco index ff9c895e1..32867886d 100755 --- a/node/src/documents/collections/menu.html.eco +++ b/node/src/documents/collections/menu.html.eco @@ -37,7 +37,7 @@ type : 'UI Collection' Friends
-
+
@@ -140,7 +140,7 @@ type : 'UI Collection' Messages
-
+
@@ -812,7 +812,7 @@ type : 'UI Collection' Friends
-
+
@@ -829,6 +829,25 @@ type : 'UI Collection'
+
+
+ + Inbox + + + Spam + + + Updates + +
+
+ + +
+
+
+

A vertical menu can also vary in size

diff --git a/node/src/files/build/less/collections/menu.less.REMOVED.git-id b/node/src/files/build/less/collections/menu.less.REMOVED.git-id index 717aeb6e8..4f586d432 100644 --- a/node/src/files/build/less/collections/menu.less.REMOVED.git-id +++ b/node/src/files/build/less/collections/menu.less.REMOVED.git-id @@ -1 +1 @@ -ae5be9219aa61370d76209f2c0efe1730f7a4f8a \ No newline at end of file +938a77368926e4c24478b94333049fc8a2662ad5 \ No newline at end of file diff --git a/node/src/files/build/less/elements/icon.less b/node/src/files/build/less/elements/icon.less index 1a4ea17d1..a30d82dfe 100644 --- a/node/src/files/build/less/elements/icon.less +++ b/node/src/files/build/less/elements/icon.less @@ -756,16 +756,13 @@ i.icon { } i.large.icon { font-size: 2em; - margin-right: 0.5em; vertical-align: middle; } i.huge.icon { font-size: 4em; - margin-right: 0.75em; vertical-align: middle; } i.massive.icon { font-size: 8em; - margin-right: 1em; vertical-align: middle; } diff --git a/node/src/files/build/less/modules/dimmer.js b/node/src/files/build/less/modules/dimmer.js index 8d24f0480..13141528e 100644 --- a/node/src/files/build/less/modules/dimmer.js +++ b/node/src/files/build/less/modules/dimmer.js @@ -115,6 +115,7 @@ $.fn.dimmer = function(parameters) { ; $dimmer .off(eventNamespace) + .remove() ; }, diff --git a/node/src/files/build/minified/modules/dimmer.js b/node/src/files/build/minified/modules/dimmer.js index 8d24f0480..13141528e 100644 --- a/node/src/files/build/minified/modules/dimmer.js +++ b/node/src/files/build/minified/modules/dimmer.js @@ -115,6 +115,7 @@ $.fn.dimmer = function(parameters) { ; $dimmer .off(eventNamespace) + .remove() ; }, diff --git a/node/src/files/build/packaged/css/semantic.css.REMOVED.git-id b/node/src/files/build/packaged/css/semantic.css.REMOVED.git-id index 22315008a..3f320ef5f 100644 --- a/node/src/files/build/packaged/css/semantic.css.REMOVED.git-id +++ b/node/src/files/build/packaged/css/semantic.css.REMOVED.git-id @@ -1 +1 @@ -4d1a687e483032ac1b73bd5fb89fd157574e7a35 \ No newline at end of file +f6954ada100fee5816c6469d55133bbaee195cb0 \ No newline at end of file diff --git a/node/src/files/build/packaged/javascript/semantic.js.REMOVED.git-id b/node/src/files/build/packaged/javascript/semantic.js.REMOVED.git-id index 3bebb62dd..13b7053ae 100644 --- a/node/src/files/build/packaged/javascript/semantic.js.REMOVED.git-id +++ b/node/src/files/build/packaged/javascript/semantic.js.REMOVED.git-id @@ -1 +1 @@ -cc8df66b4e0febc22293c8109ba70d035b958c5f \ No newline at end of file +263cdcca09a4b62ed0dfc6de95dab1efdf34eff3 \ No newline at end of file diff --git a/node/src/files/build/uncompressed/collections/menu.css b/node/src/files/build/uncompressed/collections/menu.css index 89301c478..d0a330185 100644 --- a/node/src/files/build/uncompressed/collections/menu.css +++ b/node/src/files/build/uncompressed/collections/menu.css @@ -173,14 +173,13 @@ width: 100%; } .ui.menu .ui.input > .icon { - padding-top: 0em; + padding-top: 0.1em; height: auto; } .ui.menu .item > .input input, .ui.menu .item > input[type="text"] { position: relative; - top: -0.45em; - margin: 0em; + margin: -0.45em 0em; padding-top: 0.45em; padding-bottom: 0.45em; } @@ -453,10 +452,11 @@ .ui.tiered.menu > .menu .item.active:after { position: absolute; content: ''; + margin-top: -1px; top: 100%; left: 0px; width: 100%; - height: 1px; + height: 2px; background-color: #FBFBFB; } .ui.tiered.menu .sub.menu { @@ -578,7 +578,7 @@ } .ui.pagination.menu .item { min-width: 2.7em; - min-height: 2.66em; + min-height: 2.7em; text-align: center; } .ui.pagination.menu.floated { @@ -1398,7 +1398,6 @@ } .ui.menu .item { font-size: 1rem; - height: 2.66em; } .ui.vertical.menu { width: 15rem; diff --git a/node/src/files/build/uncompressed/elements/icon.css b/node/src/files/build/uncompressed/elements/icon.css index be30394ca..f5880db4b 100644 --- a/node/src/files/build/uncompressed/elements/icon.css +++ b/node/src/files/build/uncompressed/elements/icon.css @@ -1424,16 +1424,13 @@ i.icon { } i.large.icon { font-size: 2em; - margin-right: 0.5em; vertical-align: middle; } i.huge.icon { font-size: 4em; - margin-right: 0.75em; vertical-align: middle; } i.massive.icon { font-size: 8em; - margin-right: 1em; vertical-align: middle; } diff --git a/node/src/files/build/uncompressed/modules/dimmer.js b/node/src/files/build/uncompressed/modules/dimmer.js index 8d24f0480..13141528e 100644 --- a/node/src/files/build/uncompressed/modules/dimmer.js +++ b/node/src/files/build/uncompressed/modules/dimmer.js @@ -115,6 +115,7 @@ $.fn.dimmer = function(parameters) { ; $dimmer .off(eventNamespace) + .remove() ; }, diff --git a/node/src/files/stylesheets/semantic.css b/node/src/files/stylesheets/semantic.css index 289916c79..14985a5c0 100755 --- a/node/src/files/stylesheets/semantic.css +++ b/node/src/files/stylesheets/semantic.css @@ -177,7 +177,7 @@ a:hover { transition: margin 0.3s ease; } #example .main.menu iframe { - margin: 10px 0px 0px 0px; + margin: 0px 0px 0px 0px; } #example .main.menu .count { /* font-size: 0.875em; diff --git a/src/collections/menu.less.REMOVED.git-id b/src/collections/menu.less.REMOVED.git-id index 717aeb6e8..4f586d432 100644 --- a/src/collections/menu.less.REMOVED.git-id +++ b/src/collections/menu.less.REMOVED.git-id @@ -1 +1 @@ -ae5be9219aa61370d76209f2c0efe1730f7a4f8a \ No newline at end of file +938a77368926e4c24478b94333049fc8a2662ad5 \ No newline at end of file diff --git a/src/elements/icon.less b/src/elements/icon.less index 1a4ea17d1..a30d82dfe 100755 --- a/src/elements/icon.less +++ b/src/elements/icon.less @@ -756,16 +756,13 @@ i.icon { } i.large.icon { font-size: 2em; - margin-right: 0.5em; vertical-align: middle; } i.huge.icon { font-size: 4em; - margin-right: 0.75em; vertical-align: middle; } i.massive.icon { font-size: 8em; - margin-right: 1em; vertical-align: middle; } diff --git a/src/modules/dimmer.js b/src/modules/dimmer.js index 8d24f0480..13141528e 100755 --- a/src/modules/dimmer.js +++ b/src/modules/dimmer.js @@ -115,6 +115,7 @@ $.fn.dimmer = function(parameters) { ; $dimmer .off(eventNamespace) + .remove() ; },