From 3e7d3c7c710b3b43a5adc48e536c15f1d2206f23 Mon Sep 17 00:00:00 2001 From: jlukic Date: Wed, 21 Aug 2013 04:29:10 -0400 Subject: [PATCH] late night changes Former-commit-id: 5fd2e7d11461227276655211ec14b61eaab805f9 Former-commit-id: 7890420737ceec6e941d2da66c8806636de6659c --- build/uncompressed/collections/menu.css | 11 ++-- build/uncompressed/modules/dropdown.css | 2 +- node/src/documents/collections/menu.html | 52 +++++++++---------- .../components/semantic/collections/menu.css | 11 ++-- .../components/semantic/modules/dropdown.css | 2 +- src/collections/menu.less | 11 ++-- src/modules/dropdown.less | 6 +-- 7 files changed, 52 insertions(+), 43 deletions(-) diff --git a/build/uncompressed/collections/menu.css b/build/uncompressed/collections/menu.css index 37822fa94..73aae1e6d 100644 --- a/build/uncompressed/collections/menu.css +++ b/build/uncompressed/collections/menu.css @@ -185,9 +185,12 @@ width: 100%; } .ui.menu input { - margin: 0.25em 0em; - padding-top: 0.55em; - padding-bottom: 0.55em; + margin: -0.5em 0em; + padding-top: 0.5em; + padding-bottom: 0.5em; +} +.ui.vertical.menu input { + margin: 0em; } /*-------------- Header @@ -390,7 +393,7 @@ margin: 0em; } .ui.vertical.menu .dropdown.item .menu .item { - font-size: 1em; + font-size: 0.875rem; padding: 0.75em 1em; } .ui.vertical.menu .dropdown.item .menu .item .icon { diff --git a/build/uncompressed/modules/dropdown.css b/build/uncompressed/modules/dropdown.css index fe754589a..69f1ed96d 100644 --- a/build/uncompressed/modules/dropdown.css +++ b/build/uncompressed/modules/dropdown.css @@ -73,7 +73,7 @@ display: block; color: rgba(0, 0, 0, 0.75); padding: 0.85em 1em !important; - font-size: 0.9rem; + font-size: 0.875rem; text-transform: none; font-weight: normal; text-align: left; diff --git a/node/src/documents/collections/menu.html b/node/src/documents/collections/menu.html index 6b3674bc9..a454dbb3b 100755 --- a/node/src/documents/collections/menu.html +++ b/node/src/documents/collections/menu.html @@ -40,28 +40,21 @@ type : 'UI Collection' Browse
-
+
- More + Language
- Edit Profile -
- Choose Language -
-
English
-
Russian
-
Spanish
-
-
- Account Settings + English + Russian + Spanish
- +

Vertical Menu

@@ -86,13 +79,20 @@ type : 'UI Collection' More
Edit Profile - Choose Language +
+ Choose Language +
+
English
+
Russian
+
Spanish
+
+
Account Settings
- +

Pagination

A pagination menu is specially formatted to present links to pages of content

@@ -120,7 +120,7 @@ type : 'UI Collection'
- +

Tabular

A message can be formatted to show tabs of information

@@ -133,7 +133,7 @@ type : 'UI Collection'
- +

Tiered Menu

A tiered menu can show the sub-sections available as part of an activated section.

@@ -150,7 +150,7 @@ type : 'UI Collection' Messages
-
+
@@ -202,8 +202,8 @@ type : 'UI Collection'
- - + +

Secondary Menu

A secondary menu allows for a section of content on a page to be activated

@@ -297,7 +297,7 @@ type : 'UI Collection'
- +

Text

A menu can display simple text links

@@ -394,12 +394,12 @@ type : 'UI Collection'
- - + +

Link Item

A menu may contain a link item, or an item formatted as if it is a link.

- +

Items that are anchor tags will automatically be formatted as a link.

@@ -671,7 +671,7 @@ type : 'UI Collection'
- +

Icons

@@ -745,7 +745,7 @@ type : 'UI Collection' Bike
- +

Evenly sized items

A menu may divide its items evenly

diff --git a/node/src/files/components/semantic/collections/menu.css b/node/src/files/components/semantic/collections/menu.css index 37822fa94..73aae1e6d 100644 --- a/node/src/files/components/semantic/collections/menu.css +++ b/node/src/files/components/semantic/collections/menu.css @@ -185,9 +185,12 @@ width: 100%; } .ui.menu input { - margin: 0.25em 0em; - padding-top: 0.55em; - padding-bottom: 0.55em; + margin: -0.5em 0em; + padding-top: 0.5em; + padding-bottom: 0.5em; +} +.ui.vertical.menu input { + margin: 0em; } /*-------------- Header @@ -390,7 +393,7 @@ margin: 0em; } .ui.vertical.menu .dropdown.item .menu .item { - font-size: 1em; + font-size: 0.875rem; padding: 0.75em 1em; } .ui.vertical.menu .dropdown.item .menu .item .icon { diff --git a/node/src/files/components/semantic/modules/dropdown.css b/node/src/files/components/semantic/modules/dropdown.css index fe754589a..69f1ed96d 100644 --- a/node/src/files/components/semantic/modules/dropdown.css +++ b/node/src/files/components/semantic/modules/dropdown.css @@ -73,7 +73,7 @@ display: block; color: rgba(0, 0, 0, 0.75); padding: 0.85em 1em !important; - font-size: 0.9rem; + font-size: 0.875rem; text-transform: none; font-weight: normal; text-align: left; diff --git a/src/collections/menu.less b/src/collections/menu.less index b05f9c16a..171fef05e 100755 --- a/src/collections/menu.less +++ b/src/collections/menu.less @@ -260,9 +260,12 @@ width: 100%; } .ui.menu input { - margin: 0.25em 0em; - padding-top: 0.55em; - padding-bottom: 0.55em; + margin: -0.5em 0em; + padding-top: 0.5em; + padding-bottom: 0.5em; +} +.ui.vertical.menu input { + margin: 0em; } /*-------------- @@ -527,7 +530,7 @@ margin: 0em; } .ui.vertical.menu .dropdown.item .menu .item { - font-size: 1em; + font-size: 0.875rem; padding: 0.75em 1em; } .ui.vertical.menu .dropdown.item .menu .item .icon { diff --git a/src/modules/dropdown.less b/src/modules/dropdown.less index f589b9ca7..0e54c1740 100755 --- a/src/modules/dropdown.less +++ b/src/modules/dropdown.less @@ -113,7 +113,7 @@ color: rgba(0, 0, 0, 0.75); padding: 0.85em 1em !important; - font-size: 0.9rem; + font-size: 0.875rem; text-transform: none; font-weight: normal; text-align: left; @@ -265,10 +265,10 @@ .ui.selection.dropdown .menu { max-height: 312px; - + overflow-x: hidden; overflow-y: auto; - + -webkit-box-shadow: 0px 1px 0px 1px #EEEEEE; -moz-box-shadow: 0px 1px 0px 1px #EEEEEE; box-shadow: 0px 1px 0px 1px #EEEEEE;