diff --git a/server/documents/elements/input.html.eco b/server/documents/elements/input.html.eco index d8d03a762..11e7d68db 100755 --- a/server/documents/elements/input.html.eco +++ b/server/documents/elements/input.html.eco @@ -102,7 +102,8 @@ themes : ['Default']
-
+
+
Tags diff --git a/server/documents/index.html.eco b/server/documents/index.html.eco index 29a6df9e1..b60d7b090 100755 --- a/server/documents/index.html.eco +++ b/server/documents/index.html.eco @@ -12,7 +12,7 @@ type : 'Semantic'
- +
-
-

- Input -

- <%- @partial('examples/input') %> -
-
-

- Label -

- <%- @partial('examples/label') %> -

Message @@ -186,6 +174,12 @@ type : 'Semantic'

<%- @partial('examples/feed') %>
+
+

+ Label +

+ <%- @partial('examples/label') %> +
@@ -200,6 +194,12 @@ type : 'Semantic' <%- @partial('examples/segment') %>
+
+

+ Input +

+ <%- @partial('examples/input') %> +

Checkbox diff --git a/server/files/images/watercolor.jpg b/server/files/images/watercolor.jpg deleted file mode 100755 index a59bae2bc..000000000 Binary files a/server/files/images/watercolor.jpg and /dev/null differ diff --git a/server/files/stylesheets/home.css b/server/files/stylesheets/home.css index 3acf4b11a..a020ab6ea 100755 --- a/server/files/stylesheets/home.css +++ b/server/files/stylesheets/home.css @@ -675,11 +675,6 @@ #example .solid .column p { color: rgba(0, 0, 0, 0.5); } -#example .stripe .message { - margin: 2em 0em; -} - - diff --git a/server/layouts/default.html.eco b/server/layouts/default.html.eco index 54c0845bb..391f1209e 100755 --- a/server/layouts/default.html.eco +++ b/server/layouts/default.html.eco @@ -182,9 +182,10 @@ Close Menu
- + UI Docs
Download diff --git a/server/partials/examples/label.html b/server/partials/examples/label.html index 40e9be46e..ad78fc71f 100644 --- a/server/partials/examples/label.html +++ b/server/partials/examples/label.html @@ -6,4 +6,38 @@ 23 New -Dresses \ No newline at end of file +Dresses + + +
+ + Messages +
22
+ + + Friends +
22
+ +
+ + +
+ + + + +
+
+ + + + +
+
+ + + + +
+ + \ No newline at end of file diff --git a/server/partials/examples/message.html b/server/partials/examples/message.html index f40f2ee10..73e53996a 100644 --- a/server/partials/examples/message.html +++ b/server/partials/examples/message.html @@ -1,4 +1,24 @@
+ + This site uses cookies +
+
+
+
Looking for help?
+ +
+
+
We're creating your profile page

It will be ready in just a second.

-
\ No newline at end of file +

+ +
+ Top attached +
+
+ Bottom attached +
diff --git a/src/definitions/elements/input.less b/src/definitions/elements/input.less index b90f6c778..e2b39f059 100755 --- a/src/definitions/elements/input.less +++ b/src/definitions/elements/input.less @@ -179,6 +179,9 @@ box-sizing: border-box; transition: @iconTransition; } +.ui.icon.input > .icon { + top: @iconOffset; +} .ui.icon.input > .icon:before, .ui.icon.input > .icon:after { left: 0; diff --git a/src/themes/packages/default/collections/message.variables b/src/themes/packages/default/collections/message.variables index aa80b5eac..fb53e713f 100755 --- a/src/themes/packages/default/collections/message.variables +++ b/src/themes/packages/default/collections/message.variables @@ -14,8 +14,9 @@ @background: #EFEFEF; @lineHeight: 1.3; -@borderRadius: 0.25em; +@lineHeightOffset: ((@lineHeight - 1em) / 2); +@borderRadius: 0.25em; @borderWidth: 1px; @borderShadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.15) inset; @boxShadow: @@ -52,7 +53,7 @@ @iconDistance: 0.6em; /* Close Icon */ -@closeTopDistance: 1em; +@closeTopDistance: (1em + @lineHeightOffset); @closeRightDistance: 0.5em; @closeOpacity: 0.7; diff --git a/src/themes/packages/default/elements/input.variables b/src/themes/packages/default/elements/input.variables index 0a8440751..5520414c8 100755 --- a/src/themes/packages/default/elements/input.variables +++ b/src/themes/packages/default/elements/input.variables @@ -10,7 +10,10 @@ @verticalPadding: 0.8em; @horizontalPadding: 1em; + @lineHeight: 1.2em; +@lineHeightOffset: ((@lineHeight - 1em) / 2); + @padding: (@verticalPadding - @lineHeightOffset) @horizontalPadding; @textAlign: left; @@ -34,11 +37,14 @@ /* Icon Input */ @glyphWidth: 1.25em; + @iconWidth: (@verticalPadding * 2) + @glyphWidth; @iconOpacity: 0.5; @iconFocusOpacity: 1; -@iconSpacing: 0em; -@iconMargin: @iconWidth + @iconSpacing; +/*@iconOffset: @lineHeightOffset;*/ + +@iconDistance: 0em; +@iconMargin: @iconWidth + @iconDistance; @iconTransition: opacity 0.3s @defaultEasing; @transparentIconWidth: @glyphWidth; diff --git a/src/themes/packages/default/globals/site.variables b/src/themes/packages/default/globals/site.variables index 13adb2280..c25be8798 100755 --- a/src/themes/packages/default/globals/site.variables +++ b/src/themes/packages/default/globals/site.variables @@ -19,7 +19,7 @@ @importGoogleFonts : true; @googleFontName : 'Lato'; -@googleFontSizes : '300,400,700,300italic,400italic,700italic'; +@googleFontSizes : '400,700,400italic,700italic'; /*------------------- Site Colors @@ -57,11 +57,10 @@ --------------------*/ @pageBackground : #F7F7F7; -@lineHeight : 1.33; - @pageOverflowX : hidden; @fontSize : 14px; +@lineHeight : 1.33; @textColor : rgba(0, 0, 0, 0.8); @headerMargin : 1em 0em 1rem;