diff --git a/_config.yml b/_config.yml index e60240983abd43eace8deefd38e16da815fa628b..529fdaf81bba7d1b713e11aa0df57812772b894d 100644 --- a/_config.yml +++ b/_config.yml @@ -133,46 +133,46 @@ button_variants: socials: - name: facebook - icon: social/facebook + icon: brand/facebook title: Facebook - name: twitter - icon: social/twitter + icon: brand/twitter title: Twitter - name: google - icon: social/google + icon: brand/google title: Google - name: youtube - icon: social/youtube + icon: brand/youtube title: Youtube - name: vimeo - icon: social/vimeo + icon: brand/vimeo title: Vimeo - name: dribbble - icon: social/dribbble + icon: brand/dribbble title: Dribbble - name: github - icon: social/github + icon: brand/github title: Github - name: instagram - icon: social/instagram + icon: brand/instagram title: Instagram - name: pinterest - icon: social/pinterest + icon: brand/pinterest title: Pinterest - name: vk - icon: social/vk + icon: brand/vk title: VK - name: rss - icon: social/rss + icon: brand/rss title: RSS - name: flickr - icon: social/flickr + icon: brand/flickr title: Flickr - name: bitbucket - icon: social/bitbucket + icon: brand/bitbucket title: Bitbucker - name: tabler - icon: social/tabler + icon: brand/tabler title: Tabler months_short: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] diff --git a/build/browsersync.js b/build/browsersync.js index b140324004b19d8ebd74c9d3099de3f1bbebc55a..e787e69592cc57ced424c5c5dcd3ba92c8811469 100755 --- a/build/browsersync.js +++ b/build/browsersync.js @@ -24,5 +24,13 @@ bs.init({ ignoreInitial: true, }, notify: false, - open: false + open: false, + snippetOptions: { + rule: { + match: /<\/head>/i, + fn: function (snippet, match) { + return snippet + match; + } + } + } }); diff --git a/pages/_components/card-buttons.html b/pages/_components/card-buttons.html index 595fb9a75bc26228459b016432a7cddda2dfbbfc..5692c01fe783d8584acb873f7435560c8861de48 100644 --- a/pages/_components/card-buttons.html +++ b/pages/_components/card-buttons.html @@ -3,4 +3,4 @@ title: Card with footer buttons columns: 2 --- -{% include_cached cards/card.html title="Card with footer buttons" footer-buttons=true %} +{% include cards/card.html title="Card with footer buttons" footer-buttons=true %} diff --git a/pages/_components/card-with-image.html b/pages/_components/card-with-image.html index bc392e7086badf7abb7901b8632f959a1bc37d76..cc56b8342d32b8ec570c2a39ffb24aea1239ab23 100644 --- a/pages/_components/card-with-image.html +++ b/pages/_components/card-with-image.html @@ -3,4 +3,4 @@ title: Card with side image columns: 2 --- -{% include_cached cards/card-image.html title="Card with side image" %} +{% include cards/card-image.html title="Card with side image" %} diff --git a/pages/_data/feather.json b/pages/_data/feather.json deleted file mode 100644 index 9e26dfeeb6e641a33dae4961196235bdb965b21b..0000000000000000000000000000000000000000 --- a/pages/_data/feather.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/pages/_data/icons.yml b/pages/_data/icons.yml index fca8d7d4f87396dd39a07e4f2fd03144cd8c660d..558d4dc242f23b8e7ea577999c63685bc81078aa 100644 --- a/pages/_data/icons.yml +++ b/pages/_data/icons.yml @@ -1,350 +1,350 @@ brand: - android: \f101 - apple: \f102 - asana: \f103 - atlassian: \f104 - basecamp: \f105 - behance: \f106 - bing: \f107 - bitbucket: \f108 - bitcoin: \f109 - blogger: \f10a - bootstrap: \f10b - buddy: \f10c - circleci: \f10d - codepen: \f10e - codeship: \f10f - css3: \f110 - digitalocean: \f111 - disqus: \f112 - docker: \f113 - dribbble: \f114 - dropbox: \f115 - facebook: \f116 - figma: \f117 - flickr: \f118 - foursquare: \f119 - git: \f11a - github: \f11b - gitlab: \f11c - google: \f11d - googleplus: \f11e - gravatar: \f11f - hipchat: \f120 - html5: \f121 - instagram: \f122 - invision: \f123 - javascript: \f124 - kickstarter: \f125 - linkedin: \f126 - medium: \f127 - meetup: \f128 - messenger: \f129 - netflix: \f12a - pagekit: \f12b - paypal: \f12c - pinterest: \f12d - producthunt: \f12e - rss: \f12f - sass: \f130 - sentry: \f131 - skype: \f132 - slack: \f133 - snapchat: \f134 - spotify: \f135 - strava: \f136 - stripe: \f137 - tabler: \f138 - telegram: \f139 - tumblr: \f13a - twitter: \f13b - typescript: \f13c - uber: \f13d - uikit: \f13e - vimeo: \f13f - vk: \f140 - wechat: \f141 - whatsapp: \f142 - wordpress: \f143 - ycombinator: \f144 - youtube: \f145 + - brand/android + - brand/apple + - brand/asana + - brand/atlassian + - brand/basecamp + - brand/behance + - brand/bing + - brand/bitbucket + - brand/bitcoin + - brand/blogger + - brand/bootstrap + - brand/buddy + - brand/circleci + - brand/codepen + - brand/codeship + - brand/css3 + - brand/digitalocean + - brand/disqus + - brand/docker + - brand/dribbble + - brand/dropbox + - brand/facebook + - brand/figma + - brand/flickr + - brand/foursquare + - brand/git + - brand/github + - brand/gitlab + - brand/google + - brand/googleplus + - brand/gravatar + - brand/hipchat + - brand/html5 + - brand/instagram + - brand/invision + - brand/javascript + - brand/kickstarter + - brand/linkedin + - brand/medium + - brand/meetup + - brand/messenger + - brand/netflix + - brand/pagekit + - brand/paypal + - brand/pinterest + - brand/producthunt + - brand/rss + - brand/sass + - brand/sentry + - brand/skype + - brand/slack + - brand/snapchat + - brand/spotify + - brand/strava + - brand/stripe + - brand/tabler + - brand/telegram + - brand/tumblr + - brand/twitter + - brand/typescript + - brand/uber + - brand/uikit + - brand/vimeo + - brand/vk + - brand/wechat + - brand/whatsapp + - brand/wordpress + - brand/ycombinator + - brand/youtube fe: - activity: \f146 - airplay: \f147 - alert-circle: \f148 - alert-octagon: \f149 - alert-triangle: \f14a - align-center: \f14b - align-justify: \f14c - align-left: \f14d - align-right: \f14e - anchor: \f14f - aperture: \f150 - archive: \f151 - arrow-down-circle: \f152 - arrow-down-left: \f153 - arrow-down-right: \f154 - arrow-down: \f155 - arrow-left-circle: \f156 - arrow-left: \f157 - arrow-right-circle: \f158 - arrow-right: \f159 - arrow-up-circle: \f15a - arrow-up-left: \f15b - arrow-up-right: \f15c - arrow-up: \f15d - at-sign: \f15e - award: \f15f - bar-chart-2: \f160 - bar-chart: \f161 - battery-charging: \f162 - battery: \f163 - bell-off: \f164 - bell: \f165 - bluetooth: \f166 - bold: \f167 - book-open: \f168 - book: \f169 - bookmark: \f16a - box: \f16b - briefcase: \f16c - calendar: \f16d - camera-off: \f16e - camera: \f16f - cast: \f170 - check-circle: \f171 - check-square: \f172 - check: \f173 - chevron-down: \f174 - chevron-left: \f175 - chevron-right: \f176 - chevron-up: \f177 - chevrons-down: \f178 - chevrons-left: \f179 - chevrons-right: \f17a - chevrons-up: \f17b - chrome: \f17c - circle: \f17d - clipboard: \f17e - clock: \f17f - cloud-drizzle: \f180 - cloud-lightning: \f181 - cloud-off: \f182 - cloud-rain: \f183 - cloud-snow: \f184 - cloud: \f185 - code: \f186 - codepen: \f187 - codesandbox: \f188 - coffee: \f189 - columns: \f18a - command: \f18b - compass: \f18c - copy: \f18d - corner-down-left: \f18e - corner-down-right: \f18f - corner-left-down: \f190 - corner-left-up: \f191 - corner-right-down: \f192 - corner-right-up: \f193 - corner-up-left: \f194 - corner-up-right: \f195 - cpu: \f196 - credit-card: \f197 - crop: \f198 - crosshair: \f199 - database: \f19a - delete: \f19b - disc: \f19c - dollar-sign: \f19d - download-cloud: \f19e - download: \f19f - droplet: \f1a0 - edit-2: \f1a1 - edit-3: \f1a2 - edit: \f1a3 - external-link: \f1a4 - eye-off: \f1a5 - eye: \f1a6 - facebook: \f1a7 - fast-forward: \f1a8 - feather: \f1a9 - figma: \f1aa - file-minus: \f1ab - file-plus: \f1ac - file-text: \f1ad - file: \f1ae - film: \f1af - filter: \f1b0 - flag: \f1b1 - folder-minus: \f1b2 - folder-plus: \f1b3 - folder: \f1b4 - frown: \f1b5 - gift: \f1b6 - git-branch: \f1b7 - git-commit: \f1b8 - git-merge: \f1b9 - git-pull-request: \f1ba - github: \f1bb - gitlab: \f1bc - globe: \f1bd - grid: \f1be - hard-drive: \f1bf - hash: \f1c0 - headphones: \f1c1 - heart: \f1c2 - help-circle: \f1c3 - hexagon: \f1c4 - home: \f1c5 - image: \f1c6 - inbox: \f1c7 - info: \f1c8 - instagram: \f1c9 - italic: \f1ca - key: \f1cb - layers: \f1cc - layout: \f1cd - life-buoy: \f1ce - link-2: \f1cf - link: \f1d0 - linkedin: \f1d1 - list: \f1d2 - loader: \f1d3 - lock: \f1d4 - log-in: \f1d5 - log-out: \f1d6 - mail: \f1d7 - map-pin: \f1d8 - map: \f1d9 - maximize-2: \f1da - maximize: \f1db - meh: \f1dc - menu: \f1dd - message-circle: \f1de - message-square: \f1df - mic-off: \f1e0 - mic: \f1e1 - minimize-2: \f1e2 - minimize: \f1e3 - minus-circle: \f1e4 - minus-square: \f1e5 - minus: \f1e6 - monitor: \f1e7 - moon: \f1e8 - more-horizontal: \f1e9 - more-vertical: \f1ea - mouse-pointer: \f1eb - move: \f1ec - music: \f1ed - navigation-2: \f1ee - navigation: \f1ef - octagon: \f1f0 - package: \f1f1 - paperclip: \f1f2 - pause-circle: \f1f3 - pause: \f1f4 - pen-tool: \f1f5 - percent: \f1f6 - phone-call: \f1f7 - phone-forwarded: \f1f8 - phone-incoming: \f1f9 - phone-missed: \f1fa - phone-off: \f1fb - phone-outgoing: \f1fc - phone: \f1fd - pie-chart: \f1fe - play-circle: \f1ff - play: \f200 - plus-circle: \f201 - plus-square: \f202 - plus: \f203 - pocket: \f204 - power: \f205 - printer: \f206 - radio: \f207 - refresh-ccw: \f208 - refresh-cw: \f209 - repeat: \f20a - rewind: \f20b - rotate-ccw: \f20c - rotate-cw: \f20d - rss: \f20e - save: \f20f - scissors: \f210 - search: \f211 - send: \f212 - server: \f213 - settings: \f214 - share-2: \f215 - share: \f216 - shield-off: \f217 - shield: \f218 - shopping-bag: \f219 - shopping-cart: \f21a - shuffle: \f21b - sidebar: \f21c - skip-back: \f21d - skip-forward: \f21e - slack: \f21f - slash: \f220 - sliders: \f221 - smartphone: \f222 - smile: \f223 - speaker: \f224 - square: \f225 - star: \f226 - stop-circle: \f227 - sun: \f228 - sunrise: \f229 - sunset: \f22a - tablet: \f22b - tag: \f22c - target: \f22d - terminal: \f22e - thermometer: \f22f - thumbs-down: \f230 - thumbs-up: \f231 - toggle-left: \f232 - toggle-right: \f233 - trash-2: \f234 - trash: \f235 - trello: \f236 - trending-down: \f237 - trending-up: \f238 - triangle: \f239 - truck: \f23a - tv: \f23b - twitter: \f23c - type: \f23d - umbrella: \f23e - underline: \f23f - unlock: \f240 - upload-cloud: \f241 - upload: \f242 - user-check: \f243 - user-minus: \f244 - user-plus: \f245 - user-x: \f246 - user: \f247 - users: \f248 - video-off: \f249 - video: \f24a - voicemail: \f24b - volume-1: \f24c - volume-2: \f24d - volume-x: \f24e - volume: \f24f - watch: \f250 - wifi-off: \f251 - wifi: \f252 - wind: \f253 - x-circle: \f254 - x-octagon: \f255 - x-square: \f256 - x: \f257 - youtube: \f258 - zap-off: \f259 - zap: \f25a - zoom-in: \f25b - zoom-out: \f25c + - activity + - airplay + - alert-circle + - alert-octagon + - alert-triangle + - align-center + - align-justify + - align-left + - align-right + - anchor + - aperture + - archive + - arrow-down-circle + - arrow-down-left + - arrow-down-right + - arrow-down + - arrow-left-circle + - arrow-left + - arrow-right-circle + - arrow-right + - arrow-up-circle + - arrow-up-left + - arrow-up-right + - arrow-up + - at-sign + - award + - bar-chart-2 + - bar-chart + - battery-charging + - battery + - bell-off + - bell + - bluetooth + - bold + - book-open + - book + - bookmark + - box + - briefcase + - calendar + - camera-off + - camera + - cast + - check-circle + - check-square + - check + - chevron-down + - chevron-left + - chevron-right + - chevron-up + - chevrons-down + - chevrons-left + - chevrons-right + - chevrons-up + - chrome + - circle + - clipboard + - clock + - cloud-drizzle + - cloud-lightning + - cloud-off + - cloud-rain + - cloud-snow + - cloud + - code + - codepen + - codesandbox + - coffee + - columns + - command + - compass + - copy + - corner-down-left + - corner-down-right + - corner-left-down + - corner-left-up + - corner-right-down + - corner-right-up + - corner-up-left + - corner-up-right + - cpu + - credit-card + - crop + - crosshair + - database + - delete + - disc + - dollar-sign + - download-cloud + - download + - droplet + - edit-2 + - edit-3 + - edit + - external-link + - eye-off + - eye + - facebook + - fast-forward + - feather + - figma + - file-minus + - file-plus + - file-text + - file + - film + - filter + - flag + - folder-minus + - folder-plus + - folder + - frown + - gift + - git-branch + - git-commit + - git-merge + - git-pull-request + - github + - gitlab + - globe + - grid + - hard-drive + - hash + - headphones + - heart + - help-circle + - hexagon + - home + - image + - inbox + - info + - instagram + - italic + - key + - layers + - layout + - life-buoy + - link-2 + - link + - linkedin + - list + - loader + - lock + - log-in + - log-out + - mail + - map-pin + - map + - maximize-2 + - maximize + - meh + - menu + - message-circle + - message-square + - mic-off + - mic + - minimize-2 + - minimize + - minus-circle + - minus-square + - minus + - monitor + - moon + - more-horizontal + - more-vertical + - mouse-pointer + - move + - music + - navigation-2 + - navigation + - octagon + - package + - paperclip + - pause-circle + - pause + - pen-tool + - percent + - phone-call + - phone-forwarded + - phone-incoming + - phone-missed + - phone-off + - phone-outgoing + - phone + - pie-chart + - play-circle + - play + - plus-circle + - plus-square + - plus + - pocket + - power + - printer + - radio + - refresh-ccw + - refresh-cw + - repeat + - rewind + - rotate-ccw + - rotate-cw + - rss + - save + - scissors + - search + - send + - server + - settings + - share-2 + - share + - shield-off + - shield + - shopping-bag + - shopping-cart + - shuffle + - sidebar + - skip-back + - skip-forward + - slack + - slash + - sliders + - smartphone + - smile + - speaker + - square + - star + - stop-circle + - sun + - sunrise + - sunset + - tablet + - tag + - target + - terminal + - thermometer + - thumbs-down + - thumbs-up + - toggle-left + - toggle-right + - trash-2 + - trash + - trello + - trending-down + - trending-up + - triangle + - truck + - tv + - twitter + - type + - umbrella + - underline + - unlock + - upload-cloud + - upload + - user-check + - user-minus + - user-plus + - user-x + - user + - users + - video-off + - video + - voicemail + - volume-1 + - volume-2 + - volume-x + - volume + - watch + - wifi-off + - wifi + - wind + - x-circle + - x-octagon + - x-square + - x + - youtube + - zap-off + - zap + - zoom-in + - zoom-out diff --git a/pages/_data/menu.yml b/pages/_data/menu.yml index 2e7a695f1cef7c9c50b98b8e89beae1297b31769..d9c8388be121b8d7c24966d2ec8ce44c8b1b5dcc 100644 --- a/pages/_data/menu.yml +++ b/pages/_data/menu.yml @@ -1,3 +1,8 @@ +home: + url: index.html + title: Home + icon: home + form-elements: url: form-elements.html title: Form elements @@ -58,7 +63,7 @@ layout: docs: title: Documentation icon: file-text - url: docs.html + url: docs/index.html #changelog: # url: changelog.html diff --git a/pages/_docs/cards.md b/pages/_docs/cards.md index 3be1290d590283592443466734ad379ec596ba0c..2640776366e0668c08f71ea1752853055ed6ba0f 100644 --- a/pages/_docs/cards.md +++ b/pages/_docs/cards.md @@ -31,7 +31,7 @@ The best way to make your post eye-catching is adding an image to it. To do so, If you want to create a couple of posts next to each other, add the `.row-deck` class to `.row`—then they will all have the same height. {% example html columns=3 %} -
+
Short content
@@ -61,7 +61,7 @@ You can also add the image on the left side of the card. All you need do to is: ### Color variations {% example html columns=3 %} -
+
{% include cards/card.html title="Card status on top" hide-options=true status-position="top" status-color="red" body="Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aperiam deleniti fugit incidunt, iste, itaque minima neque" %}
diff --git a/pages/_includes/cards/card-group.html b/pages/_includes/cards/card-group.html index 881b8cd43943fcff26ce6c6b79df3385fbfd7067..68f58b75f426a870a1959b27a256b18d84706562 100644 --- a/pages/_includes/cards/card-group.html +++ b/pages/_includes/cards/card-group.html @@ -1,5 +1,5 @@
- {% include_cached cards/card.html link=true class="text-center" body="This is first card" inactive=true %} - {% include_cached cards/card.html link=true class="text-center" body="This is second card" active=true %} - {% include_cached cards/card.html link=true class="text-center" body="This is third card" %} + {% include cards/card.html link=true class="text-center" body="This is first card" inactive=true %} + {% include cards/card.html link=true class="text-center" body="This is second card" active=true %} + {% include cards/card.html link=true class="text-center" body="This is third card" %}
diff --git a/pages/_includes/cards/card.html b/pages/_includes/cards/card.html index 9053fc4df7d94292114c94a7dc8c3d78c758252d..b23a0562a8c14ed64297836e087cef3da5054aea 100644 --- a/pages/_includes/cards/card.html +++ b/pages/_includes/cards/card.html @@ -22,7 +22,7 @@ {% if include.header or include.header-title or include.header-tabs or include.header-pills %}
{% if include.header-tabs or include.header-pills %} - {% include_cached ui/nav.html header=true pills=include.header-pills tabs=include.header-tabs %} + {% include ui/nav.html header=true pills=include.header-pills tabs=include.header-tabs %} {% else %}

{{ include.header-title | default: 'Header title' }}

diff --git a/pages/_includes/cards/form-elements.html b/pages/_includes/cards/form-elements.html deleted file mode 100644 index 15362c02bc611e680d812810549ff304edc482d1..0000000000000000000000000000000000000000 --- a/pages/_includes/cards/form-elements.html +++ /dev/null @@ -1,87 +0,0 @@ -
-
-

Form elements

-
-
-
-
-
-
{% include forms/form-elements-1.html %}
-
{% include forms/form-elements-2.html %}
-
-
-
-
-
{% include forms/form-elements-3.html %}
-
{% include forms/form-elements-4.html %}
-
-
-
-
-
{% include forms/form-elements-5.html %}
-
{% include forms/form-elements-6.html %}
-
-
-
-
-
-
- Cancel - -
- -
-
- -{% comment %} - -{% endcomment %} diff --git a/pages/_includes/cards/icons.html b/pages/_includes/cards/icons.html index dca87ee670de7cfb2448ed2ff4979974fa6194a6..f67342d879a452fb1a816eb3d83eb9ddc2147fb9 100644 --- a/pages/_includes/cards/icons.html +++ b/pages/_includes/cards/icons.html @@ -1,29 +1,17 @@
-
-
{{ include.title }}
-
-
-
-

{{ include.description }} For more info click here. -

-

<i class="{{ include.icon_class }} {{ include.icon_class }}-ICON_NAME"></i> -

-
-
-
-
    - {% for icon in include.icons %} -
  • - {% include ui/icon.html icon=icon class="icon-md" %} -
    • - {% endfor %} - {% for icon in (0..20) %} -
  • - {% endfor %} -
-
-
+
{{ include.title }}
+
+
    + {% for icon in site.data.icons[include.group] %} +
  • + {% include_cached ui/icon.html icon=icon class="icon-md" %} +
    • + {% endfor %} + {% for icon in (0..20) %} +
  • + {% endfor %} +
diff --git a/pages/_includes/cards/project-summary.html b/pages/_includes/cards/project-summary.html index e647ab98fdff5030b72a88954d71dd6e935b0c9c..90db6323e552deea39edd100d681c6aecbed8f24 100644 --- a/pages/_includes/cards/project-summary.html +++ b/pages/_includes/cards/project-summary.html @@ -1,16 +1,14 @@
- {% include ui/avatar.html size="xl" placeholder="W" class="mb-4" %} -

{{ include.title | default: "New website" }}

-

Due to: 28 Aug 2018

+ {% include ui/avatar.html size="xl" placeholder="W" class="mb-4" color=include.project-color %} +

{{ include.title | default: "New website" }}

+

Due to: {{ include.date | default: '28 Aug 2019' }}

- Development + {{ include.stage | default: 'Waiting' }}

- {% include ui/avatar-list.html text="+5" stacked=true %} + {% include ui/avatar-list.html stacked=true offset=include.avatar-offset limit=include.avatar-limit %}
-
-
-
+ {% include ui/progress.html class="card-progress" percentage=include.percentage color=include.percentage-color %}
diff --git a/pages/_includes/cards/store-product.html b/pages/_includes/cards/store-product.html index 68a373ec9b7ae6c9c86a7516b2e5463067113e12..fb2b53df57abd21c3f6ff4bcf89fa1a98b5ebdc1 100644 --- a/pages/_includes/cards/store-product.html +++ b/pages/_includes/cards/store-product.html @@ -17,4 +17,4 @@
-
\ No newline at end of file +
diff --git a/pages/_includes/cards/user-portfolio.html b/pages/_includes/cards/user-portfolio.html index 71774c7e59122f8f2cad08f7d55318503da87751..5c24bf02f5b49cbc13aca58ab7028b179db3c85c 100644 --- a/pages/_includes/cards/user-portfolio.html +++ b/pages/_includes/cards/user-portfolio.html @@ -44,4 +44,4 @@
- \ No newline at end of file + diff --git a/pages/_includes/cards/user-profile-4.html b/pages/_includes/cards/user-profile-4.html index ffb17128dd8646536072b981d70ab96781a0529b..0a52e1c150fd90f88337b2184b6a008485ee68cb 100644 --- a/pages/_includes/cards/user-profile-4.html +++ b/pages/_includes/cards/user-profile-4.html @@ -10,9 +10,9 @@
{{ p.email }}
{{ p.ssn }}
- {% include ui/icon-brand.html icon="facebook-f" class="mr-2 icon-filled text-facebook" %} - {% include ui/icon-brand.html icon="twitter" class="icon-filled text-twitter mx-2" %} - {% include ui/icon-brand.html icon="youtube" class="icon-filled text-youtube mx-2" %} + {% include ui/icon.html icon="brand/facebook" class="mr-2 text-facebook" %} + {% include ui/icon.html icon="brand/twitter" class="text-twitter mx-2" %} + {% include ui/icon.html icon="brand/youtube" class="text-youtube mx-2" %}
diff --git a/pages/_includes/layout/homepage.html b/pages/_includes/layout/homepage.html index 95e003c03f00332a10828c4d79a1708a45c03357..289d9dcf8a847ee7183e47cf3b9b33e5161a0c8d 100644 --- a/pages/_includes/layout/homepage.html +++ b/pages/_includes/layout/homepage.html @@ -1,4 +1,4 @@ -
+
{% include cards/charts/sales.html %}
@@ -49,32 +49,30 @@
-
+
+
+
+ {% include cards/project-summary.html stage-color="red" %} +
+
+ {% include cards/project-summary.html title="UI Redesign" date="11 Nov 2019" stage="Final review" avatar-limit=3 avatar-offset=9 project-color="green" percentage=80 percentage-color="green" %} +
+
+ {% include cards/small-stats-3.html number=43 title="New Tickets" percentage=6 %} +
+
+ {% include cards/small-stats-3.html number="$95" title="Daily Earnings" percentage=-2 %} +
+
+ {% include cards/small-stats-3.html number=7 title="New Replies" percentage=9 %} +
+
-
+
{% include cards/map.html title="Top users" %}
-
- {% include cards/small-stats-3.html number=43 title="New Tickets" percentage=6 %} -
-
- {% include cards/small-stats-3.html number=17 title="Closed Today" percentage=-3 %} -
-
- {% include cards/small-stats-3.html number=7 title="New Replies" percentage=9 %} -
-
- {% include cards/small-stats-3.html number="27.3K" title="Followers" percentage=3 %} -
-
- {% include cards/small-stats-3.html number="$95" title="Daily Earnings" percentage=-2 %} -
-
- {% include cards/small-stats-3.html number=621 title="Products" percentage=-1 %} -
-
{% include cards/charts/card.html name="temperature" title="A" height=12 %}
@@ -125,7 +123,7 @@
{% comment %} -
+
{% for article in site.data.articles limit: 2 %}
{% include cards/blog-single.html article=article type="aside" %} @@ -134,7 +132,7 @@
{% endcomment %} -
+
{% comment %}
diff --git a/pages/_includes/layout/topnav.html b/pages/_includes/layout/topnav.html index bd3162ab8947c307b0c698b362183b185edbb828..ff27ea74ccb045588f96ba5eb487dcde9ffc9f0b 100644 --- a/pages/_includes/layout/topnav.html +++ b/pages/_includes/layout/topnav.html @@ -1,4 +1,4 @@ -
+
{% include parts/navbar.html logo=true search=true user-menu=1 person=1 dark=include.dark fluid=include.fluid %}
diff --git a/pages/_includes/svg/social/android.svg b/pages/_includes/svg/brand/android.svg similarity index 100% rename from pages/_includes/svg/social/android.svg rename to pages/_includes/svg/brand/android.svg diff --git a/pages/_includes/svg/social/apple.svg b/pages/_includes/svg/brand/apple.svg similarity index 100% rename from pages/_includes/svg/social/apple.svg rename to pages/_includes/svg/brand/apple.svg diff --git a/pages/_includes/svg/social/asana.svg b/pages/_includes/svg/brand/asana.svg similarity index 100% rename from pages/_includes/svg/social/asana.svg rename to pages/_includes/svg/brand/asana.svg diff --git a/pages/_includes/svg/social/atlassian.svg b/pages/_includes/svg/brand/atlassian.svg similarity index 100% rename from pages/_includes/svg/social/atlassian.svg rename to pages/_includes/svg/brand/atlassian.svg diff --git a/pages/_includes/svg/social/basecamp.svg b/pages/_includes/svg/brand/basecamp.svg similarity index 100% rename from pages/_includes/svg/social/basecamp.svg rename to pages/_includes/svg/brand/basecamp.svg diff --git a/pages/_includes/svg/social/behance.svg b/pages/_includes/svg/brand/behance.svg similarity index 100% rename from pages/_includes/svg/social/behance.svg rename to pages/_includes/svg/brand/behance.svg diff --git a/pages/_includes/svg/social/bing.svg b/pages/_includes/svg/brand/bing.svg similarity index 100% rename from pages/_includes/svg/social/bing.svg rename to pages/_includes/svg/brand/bing.svg diff --git a/pages/_includes/svg/social/bitbucket.svg b/pages/_includes/svg/brand/bitbucket.svg similarity index 100% rename from pages/_includes/svg/social/bitbucket.svg rename to pages/_includes/svg/brand/bitbucket.svg diff --git a/pages/_includes/svg/social/bitcoin.svg b/pages/_includes/svg/brand/bitcoin.svg similarity index 100% rename from pages/_includes/svg/social/bitcoin.svg rename to pages/_includes/svg/brand/bitcoin.svg diff --git a/pages/_includes/svg/social/blogger.svg b/pages/_includes/svg/brand/blogger.svg similarity index 100% rename from pages/_includes/svg/social/blogger.svg rename to pages/_includes/svg/brand/blogger.svg diff --git a/pages/_includes/svg/social/bootstrap.svg b/pages/_includes/svg/brand/bootstrap.svg similarity index 100% rename from pages/_includes/svg/social/bootstrap.svg rename to pages/_includes/svg/brand/bootstrap.svg diff --git a/pages/_includes/svg/social/buddy.svg b/pages/_includes/svg/brand/buddy.svg similarity index 100% rename from pages/_includes/svg/social/buddy.svg rename to pages/_includes/svg/brand/buddy.svg diff --git a/pages/_includes/svg/social/circleci.svg b/pages/_includes/svg/brand/circleci.svg similarity index 100% rename from pages/_includes/svg/social/circleci.svg rename to pages/_includes/svg/brand/circleci.svg diff --git a/pages/_includes/svg/social/codepen.svg b/pages/_includes/svg/brand/codepen.svg similarity index 100% rename from pages/_includes/svg/social/codepen.svg rename to pages/_includes/svg/brand/codepen.svg diff --git a/pages/_includes/svg/social/codeship.svg b/pages/_includes/svg/brand/codeship.svg similarity index 100% rename from pages/_includes/svg/social/codeship.svg rename to pages/_includes/svg/brand/codeship.svg diff --git a/pages/_includes/svg/social/css3.svg b/pages/_includes/svg/brand/css3.svg similarity index 100% rename from pages/_includes/svg/social/css3.svg rename to pages/_includes/svg/brand/css3.svg diff --git a/pages/_includes/svg/social/digitalocean.svg b/pages/_includes/svg/brand/digitalocean.svg similarity index 100% rename from pages/_includes/svg/social/digitalocean.svg rename to pages/_includes/svg/brand/digitalocean.svg diff --git a/pages/_includes/svg/social/disqus.svg b/pages/_includes/svg/brand/disqus.svg similarity index 100% rename from pages/_includes/svg/social/disqus.svg rename to pages/_includes/svg/brand/disqus.svg diff --git a/pages/_includes/svg/social/docker.svg b/pages/_includes/svg/brand/docker.svg similarity index 100% rename from pages/_includes/svg/social/docker.svg rename to pages/_includes/svg/brand/docker.svg diff --git a/pages/_includes/svg/social/dribbble.svg b/pages/_includes/svg/brand/dribbble.svg similarity index 100% rename from pages/_includes/svg/social/dribbble.svg rename to pages/_includes/svg/brand/dribbble.svg diff --git a/pages/_includes/svg/social/dropbox.svg b/pages/_includes/svg/brand/dropbox.svg similarity index 100% rename from pages/_includes/svg/social/dropbox.svg rename to pages/_includes/svg/brand/dropbox.svg diff --git a/pages/_includes/svg/social/facebook.svg b/pages/_includes/svg/brand/facebook.svg similarity index 100% rename from pages/_includes/svg/social/facebook.svg rename to pages/_includes/svg/brand/facebook.svg diff --git a/pages/_includes/svg/social/figma.svg b/pages/_includes/svg/brand/figma.svg similarity index 100% rename from pages/_includes/svg/social/figma.svg rename to pages/_includes/svg/brand/figma.svg diff --git a/pages/_includes/svg/social/flickr.svg b/pages/_includes/svg/brand/flickr.svg similarity index 100% rename from pages/_includes/svg/social/flickr.svg rename to pages/_includes/svg/brand/flickr.svg diff --git a/pages/_includes/svg/social/foursquare.svg b/pages/_includes/svg/brand/foursquare.svg similarity index 100% rename from pages/_includes/svg/social/foursquare.svg rename to pages/_includes/svg/brand/foursquare.svg diff --git a/pages/_includes/svg/social/git.svg b/pages/_includes/svg/brand/git.svg similarity index 100% rename from pages/_includes/svg/social/git.svg rename to pages/_includes/svg/brand/git.svg diff --git a/pages/_includes/svg/social/github.svg b/pages/_includes/svg/brand/github.svg similarity index 100% rename from pages/_includes/svg/social/github.svg rename to pages/_includes/svg/brand/github.svg diff --git a/pages/_includes/svg/social/gitlab.svg b/pages/_includes/svg/brand/gitlab.svg similarity index 100% rename from pages/_includes/svg/social/gitlab.svg rename to pages/_includes/svg/brand/gitlab.svg diff --git a/pages/_includes/svg/social/google.svg b/pages/_includes/svg/brand/google.svg similarity index 100% rename from pages/_includes/svg/social/google.svg rename to pages/_includes/svg/brand/google.svg diff --git a/pages/_includes/svg/social/googleplus.svg b/pages/_includes/svg/brand/googleplus.svg similarity index 100% rename from pages/_includes/svg/social/googleplus.svg rename to pages/_includes/svg/brand/googleplus.svg diff --git a/pages/_includes/svg/social/gravatar.svg b/pages/_includes/svg/brand/gravatar.svg similarity index 100% rename from pages/_includes/svg/social/gravatar.svg rename to pages/_includes/svg/brand/gravatar.svg diff --git a/pages/_includes/svg/social/hipchat.svg b/pages/_includes/svg/brand/hipchat.svg similarity index 100% rename from pages/_includes/svg/social/hipchat.svg rename to pages/_includes/svg/brand/hipchat.svg diff --git a/pages/_includes/svg/social/html5.svg b/pages/_includes/svg/brand/html5.svg similarity index 100% rename from pages/_includes/svg/social/html5.svg rename to pages/_includes/svg/brand/html5.svg diff --git a/pages/_includes/svg/social/instagram.svg b/pages/_includes/svg/brand/instagram.svg similarity index 100% rename from pages/_includes/svg/social/instagram.svg rename to pages/_includes/svg/brand/instagram.svg diff --git a/pages/_includes/svg/social/invision.svg b/pages/_includes/svg/brand/invision.svg similarity index 100% rename from pages/_includes/svg/social/invision.svg rename to pages/_includes/svg/brand/invision.svg diff --git a/pages/_includes/svg/social/javascript.svg b/pages/_includes/svg/brand/javascript.svg similarity index 100% rename from pages/_includes/svg/social/javascript.svg rename to pages/_includes/svg/brand/javascript.svg diff --git a/pages/_includes/svg/social/kickstarter.svg b/pages/_includes/svg/brand/kickstarter.svg similarity index 100% rename from pages/_includes/svg/social/kickstarter.svg rename to pages/_includes/svg/brand/kickstarter.svg diff --git a/pages/_includes/svg/social/linkedin.svg b/pages/_includes/svg/brand/linkedin.svg similarity index 100% rename from pages/_includes/svg/social/linkedin.svg rename to pages/_includes/svg/brand/linkedin.svg diff --git a/pages/_includes/svg/social/medium.svg b/pages/_includes/svg/brand/medium.svg similarity index 100% rename from pages/_includes/svg/social/medium.svg rename to pages/_includes/svg/brand/medium.svg diff --git a/pages/_includes/svg/social/meetup.svg b/pages/_includes/svg/brand/meetup.svg similarity index 100% rename from pages/_includes/svg/social/meetup.svg rename to pages/_includes/svg/brand/meetup.svg diff --git a/pages/_includes/svg/social/messenger.svg b/pages/_includes/svg/brand/messenger.svg similarity index 100% rename from pages/_includes/svg/social/messenger.svg rename to pages/_includes/svg/brand/messenger.svg diff --git a/pages/_includes/svg/social/netflix.svg b/pages/_includes/svg/brand/netflix.svg similarity index 100% rename from pages/_includes/svg/social/netflix.svg rename to pages/_includes/svg/brand/netflix.svg diff --git a/pages/_includes/svg/social/pagekit.svg b/pages/_includes/svg/brand/pagekit.svg similarity index 100% rename from pages/_includes/svg/social/pagekit.svg rename to pages/_includes/svg/brand/pagekit.svg diff --git a/pages/_includes/svg/social/paypal.svg b/pages/_includes/svg/brand/paypal.svg similarity index 100% rename from pages/_includes/svg/social/paypal.svg rename to pages/_includes/svg/brand/paypal.svg diff --git a/pages/_includes/svg/social/pinterest.svg b/pages/_includes/svg/brand/pinterest.svg similarity index 100% rename from pages/_includes/svg/social/pinterest.svg rename to pages/_includes/svg/brand/pinterest.svg diff --git a/pages/_includes/svg/social/producthunt.svg b/pages/_includes/svg/brand/producthunt.svg similarity index 100% rename from pages/_includes/svg/social/producthunt.svg rename to pages/_includes/svg/brand/producthunt.svg diff --git a/pages/_includes/svg/social/rss.svg b/pages/_includes/svg/brand/rss.svg similarity index 100% rename from pages/_includes/svg/social/rss.svg rename to pages/_includes/svg/brand/rss.svg diff --git a/pages/_includes/svg/social/sass.svg b/pages/_includes/svg/brand/sass.svg similarity index 100% rename from pages/_includes/svg/social/sass.svg rename to pages/_includes/svg/brand/sass.svg diff --git a/pages/_includes/svg/social/sentry.svg b/pages/_includes/svg/brand/sentry.svg similarity index 100% rename from pages/_includes/svg/social/sentry.svg rename to pages/_includes/svg/brand/sentry.svg diff --git a/pages/_includes/svg/social/skype.svg b/pages/_includes/svg/brand/skype.svg similarity index 100% rename from pages/_includes/svg/social/skype.svg rename to pages/_includes/svg/brand/skype.svg diff --git a/pages/_includes/svg/social/slack.svg b/pages/_includes/svg/brand/slack.svg similarity index 100% rename from pages/_includes/svg/social/slack.svg rename to pages/_includes/svg/brand/slack.svg diff --git a/pages/_includes/svg/social/snapchat.svg b/pages/_includes/svg/brand/snapchat.svg similarity index 100% rename from pages/_includes/svg/social/snapchat.svg rename to pages/_includes/svg/brand/snapchat.svg diff --git a/pages/_includes/svg/social/spotify.svg b/pages/_includes/svg/brand/spotify.svg similarity index 100% rename from pages/_includes/svg/social/spotify.svg rename to pages/_includes/svg/brand/spotify.svg diff --git a/pages/_includes/svg/social/strava.svg b/pages/_includes/svg/brand/strava.svg similarity index 100% rename from pages/_includes/svg/social/strava.svg rename to pages/_includes/svg/brand/strava.svg diff --git a/pages/_includes/svg/social/stripe.svg b/pages/_includes/svg/brand/stripe.svg similarity index 100% rename from pages/_includes/svg/social/stripe.svg rename to pages/_includes/svg/brand/stripe.svg diff --git a/pages/_includes/svg/social/tabler.svg b/pages/_includes/svg/brand/tabler.svg similarity index 100% rename from pages/_includes/svg/social/tabler.svg rename to pages/_includes/svg/brand/tabler.svg diff --git a/pages/_includes/svg/social/telegram.svg b/pages/_includes/svg/brand/telegram.svg similarity index 100% rename from pages/_includes/svg/social/telegram.svg rename to pages/_includes/svg/brand/telegram.svg diff --git a/pages/_includes/svg/social/tumblr.svg b/pages/_includes/svg/brand/tumblr.svg similarity index 100% rename from pages/_includes/svg/social/tumblr.svg rename to pages/_includes/svg/brand/tumblr.svg diff --git a/pages/_includes/svg/social/twitter.svg b/pages/_includes/svg/brand/twitter.svg similarity index 100% rename from pages/_includes/svg/social/twitter.svg rename to pages/_includes/svg/brand/twitter.svg diff --git a/pages/_includes/svg/social/typescript.svg b/pages/_includes/svg/brand/typescript.svg similarity index 100% rename from pages/_includes/svg/social/typescript.svg rename to pages/_includes/svg/brand/typescript.svg diff --git a/pages/_includes/svg/social/uber.svg b/pages/_includes/svg/brand/uber.svg similarity index 100% rename from pages/_includes/svg/social/uber.svg rename to pages/_includes/svg/brand/uber.svg diff --git a/pages/_includes/svg/social/uikit.svg b/pages/_includes/svg/brand/uikit.svg similarity index 100% rename from pages/_includes/svg/social/uikit.svg rename to pages/_includes/svg/brand/uikit.svg diff --git a/pages/_includes/svg/social/vimeo.svg b/pages/_includes/svg/brand/vimeo.svg similarity index 100% rename from pages/_includes/svg/social/vimeo.svg rename to pages/_includes/svg/brand/vimeo.svg diff --git a/pages/_includes/svg/social/vk.svg b/pages/_includes/svg/brand/vk.svg similarity index 100% rename from pages/_includes/svg/social/vk.svg rename to pages/_includes/svg/brand/vk.svg diff --git a/pages/_includes/svg/social/wechat.svg b/pages/_includes/svg/brand/wechat.svg similarity index 100% rename from pages/_includes/svg/social/wechat.svg rename to pages/_includes/svg/brand/wechat.svg diff --git a/pages/_includes/svg/social/whatsapp.svg b/pages/_includes/svg/brand/whatsapp.svg similarity index 100% rename from pages/_includes/svg/social/whatsapp.svg rename to pages/_includes/svg/brand/whatsapp.svg diff --git a/pages/_includes/svg/social/wordpress.svg b/pages/_includes/svg/brand/wordpress.svg similarity index 100% rename from pages/_includes/svg/social/wordpress.svg rename to pages/_includes/svg/brand/wordpress.svg diff --git a/pages/_includes/svg/social/ycombinator.svg b/pages/_includes/svg/brand/ycombinator.svg similarity index 100% rename from pages/_includes/svg/social/ycombinator.svg rename to pages/_includes/svg/brand/ycombinator.svg diff --git a/pages/_includes/svg/social/youtube.svg b/pages/_includes/svg/brand/youtube.svg similarity index 100% rename from pages/_includes/svg/social/youtube.svg rename to pages/_includes/svg/brand/youtube.svg diff --git a/pages/_includes/ui/icon-brand.html b/pages/_includes/ui/icon-brand.html deleted file mode 100644 index 2cac195602602c77dd5b30a79a0d2dadf0460292..0000000000000000000000000000000000000000 --- a/pages/_includes/ui/icon-brand.html +++ /dev/null @@ -1,2 +0,0 @@ -{% assign i = 'brands/' | append: include.icon %} -{% include ui/icon.html icon=i class=include.class %} diff --git a/pages/_includes/ui/icon.html b/pages/_includes/ui/icon.html index ad6e0df3a2e0c076b1cb610d4c481d1449b788ec..5a818b9bfed366ba172647b2b840741cc8fc0a88 100644 --- a/pages/_includes/ui/icon.html +++ b/pages/_includes/ui/icon.html @@ -1,7 +1,7 @@ {% removeemptylines %} {% assign svg-file="svg/" | append: include.icon | append: ".svg" %} {% capture svg-icon %} -{% include_cached {{ svg-file }} %} +{% include {{ svg-file }} %} {% endcapture %} {% assign replace-to = "icon" %} diff --git a/pages/blog.html b/pages/blog.html index 35bf26ade6133546b2d8b24f7cffc38c6e0818b3..93a279260243c9c91e31e79afe3269b5ba3c2650 100644 --- a/pages/blog.html +++ b/pages/blog.html @@ -3,7 +3,7 @@ title: Blog page-title: Blog --- -
+
{% for article in site.data.articles limit: 3 %}
diff --git a/pages/cards.html b/pages/cards.html index 6f535cdb8d294e11bdd6c818764141f89416e3c1..35d4fde607e49d58a09bf1a029815d9c3e8219fd 100644 --- a/pages/cards.html +++ b/pages/cards.html @@ -5,39 +5,39 @@ page-title: Cards
- {% include_cached cards/card.html body="This is some text within a card body." %} - {% include_cached cards/card.html img-bottom=true title="Card with bottom image" %} - {% include_cached cards/card.html active=true body="This is a card with active state." %} - {% include_cached cards/card.html inactive=true body="This is some text inactive state." %} - {% include_cached cards/card.html footer-elements="more,>switch" %} - {% include_cached cards/card.html footer-elements=">avatars" %} - {% include_cached cards/card.html header-tabs=true %} - {% include_cached cards/card.html header-pills=true %} - {% include_cached cards/card.html progress=true title="Card with progress bar" %} - {% include_cached cards/card.html empty=true %} + {% include cards/card.html body="This is some text within a card body." %} + {% include cards/card.html img-bottom=true title="Card with bottom image" %} + {% include cards/card.html active=true body="This is a card with active state." %} + {% include cards/card.html inactive=true body="This is some text inactive state." %} + {% include cards/card.html footer-elements="more,>switch" %} + {% include cards/card.html footer-elements=">avatars" %} + {% include cards/card.html header-tabs=true %} + {% include cards/card.html header-pills=true %} + {% include cards/card.html progress=true title="Card with progress bar" %} + {% include cards/card.html empty=true %} {% include cards/card-tabs.html count=4 %} {% include cards/card-tabs.html count=4 bottom=true id="bottom" %}
- {% include_cached cards/card-image.html title="Card with left side image" %} - {% include_cached cards/card-image.html title="Card with right side image" right=true img="de6d0fd1feebb6a2.jpg" %} - {% include_cached cards/card-group.html %} + {% include cards/card-image.html title="Card with left side image" %} + {% include cards/card-image.html title="Card with right side image" right=true img="de6d0fd1feebb6a2.jpg" %} + {% include cards/card-group.html %}
- {% include_cached cards/card.html img-top=true title="Card with top image" %} - {% include_cached cards/card.html button=true title="Card with button link" %} - {% include_cached cards/card.html status-top="danger" title="Card with top status" %} - {% include_cached cards/card.html status-bottom="success" title="Card with bottom status" %} - {% include_cached cards/card.html status-left="primary" title="Card with side status" %} - {% include_cached cards/card.html class="card-stacked" title="Stacked card" %} + {% include cards/card.html img-top=true title="Card with top image" %} + {% include cards/card.html button=true title="Card with button link" %} + {% include cards/card.html status-top="danger" title="Card with top status" %} + {% include cards/card.html status-bottom="success" title="Card with bottom status" %} + {% include cards/card.html status-left="primary" title="Card with side status" %} + {% include cards/card.html class="card-stacked" title="Stacked card" %}
- {% include_cached cards/card.html title="Card title" subtitle="Card subtitle" %} - {% include_cached cards/card.html header=true %} - {% include_cached cards/card.html title="Card with footer" footer=true %} - {% include_cached cards/card.html title="Card with footer button" footer-button=true %} - {% include_cached cards/card.html title="Card with footer buttons" footer-buttons=true %} + {% include cards/card.html title="Card title" subtitle="Card subtitle" %} + {% include cards/card.html header=true %} + {% include cards/card.html title="Card with footer" footer=true %} + {% include cards/card.html title="Card with footer button" footer-button=true %} + {% include cards/card.html title="Card with footer buttons" footer-buttons=true %}
diff --git a/pages/charts.html b/pages/charts.html index 84b3346c7fae8187fd96c25a199f4568c49cb8f3..356ffa3b0a2a6efb5ceadd20e03cdcb5a906f920 100644 --- a/pages/charts.html +++ b/pages/charts.html @@ -3,7 +3,7 @@ title: Charts menu: charts --- -
+
{% for chart in site.data.charts %} {% if chart[1].display %} {% assign chart-name = chart[0] %} diff --git a/pages/dropdowns.html b/pages/dropdowns.html index f085cea3f2979803c0a44dfa0698daecc0f782fd..5e92bd1ac587a17f783c3ff5ab5bfd4577f38c4c 100644 --- a/pages/dropdowns.html +++ b/pages/dropdowns.html @@ -3,17 +3,18 @@ title: Dropdowns page-title: Dropdowns --- -{% include_cached ui/dropdown-menu.html show=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true separated=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true active=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true disabled=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true header=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true icons=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true icons=true header=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true arrow=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true dark=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true arrow=true right=true dark=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true arrow=true right=true dark=true icons=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true badge=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true check=true class="mr-3 mb-3 align-top" %} -{% include_cached ui/dropdown-menu.html show=true radio=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true separated=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true active=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true disabled=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true header=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true icons=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true icons=true header=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true arrow=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true dark=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true dark=true separated=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true arrow=true right=true dark=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true arrow=true right=true dark=true icons=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true badge=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true check=true class="mr-3 mb-3 align-top" %} +{% include ui/dropdown-menu.html show=true radio=true class="mr-3 mb-3 align-top" %} diff --git a/pages/form-elements.html b/pages/form-elements.html index 60ba2328df2823ed1a4cd97170ad9807f87e5496..ece4151f851a74f4935b1409b3bfab6215d6bb14 100644 --- a/pages/form-elements.html +++ b/pages/form-elements.html @@ -5,7 +5,94 @@ menu: forms ---
-
- {% include cards/form-elements.html %} -
+
+
+
+

Form elements

+
+
+
+
+
+
{% include forms/form-elements-1.html %}
+
{% include forms/form-elements-2.html %}
+
+
+
+
+
{% include forms/form-elements-3.html %}
+
{% include forms/form-elements-4.html %}
+
+
+
+
+
{% include forms/form-elements-5.html %}
+
{% include forms/form-elements-6.html %}
+
+
+
+
+
+
+ Cancel + +
+ +
+
+ + {% comment %} + + {% endcomment %} + +
diff --git a/pages/homepage.html b/pages/homepage.html index b5e71429928d9c2f7a4a3d55768e857b1488d988..5b13e23ddb4d1561775afff80f246c5086b29031 100644 --- a/pages/homepage.html +++ b/pages/homepage.html @@ -26,27 +26,5 @@ page-title-actions: home {% include cards/tasks.html %} {% include cards/company-employees.html %} {% include cards/most-visited-pages.html %} - {% include cards/form-elements.html %} -
-
- {% include cards/simple.html %} -
-
- {% include cards/simple.html %} -
-
- {% include cards/simple.html %} -
-
- {% include cards/simple.html %} -
-
- {% include cards/simple.html %} -
-
- {% include cards/simple.html %} -
-
- {% include cards/progress-multi.html %}
diff --git a/pages/icons.html b/pages/icons.html index 13f084fcf5327c2a8d6e8c281abcce00c67919f3..335e69d1f7d5ba07c3849614766d6815312a4968 100644 --- a/pages/icons.html +++ b/pages/icons.html @@ -3,16 +3,12 @@ title: Icons --- -
-
- {% include cards/icons.html title="Feather Icons" icons=site.data.icons-fe icon_class="fe" - url="https://feathericons.com" description='Simply beautiful open source icons.' %} -
+
+
+ {% include cards/icons.html title="Feather icons" group="fe" %} +
+
+ {% include cards/icons.html title="Brand icons" group="brand" %} +
-
-
- {% include cards/icons-brands.html title="Font Awesome Brands Icons" icons=site.data.icons-fa icon_class="fa" - url="https://fontawesome.com/icons/?s=brands" description='Simply beautiful open source icons.' %} -
-
diff --git a/pages/index.html b/pages/index.html index 6a82906a0417ea84630abe0f34c5ec3caaa07fab..0d2bfb0e1b0955022a7971dc8798fe61ecdc29a6 100644 --- a/pages/index.html +++ b/pages/index.html @@ -3,7 +3,7 @@ title: Dashboard page-title: Dashboard page-pretitle: Overview page-title-actions: true -header-primary: false +menu: home --- {% include_cached layout/homepage.html %} diff --git a/pages/layout-dark-mode.html b/pages/layout-dark-mode.html index d7428163f8680e49a378812ff7de0be13e3e2483..b2c60b6a5ad09bb57d0b1971a3ab413ee53e71b4 100644 --- a/pages/layout-dark-mode.html +++ b/pages/layout-dark-mode.html @@ -4,4 +4,3 @@ dark-theme: true page-title: Dashboard --- -{% include_cached layout/homepage.html %} diff --git a/pages/login.html b/pages/login.html index 658b262bcc4f039066448537c298723351ff00ea..e178851c093a7d3e38b868dfba6ceb6ffb2cb75a 100644 --- a/pages/login.html +++ b/pages/login.html @@ -3,4 +3,4 @@ layout: single title: Login --- -{% include cards/login.html show-header="1" %} \ No newline at end of file +{% include cards/login.html show-header="1" %} diff --git a/pages/register.html b/pages/register.html index f8b433754f766be5ab7dc06e8b57033856385e55..02dc2619ed31b720840ebe910cdf6cb6c9fc479f 100644 --- a/pages/register.html +++ b/pages/register.html @@ -3,4 +3,4 @@ layout: single title: Register --- -{% include cards/register.html %} \ No newline at end of file +{% include cards/register.html %} diff --git a/pages/rtl.html b/pages/rtl.html index 1a583fa17a01a51e3ef7a8913ba5d56d0dbfcf23..efe8c3acbbe04766974756ec52a5cc679fa910e3 100644 --- a/pages/rtl.html +++ b/pages/rtl.html @@ -34,4 +34,4 @@ menu: pages.rtl
-
\ No newline at end of file +
diff --git a/pages/social.html b/pages/social.html index 4307f90be151bf928a46c00fe76a6d2d7bc8c0c4..e04c4ea92d54ea870f92cc464c49366e9067da14 100644 --- a/pages/social.html +++ b/pages/social.html @@ -16,4 +16,4 @@ done: true {% include cards/feed-card.html feed=4 %} {% include cards/feed-card.html feed=6 %}
-
\ No newline at end of file +
diff --git a/pages/store.html b/pages/store.html index 22143b2cd5396bede8756041c4e7121be914f9ed..234c3920216332d0f0881056b178494809cb0c12 100644 --- a/pages/store.html +++ b/pages/store.html @@ -4,7 +4,7 @@ page-title: Store --- -
+
diff --git a/pages/users-list.html b/pages/users-list.html index 6452610d189b768370995b8a3f92ab17608337d9..c49e6534de4d60cde35c410816b25479464e114a 100644 --- a/pages/users-list.html +++ b/pages/users-list.html @@ -5,7 +5,7 @@ page-title: Users done: true --- -
+
diff --git a/scss/_variables.scss b/scss/_variables.scss index 01f5ff4fe730d6a4bb7fa2849f3a3c834d3d6f19..819485d64d37242d7e81588916b717a0605dfc6a 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -38,8 +38,8 @@ $lime: #7bd235 !default; $green: #5eba00 !default; $teal: #2bcbba !default; $cyan: #17a2b8 !default; -$black: #000 !default; -$white: #fff !default; +$black: #000000 !default; +$white: #ffffff !default; $light: #f5f7fb !default; $dark: #354052 !default; @@ -50,12 +50,15 @@ $body-color: $dark !default; $text-muted: #8a91a5 !default; $border-color: #dce3e9 !default; +$border-color-alpha: rgba(138, 160, 180, .3) !default; + +$hover-bg: rgba(138, 160, 180, 0.1) !default; $social-colors: ( "facebook": #3b5998, "twitter": #1da1f2, "google": #dc4e41, - "youtube": #f00, + "youtube": #ff0000, "vimeo": #1ab7ea, "dribbble": #ea4c89, "github": #181717, @@ -241,8 +244,15 @@ $close-font-size: 1.5rem !default; //dropdown $dropdown-item-padding-x: 1rem !default; $dropdown-font-size: $h5-font-size !default; -$dropdown-divider-bg: $border-color !default; +$dropdown-divider-bg: $border-color-alpha !default; $dropdown-padding-y: .5rem !default; +$dropdown-link-hover-bg: $hover-bg !default; +$dropdown-link-hover-color: inherit !default; + +//navbar +$navbar-bg: $white !default; +$navbar-border-color: $border-color !default; +$navbar-border-color: $border-color !default; //nav $nav-link-padding-y: .25rem !default; diff --git a/scss/layout/_navbar.scss b/scss/layout/_navbar.scss index 4be1b4c61cbf50fa8e81258c274af5969a81156b..21a43a051c3a6c6938cac2cad2769b92606ec8d8 100644 --- a/scss/layout/_navbar.scss +++ b/scss/layout/_navbar.scss @@ -1,10 +1,8 @@ .navbar { - display: flex; - width: 100%; - min-height: 3.5rem; - color: $body-color; - background: #fff; - border-bottom: 1px solid $border-color; + border-bottom: 1px solid; + + background-color: $navbar-bg; + border-color: $navbar-border-color; .nav-link { color: inherit; @@ -86,11 +84,6 @@ Navbar toggler border: 0; } -.navbar-toggler-icon { - width: 2rem; - height: 2rem; -} - /* Sidebar */ diff --git a/scss/ui/_avatars.scss b/scss/ui/_avatars.scss index aa4695530e30f917ac5a2582763dd6344bc04e8d..b226d8916e6b2bf95c87ac32ff69a41df0e58eab 100644 --- a/scss/ui/_avatars.scss +++ b/scss/ui/_avatars.scss @@ -63,7 +63,7 @@ .avatar-list-stacked { .avatar { - margin-right: -.5em; + margin-right: -.5em !important; box-shadow: 0 0 0 2px #fff; @at-root .card-footer & { diff --git a/scss/ui/_badges.scss b/scss/ui/_badges.scss index 34ccf8edf4603a62e7959b9a7316da283684d587..2ab7b95609d4c8a1ab26e8258a833dd3151f06cd 100644 --- a/scss/ui/_badges.scss +++ b/scss/ui/_badges.scss @@ -1,4 +1,7 @@ .badge { + @extend .subheader; + background: $gray-200; + @at-root a#{&} { color: $white; } diff --git a/scss/ui/_cards.scss b/scss/ui/_cards.scss index df8fdfa432d76f34edc52dd62f86746fb56afa8e..44ae47c0ce1c15e50b1894eca7e8e25d6d293d6d 100644 --- a/scss/ui/_cards.scss +++ b/scss/ui/_cards.scss @@ -134,6 +134,7 @@ } .card-progress { + height: .25rem; &:last-child { border-radius: 0 0 2px 2px; diff --git a/scss/utils/_colors.scss b/scss/utils/_colors.scss index 502f98042e5c75f823e592b7cb2c6ab96c2d244f..de911800d33d59f365ef8b7257b1848789970967 100644 --- a/scss/utils/_colors.scss +++ b/scss/utils/_colors.scss @@ -11,11 +11,6 @@ COLORS VARIATIONS .bg-#{$color}-dark { background: mix($value, #000, 80%); } .bg-#{$color}-darker { background: mix($value, #000, 40%); } .bg-#{$color}-darkest { background: mix($value, #000, 20%); } - - .bg-#{$color}-lt { - color: $value !important; - background: theme-color-lighter($value) !important; - } } }