diff --git a/server/documents/elements/list.html.eco b/server/documents/elements/list.html.eco old mode 100644 new mode 100755 index e257bb8b6..f41353c18 --- a/server/documents/elements/list.html.eco +++ b/server/documents/elements/list.html.eco @@ -11,7 +11,7 @@ type : 'UI Element' themes : ['Default'] --- - + <%- @partial('header') %>
@@ -27,72 +27,70 @@ themes : ['Default']

Types

List

-

A simple list

+

A list

Apples
Pears
Oranges
-
-

List

-

A list using all optional content types

+
- +
-
Schnoodle
- Your new dog +
Daniel Louise
+ Friends since 1992
- +
- Thanks for being my owner -
Im so glad you chose to bring me home from the shelter...
+ Hey man +
Hey man so I forgot to send you an invite to my party, but its this saturday...
- +
- What a walk + What a day
Man i am so tired that walk today really was too far...
- +
- Sorry about your old dog -
Is this your address? I'm getting dropped off from the SPCA...
+ How does polar bear +
Have you ever wondered? How polar bear know what apple is...
- +
-
Ragamuffin
- Your old dog. +
Steve Jobes
+ Work acquaintance from Apple
- +
- Was on a walk today -
Here's a picture of me on the farm with a cow...
+ Inspirational! +
Check out this amazing TED video that I did a couple months ago...
- +
Ruff Ruff -
I know i usually message you in english but i wanted to see how your dog language was progressing...
+
Have you ever tried animal meditation? Today I spent 30 minutes as a dog...
- +
Reaching Out -
Hey its your old dog, been a while since you sent me to the farm...
+
Hey there's a new role at Apple you might be great for...
@@ -105,29 +103,32 @@ themes : ['Default']

Bulleted

A list can mark items with a bullet

-
Cats
-
Horses
-
Dogs + Gaining Access + Inviting Friends +
+ Benefits
-
Labradoodles
-
Shiba Inu
-
Mastiff
+ Use Anywhere + Rebates + Discounts
+ Warranty
For convenience, a simple bulleted list can also use ul tag.
    -
  • Cats
  • -
  • Horses
  • -
  • Dogs
  • +
  • Gaining Access
  • +
  • Inviting Friends
  • +
  • Benefits
    • -
    • Labradoodles
    • -
    • Shiba Inu
    • -
    • Mastiff
    • +
    • Use Anywhere
    • +
    • Rebates
    • +
    • Discounts
    +
  • Warranty
@@ -135,30 +136,32 @@ themes : ['Default']

Ordered

A list can be ordered numerically

-
Getting Started
-
Introduction
-
Languages + Getting Started + Introduction +
+ Languages
-
HTML
-
Javascript
-
CSS
+ HTML + Javascript + CSS
-
Review
+ Review
An ordered list can also use the ol tag
    -
  1. Cats
  2. -
  3. Horses
  4. -
  5. Dogs
  6. +
  7. Signing Up
  8. +
  9. User Benefits
  10. +
  11. User Types
      -
    1. Labradoodles
    2. -
    3. Shiba Inu
    4. -
    5. Mastiff
    6. +
    7. Admin
    8. +
    9. Power User
    10. +
    11. Regular User
  12. +
  13. Deleting Your Account
@@ -166,7 +169,7 @@ themes : ['Default']

Link

A link list is specially formatted for page links

- +
-
Snickerdoodle
- An excellent companion +
Helen
- +
-
Poodle
- A poodle, its pretty basic +
Christian
- +
-
Paulo
- He's also a dog +
Daniel
-

Relaxed

A list can relax its padding to provide more negative space

-
+ +
- +
+ +
- New York City -
A lovely city
+ Daniel Louise +
Last seen watching Arrested Development just now.
- +
+ +
- Chicago -
A lovely city
+ Stevie Feliciano +
Last seen watching Bob's Burgers 10 hours ago.
- +
+ +
- Los Angeles -
A lovely city
+ Elliot Fu +
Last seen watching The Godfather Part 2 yesterday.
-
+
- +
+ +
- New York City -
A lovely city
+ Daniel Louise
- +
+ +
- Chicago -
A lovely city
+ Stevie Feliciano
- +
+ +
- Los Angeles -
A lovely city
+ Elliot Fu
-
+
- +
+ +
- New York City -
A lovely city
+ Daniel Louise +
Last seen watching Arrested Development just now.
- +
+ +
- Chicago -
A lovely city
+ Stevie Feliciano +
Last seen watching Bob's Burgers 10 hours ago.
- +
+ +
- Los Angeles -
A lovely city
+ Elliot Fu +
Last seen watching The Godfather Part 2 yesterday.
-
+
- +
+ +
- New York City -
A lovely city
+ Daniel Louise
- +
+ +
- Chicago -
A lovely city
+ Stevie Feliciano
- +
+ +
- Los Angeles -
A lovely city
+ Elliot Fu
@@ -591,24 +626,27 @@ themes : ['Default']

A list can show divisions between content

- +
+ +
-
Snickerdoodle
- An excellent companion + Daniel Louise
- +
+ +
-
Poodle
- A poodle, its pretty basic + Stevie Feliciano
- +
+ +
-
Paulo
- He's also a dog + Elliot Fu
@@ -640,21 +678,21 @@ themes : ['Default']

A list can divide its items into cells

- +
Snickerdoodle
An excellent companion
- +
Poodle
A poodle, its pretty basic
- +
Paulo
He's also a dog @@ -686,128 +724,155 @@ themes : ['Default']

Sizes

A list can vary in size

-
+
- Apples + +
+ Helen +
- Oranges + +
+ Christian +
- Pinapples + +
+ Daniel +
-
+
- Apples + +
+ Helen +
- Oranges + +
+ Christian +
- Pinapples + +
+ Daniel +
-
+
- Apples + +
+ Helen +
- Oranges + +
+ Christian +
- Pinapples + +
+ Daniel +
-
+
- +
- Thanks for being my owner + Helen
- +
- What a walk + Christian
- +
- Sorry about your old dog + Daniel
-
+
- +
- Thanks for being my owner + Helen
- +
- What a walk + Christian
- +
- Sorry about your old dog + Daniel
-
+
- +
- Thanks for being my owner + Helen
- +
- What a walk + Christian
- +
- Sorry about your old dog + Daniel
-
+
- +
- Thanks for being my owner + Helen
- +
- What a walk + Christian
- +
- Sorry about your old dog + Daniel
diff --git a/server/layouts/default.html.eco b/server/layouts/default.html.eco index 5c4721bb7..84d650465 100755 --- a/server/layouts/default.html.eco +++ b/server/layouts/default.html.eco @@ -42,6 +42,7 @@ + @@ -57,7 +58,6 @@ - diff --git a/src/definitions/elements/list.less b/src/definitions/elements/list.less index 03e35aef5..ab9a0ff5d 100755 --- a/src/definitions/elements/list.less +++ b/src/definitions/elements/list.less @@ -216,7 +216,8 @@ ol.ui.list ol, font-size: 1rem; } .ui.horizontal.list > .item:first-child { - margin-left: 0em; + margin-left: 0em !important; + padding-left: 0em !important; } .ui.horizontal.list .list { padding-left: 0em; @@ -290,7 +291,7 @@ ol.ui.list ol, .ui.link.list .item a:active { color:@linkListItemDownColor; } -.ui.link.list a.active.item, +.ui.link.list .active.item, .ui.link.list .active.item a { color: @linkListItemActiveColor; } @@ -404,6 +405,7 @@ ul.ui.list li:before, left: @bulletOffset; content: @bulletCharacter; opacity: @bulletOpacity; + color: @bulletColor; vertical-align: @bulletVerticalAlign; } @@ -458,6 +460,7 @@ ol.ui.list li:before, counter-increment: @orderedCountName; content: @orderedCountContent; text-align: @orderedCountTextAlign; + color: @orderedCountColor; vertical-align: @orderedCountVerticalAlign; opacity: @orderedCountOpacity; } @@ -554,9 +557,7 @@ ol.ui.horizontal.list li:before, } .ui.horizontal.divided.list > .item:first-child { border-left: none; - padding-left: 0em; } - /* Inverted */ .ui.divided.inverted.list > .item, .ui.divided.inverted.list > .list, diff --git a/src/themes/packages/default/elements/list.variables b/src/themes/packages/default/elements/list.variables old mode 100644 new mode 100755 index bb97432d4..6491b6c71 --- a/src/themes/packages/default/elements/list.variables +++ b/src/themes/packages/default/elements/list.variables @@ -15,8 +15,7 @@ @horizontalPadding: 0em; /* Sub List */ -@childListDistance: 0.5em; -@childListPadding: @childListDistance 0em 0em 0em; +@childListPadding: 0.75em 0em 0.25em 0.5em; @childListIndent: 1em; /* List Item */ @@ -135,6 +134,7 @@ @bulletOpacity: 1; @bulletCharacter: '•'; +@bulletColor: @textColor; @bulletVerticalAlign: top; @bulletChildDistance: @bulletDistance; @@ -145,10 +145,11 @@ /* Ordered List */ @orderedCountName: ordered; @orderedCountContent: counters(ordered, ".") " "; +@orderedCountColor: @textColor; @orderedCountDistance: 1.25rem; -@orderedCountOpacity: 0.6; +@orderedCountOpacity: 0.8; @orderedCountTextAlign: right; -@orderedCountVerticalAlign: top; +@orderedCountVerticalAlign: middle; @orderedChildCountDistance: 2em; @orderedChildCountOffset: -2em; diff --git a/src/themes/packages/default/globals/site.variables b/src/themes/packages/default/globals/site.variables index a4d5f6737..e8aac953d 100755 --- a/src/themes/packages/default/globals/site.variables +++ b/src/themes/packages/default/globals/site.variables @@ -13,8 +13,8 @@ Fonts --------------------*/ -@headerFont : "Helvetica Neue", Arial, Helvetica, sans-serif; -@pageFont : "Helvetica Neue", Arial, Helvetica, sans-serif; +@headerFont : "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; +@pageFont : "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; @fontSmoothing : antialiased; /*-------------------