From bdff782f0e549fbe11552cfe5ca46ad4e63a23a0 Mon Sep 17 00:00:00 2001 From: codecalm Date: Wed, 29 Jan 2020 22:51:49 +0100 Subject: [PATCH] reformat code --- pages/_includes/cards/order-statistics.html | 42 +++-- pages/_includes/cards/profile-2.html | 52 +++--- pages/_includes/cards/profile-edit-big.html | 140 +++++++------- pages/_includes/cards/profile-edit.html | 66 +++---- pages/_includes/cards/profile-timeline.html | 192 ++++++++++---------- pages/_includes/cards/profile.html | 20 +- pages/_includes/cards/ribbon.html | 8 +- pages/_includes/cards/small-stats-3.html | 14 +- pages/_includes/cards/small-stats.html | 52 +++--- pages/_includes/cards/social-traffic.html | 92 +++++----- pages/_includes/cards/subscribe.html | 62 +++---- pages/_includes/cards/tasks.html | 70 +++---- pages/_includes/cards/user-card.html | 18 +- pages/_includes/cards/user-info.html | 54 +++--- pages/_includes/cards/users-list-2.html | 40 ++-- pages/_includes/cards/users-list.html | 64 +++---- scss/ui/_forms.scss | 5 - 17 files changed, 496 insertions(+), 495 deletions(-) diff --git a/pages/_includes/cards/order-statistics.html b/pages/_includes/cards/order-statistics.html index cb1063d72..49de43500 100644 --- a/pages/_includes/cards/order-statistics.html +++ b/pages/_includes/cards/order-statistics.html @@ -1,27 +1,29 @@
-
+
-
Total orders
+
Total orders
-
-
2,137
-
{% include ui/trending.html value=7 %}
-
+
+
2,137
+
{% include ui/trending.html value=7 %}
+
- {% include ui/progress.html values="40,15,25,15,5" class="mb-4" %} + {% include ui/progress.html values="40,15,25,15,5" class="mb-4" %} -
    - {% for item in site.data.orders %} -
  • -
    -
    - {{ item.title }} -
    {{ item.subtitle }}
    -
    -
    {{ forloop.index | random_number: 500, 2000 | intcomma }} orders
    -
    • - {% endfor %} -
-
+
    + {% for item in site.data.orders %} +
  • +
    +
    + {{ item.title }} +
    {{ item.subtitle }}
    +
    +
    {{ forloop.index | random_number: 500, 2000 + | intcomma }} orders +
    +
    • + {% endfor %} +
+
diff --git a/pages/_includes/cards/profile-2.html b/pages/_includes/cards/profile-2.html index 2093793a4..2d20d6281 100644 --- a/pages/_includes/cards/profile-2.html +++ b/pages/_includes/cards/profile-2.html @@ -1,29 +1,29 @@
-
-
- {% include ui/avatar.html person-id=8 size="xl" %} -
-

{{ site.data.people[20].first_name }} {{ site.data.people[20].last_name }}

-

{{ site.data.people[20].job_title }}

+
+
+ {% include ui/avatar.html person-id=8 size="xl" %} +
+

{{ site.data.people[20].first_name }} {{ site.data.people[20].last_name }}

+

{{ site.data.people[20].job_title }}

- -
-
-
+ +
+
+
diff --git a/pages/_includes/cards/profile-edit-big.html b/pages/_includes/cards/profile-edit-big.html index dd2bf03e5..8982b62c5 100644 --- a/pages/_includes/cards/profile-edit-big.html +++ b/pages/_includes/cards/profile-edit-big.html @@ -1,76 +1,76 @@
-
-

Edit Profile

+
+

Edit Profile

-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
- -
+
+ + + +
+ +
diff --git a/pages/_includes/cards/profile-edit.html b/pages/_includes/cards/profile-edit.html index 09f37832a..754c51e7b 100644 --- a/pages/_includes/cards/profile-edit.html +++ b/pages/_includes/cards/profile-edit.html @@ -1,39 +1,39 @@
-
-

My Profile

-
-
-
-
-
- -
-
-
- - -
-
-
+
+

My Profile

+
+
+ +
+
+ +
+
+
+ + +
+
+
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- -
- -
+
+ +
+ +
diff --git a/pages/_includes/cards/profile-timeline.html b/pages/_includes/cards/profile-timeline.html index 8d1dd116f..a1965ea81 100644 --- a/pages/_includes/cards/profile-timeline.html +++ b/pages/_includes/cards/profile-timeline.html @@ -1,102 +1,102 @@
-
-
- -
- {% include ui/button.html icon="camera" icon-only=true color="secondary" %} -
-
-
-
diff --git a/pages/_includes/cards/profile.html b/pages/_includes/cards/profile.html index f5c91b63f..d6a9f1d2c 100644 --- a/pages/_includes/cards/profile.html +++ b/pages/_includes/cards/profile.html @@ -1,14 +1,14 @@
-
-

{{ site.data.people[4].first_name }} {{ site.data.people[4].last_name }}

+
+

{{ site.data.people[4].first_name }} {{ site.data.people[4].last_name }}

-

- Big belly rude boy, million dollar hustler. Unemployed. -

+

+ Big belly rude boy, million dollar hustler. Unemployed. +

- -
+ +
diff --git a/pages/_includes/cards/ribbon.html b/pages/_includes/cards/ribbon.html index cdac5b1d8..ec3975dac 100644 --- a/pages/_includes/cards/ribbon.html +++ b/pages/_includes/cards/ribbon.html @@ -3,10 +3,10 @@
- {% if include.lorem %} -

Card with ribbon

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Assumenda consectetur consequuntur culpa cum dolorum eveniet.

- {% endif %} + {% if include.lorem %} +

Card with ribbon

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Assumenda consectetur consequuntur culpa cum dolorum eveniet.

+ {% endif %}
{% if include.text %}{{ include.text }}{% else %}{% include ui/icon.html icon="star" class="icon-filled" use-svg=true %}{% endif %}
diff --git a/pages/_includes/cards/small-stats-3.html b/pages/_includes/cards/small-stats-3.html index 6470b1def..f6daeb964 100644 --- a/pages/_includes/cards/small-stats-3.html +++ b/pages/_includes/cards/small-stats-3.html @@ -1,9 +1,9 @@
-
-
- {% include ui/trending.html value=include.percentage %} -
-
{{ include.number }}
-
{{ include.title }}
-
+
+
+ {% include ui/trending.html value=include.percentage %} +
+
{{ include.number }}
+
{{ include.title }}
+
diff --git a/pages/_includes/cards/small-stats.html b/pages/_includes/cards/small-stats.html index 20be24ca9..0ddcf119b 100644 --- a/pages/_includes/cards/small-stats.html +++ b/pages/_includes/cards/small-stats.html @@ -1,33 +1,33 @@ {% assign chart-type = include.chart-type | default: 'line' %} {% assign chart-position = include.chart-position | default: 'right' %}
-
- {% if include.icon %} - {% include ui/icon.html icon=include.icon %} - {% elsif include.person-id %} - {% include ui/avatar.html person-id=include.person-id class="mr-3 rounded" %} - {% endif %} +
+ {% if include.icon %} + {% include ui/icon.html icon=include.icon %} + {% elsif include.person-id %} + {% include ui/avatar.html person-id=include.person-id class="mr-3 rounded" %} + {% endif %} - {% if include.chart-data and chart-position == "left" %} -
- {% include ui/sparkline.html data=include.chart-data type=chart-type color=include.color label=include.chart-label label-icon=include.chart-label-icon %} -
- {% endif %} + {% if include.chart-data and chart-position == "left" %} +
+ {% include ui/sparkline.html data=include.chart-data type=chart-type color=include.color label=include.chart-label label-icon=include.chart-label-icon %} +
+ {% endif %} -
-
- {{ include.count | default: 1700 | format_number }} {{ include.subtitle }} - {% if include.small-icon %} - {% include ui/icon.html icon=include.small-icon color=include.color class="icon-sm ml-1" %} - {% endif %} -
-
{{ include.description | default: "Users" }}
-
+
+
+ {{ include.count | default: 1700 | format_number }} {{ include.subtitle }} + {% if include.small-icon %} + {% include ui/icon.html icon=include.small-icon color=include.color class="icon-sm ml-1" %} + {% endif %} +
+
{{ include.description | default: "Users" }}
+
- {% if include.chart-data and chart-position=="right" %} -
- {% include ui/sparkline.html data=include.chart-data type=chart-type color=include.color label=include.chart-label label-icon=include.chart-label-icon %} -
- {% endif %} -
+ {% if include.chart-data and chart-position=="right" %} +
+ {% include ui/sparkline.html data=include.chart-data type=chart-type color=include.color label=include.chart-label label-icon=include.chart-label-icon %} +
+ {% endif %} +
diff --git a/pages/_includes/cards/social-traffic.html b/pages/_includes/cards/social-traffic.html index 15133306e..b269ae55c 100644 --- a/pages/_includes/cards/social-traffic.html +++ b/pages/_includes/cards/social-traffic.html @@ -1,48 +1,48 @@
-
-

Social Media Traffic

-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
NetworkVisitors
Instagram3,550 -
-
-
-
Twitter1,789 -
-
-
-
Facebook1,245 -
-
-
-
Pinterest95 -
-
-
-
+
+

Social Media Traffic

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
NetworkVisitors
Instagram3,550 +
+
+
+
Twitter1,789 +
+
+
+
Facebook1,245 +
+
+
+
Pinterest95 +
+
+
+
diff --git a/pages/_includes/cards/subscribe.html b/pages/_includes/cards/subscribe.html index 9233d4019..ecac2495d 100644 --- a/pages/_includes/cards/subscribe.html +++ b/pages/_includes/cards/subscribe.html @@ -1,35 +1,35 @@ {% assign person-id = include.person-id | default: 0 %} {% assign person = site.data.people[person-id] %}
-
-
-
- {% include ui/avatar.html person=person size="lg" %} -
-
-

- {{ person.full_name }} -

-
- Working in {{ person.company }} -
-
- ● Online -
-
-
- - Subscribe - -
-
-
- - {% include ui/dropdown-menu.html right=true %} -
-
-
-
+
+
+
+ {% include ui/avatar.html person=person size="lg" %} +
+
+

+ {{ person.full_name }} +

+
+ Working in {{ person.company }} +
+
+ ● Online +
+
+
+ + Subscribe + +
+
+
+ + {% include ui/dropdown-menu.html right=true %} +
+
+
+
diff --git a/pages/_includes/cards/tasks.html b/pages/_includes/cards/tasks.html index 9e8a1c979..eabbe859b 100644 --- a/pages/_includes/cards/tasks.html +++ b/pages/_includes/cards/tasks.html @@ -1,35 +1,39 @@
-
-

Tasks

-
-
- - {% for task in site.data.tasks %} - - - - - - - - - {% endfor %} -
- - - {{ task.name }} - - {% include ui/icon.html icon="calendar" %} - {{ forloop.index | random_date: "2019-01-01", "2018-01-01" | date: '%B %d, %Y' }} - - {% include ui/icon.html icon="check" %} {{ forloop.index | random_number: 0, 6 }}/{{ forloop.index | random_number: 5, 10 }} - - {% include ui/icon.html icon="message-square" %} {{ forloop.index | random_number: 0, 12 }} - - {% include ui/avatar.html person-id=forloop.index size="sm" %} -
-
+
+

Tasks

+
+
+ + {% for task in site.data.tasks %} + + + + + + + + + {% endfor %} +
+ + + {{ task.name }} + + {% include ui/icon.html icon="calendar" %} + {{ forloop.index | random_date: "2019-01-01", "2018-01-01" | date: '%B %d, %Y' }} + + + {% include ui/icon.html icon="check" %} + {{ forloop.index | random_number: 0, 6 }}/{{ forloop.index | random_number: 5, 10 }} + + + + % include ui/icon.html icon="message-square" %} {{ forloop.index | random_number: 0, 12 }} + + {% include ui/avatar.html person-id=forloop.index size="sm" %} +
+
diff --git a/pages/_includes/cards/user-card.html b/pages/_includes/cards/user-card.html index 9c7c3fdbc..8185a3dc2 100644 --- a/pages/_includes/cards/user-card.html +++ b/pages/_includes/cards/user-card.html @@ -1,13 +1,13 @@ {% assign person-id = include.person-id | default: 0 %} {% assign person = site.data.people[person-id] %} -
-
- {% include ui/avatar.html person=person class="rounded" %} -
-
-
{{ person.full_name }}
-
{{ person.job_title }}
-
-
+
+
+ {% include ui/avatar.html person=person class="rounded" %} +
+
+
{{ person.full_name }}
+
{{ person.job_title }}
+
+
diff --git a/pages/_includes/cards/user-info.html b/pages/_includes/cards/user-info.html index 7cf55117b..90d61a640 100644 --- a/pages/_includes/cards/user-info.html +++ b/pages/_includes/cards/user-info.html @@ -2,31 +2,31 @@ {% assign person = site.data.people[person-id] %}
-
-
{{ include.title | default: 'Basic info' }}
-
- {% include ui/icon.html icon="book" class="mr-2 text-muted" %} - Went to: {{ person.university }} -
-
- {% include ui/icon.html icon="briefcase" class="mr-2 text-muted" %} - Worked at: {{ person.company }} -
-
- {% include ui/icon.html icon="home" class="mr-2 text-muted" %} - Lives in: {{ person.city }}, {{ person.country }} -
-
- {% include ui/icon.html icon="map-pin" class="mr-2 text-muted" %} - From: {% include ui/flag.html flag=person.country_code %} {{ person.country }} -
-
- {% include ui/icon.html icon="calendar" class="mr-2 text-muted" %} - Birth date: {{ person.birth_date }} -
-
- {% include ui/icon.html icon="clock" class="mr-2 text-muted" %} - Time zone: {{ person.time_zone }} -
-
+
+
{{ include.title | default: 'Basic info' }}
+
+ {% include ui/icon.html icon="book" class="mr-2 text-muted" %} + Went to: {{ person.university }} +
+
+ {% include ui/icon.html icon="briefcase" class="mr-2 text-muted" %} + Worked at: {{ person.company }} +
+
+ {% include ui/icon.html icon="home" class="mr-2 text-muted" %} + Lives in: {{ person.city }}, {{ person.country }} +
+
+ {% include ui/icon.html icon="map-pin" class="mr-2 text-muted" %} + From: {% include ui/flag.html flag=person.country_code %} {{ person.country }} +
+
+ {% include ui/icon.html icon="calendar" class="mr-2 text-muted" %} + Birth date: {{ person.birth_date }} +
+
+ {% include ui/icon.html icon="clock" class="mr-2 text-muted" %} + Time zone: {{ person.time_zone }} +
+
diff --git a/pages/_includes/cards/users-list-2.html b/pages/_includes/cards/users-list-2.html index b53c8ef58..6eb3b2af2 100644 --- a/pages/_includes/cards/users-list-2.html +++ b/pages/_includes/cards/users-list-2.html @@ -1,24 +1,24 @@ {% assign limit = include.limit | default: 10 %} {% assign offset = include.offset | default: 0 %}
-
-

{{ include.title | default: 'Top users' }}

-
-
-
- {% assign colors = 'green,red,yellow,x,x' | split: ',' %} - {% for person in site.data.people limit: limit offset: offset %} - {% assign color = forloop.index | plus: 5 | random_item: colors %} -
- - {% include ui/avatar.html person=person status=color %} - -
- {{ person.full_name }} - {{ forloop.index | random_date_ago: 6 | timeago }} -
-
- {% endfor %} -
-
+
+

{{ include.title | default: 'Top users' }}

+
+
+
+ {% assign colors = 'green,red,yellow,x,x' | split: ',' %} + {% for person in site.data.people limit: limit offset: offset %} + {% assign color = forloop.index | plus: 5 | random_item: colors %} +
+ + {% include ui/avatar.html person=person status=color %} + +
+ {{ person.full_name }} + {{ forloop.index | random_date_ago: 6 | timeago }} +
+
+ {% endfor %} +
+
diff --git a/pages/_includes/cards/users-list.html b/pages/_includes/cards/users-list.html index 9e98ee91d..42c6f5e27 100644 --- a/pages/_includes/cards/users-list.html +++ b/pages/_includes/cards/users-list.html @@ -3,36 +3,36 @@ {% assign hoverable = include.hoverable | default: false %} {% assign checked-ids = include.checked-ids | default: '3,5,6' | extract: ',' %}
-
-

{{ include.title | default: 'Last commits' }}

-
-
- {% assign colors = 'green,red,yellow,x,x' | split: ',' %} - {% for person in site.data.people limit: limit offset: offset %} - {% assign color = forloop.index | plus: 5 | random_item: colors %} -
- {% if include.checkbox %} -
- {% else %} -
- {% endif %} - - {% include ui/avatar.html person=person %} - -
- {{ person.full_name }} - {% assign i = forloop.index | plus: offset %} - {{ site.data.commits[i].description }} -
- {% if hoverable %} - {% if checked-ids contains forloop.index %} - {% assign star-color = 'text-yellow' %} - {% else %} - {% assign star-color = 'text-muted' %} - {% endif %} - {% include ui/icon.html icon="star" class=star-color %} - {% endif %} -
- {% endfor %} -
+
+

{{ include.title | default: 'Last commits' }}

+
+
+ {% assign colors = 'green,red,yellow,x,x' | split: ',' %} + {% for person in site.data.people limit: limit offset: offset %} + {% assign color = forloop.index | plus: 5 | random_item: colors %} +
+ {% if include.checkbox %} +
+ {% else %} +
+ {% endif %} + + {% include ui/avatar.html person=person %} + +
+ {{ person.full_name }} + {% assign i = forloop.index | plus: offset %} + {{ site.data.commits[i].description }} +
+ {% if hoverable %} + {% if checked-ids contains forloop.index %} + {% assign star-color = 'text-yellow' %} + {% else %} + {% assign star-color = 'text-muted' %} + {% endif %} + {% include ui/icon.html icon="star" class=star-color %} + {% endif %} +
+ {% endfor %} +
diff --git a/scss/ui/_forms.scss b/scss/ui/_forms.scss index 89201afd2..dc56170c3 100644 --- a/scss/ui/_forms.scss +++ b/scss/ui/_forms.scss @@ -85,11 +85,6 @@ Form control color: $red; } -.custom-control-label:before { - background: transparent; - border: 1px solid $border-color; -} - /** Form help */