diff --git a/_config.yml b/_config.yml index b3e01adb6ce08e03e5e67bdd18258cccec90018b..e60240983abd43eace8deefd38e16da815fa628b 100644 --- a/_config.yml +++ b/_config.yml @@ -133,31 +133,47 @@ button_variants: socials: - name: facebook + icon: social/facebook title: Facebook - name: twitter + icon: social/twitter title: Twitter - name: google + icon: social/google title: Google - name: youtube + icon: social/youtube title: Youtube - name: vimeo + icon: social/vimeo title: Vimeo - name: dribbble + icon: social/dribbble title: Dribbble - name: github + icon: social/github title: Github - name: instagram + icon: social/instagram title: Instagram - name: pinterest + icon: social/pinterest title: Pinterest - name: vk - title: Vk + icon: social/vk + title: VK - name: rss - title: Rss + icon: social/rss + title: RSS - name: flickr + icon: social/flickr title: Flickr - name: bitbucket + icon: social/bitbucket title: Bitbucker + - name: tabler + icon: social/tabler + title: Tabler months_short: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] months_long: ['January', 'Febuary', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] diff --git a/pages/_docs/buttons.md b/pages/_docs/buttons.md index feab885722b999f2b064156e73a200434ef73913..253f9ae9d52e6e5f310898689ffddf72fc3a3684 100644 --- a/pages/_docs/buttons.md +++ b/pages/_docs/buttons.md @@ -127,7 +127,7 @@ A button can be formatted to link to a social website {% example html wrapper=btn-list %} {% for button in site.socials %} -{% include ui/button.html color=button.name icon=button.name text=button.title provider="brand" %} +{% include ui/button.html color=button.name icon=button.icon text=button.title %} {% endfor %} {% endexample %} @@ -135,7 +135,7 @@ You can use only icons. {% example html wrapper=btn-list %} {% for button in site.socials %} -{% include ui/button.html color=button.name icon=button.name provider="brand" %} +{% include ui/button.html color=button.name icon=button.icon %} {% endfor %} {% endexample %} diff --git a/pages/_includes/layout/css.html b/pages/_includes/layout/css.html index b6f7d929cf13e9836f5d5e8468166e6257f33270..fc8a2e8ad3abd0a2188d88f609412a0f58ec676f 100644 --- a/pages/_includes/layout/css.html +++ b/pages/_includes/layout/css.html @@ -1,4 +1,3 @@ - diff --git a/pages/_includes/parts/navbar.html b/pages/_includes/parts/navbar.html index c3a88228e76b67cf95251f72413b3039c0597692..d68475e66fab019929456cb841b69ae62680357d 100644 --- a/pages/_includes/parts/navbar.html +++ b/pages/_includes/parts/navbar.html @@ -98,7 +98,7 @@ {% endif %} {% if include.user-menu %} diff --git a/pages/_includes/svg/social/android.svg b/pages/_includes/svg/social/android.svg new file mode 100644 index 0000000000000000000000000000000000000000..4a5091b92fcef4a052f3bb7bc34a4851311230c4 --- /dev/null +++ b/pages/_includes/svg/social/android.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/apple.svg b/pages/_includes/svg/social/apple.svg new file mode 100644 index 0000000000000000000000000000000000000000..b0d2d668b4ad714124324b3e4b4d54bf5b1330a2 --- /dev/null +++ b/pages/_includes/svg/social/apple.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/asana.svg b/pages/_includes/svg/social/asana.svg new file mode 100644 index 0000000000000000000000000000000000000000..739419f61bb5a3b5e7c83ea5ff41ddec8891d735 --- /dev/null +++ b/pages/_includes/svg/social/asana.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/atlassian.svg b/pages/_includes/svg/social/atlassian.svg new file mode 100644 index 0000000000000000000000000000000000000000..ed3f1ce402ef2a5d9cb3df4435233c700254ab77 --- /dev/null +++ b/pages/_includes/svg/social/atlassian.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/basecamp.svg b/pages/_includes/svg/social/basecamp.svg new file mode 100644 index 0000000000000000000000000000000000000000..396fd42c41cbc4df1679531655f730984ae13847 --- /dev/null +++ b/pages/_includes/svg/social/basecamp.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/behance.svg b/pages/_includes/svg/social/behance.svg new file mode 100644 index 0000000000000000000000000000000000000000..b025608ad73708a72aaf74068c8293dd4eb210d4 --- /dev/null +++ b/pages/_includes/svg/social/behance.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/bing.svg b/pages/_includes/svg/social/bing.svg new file mode 100644 index 0000000000000000000000000000000000000000..168740ef58d8c81914e3e146d8a5bf29ec57f8bd --- /dev/null +++ b/pages/_includes/svg/social/bing.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/bitbucket.svg b/pages/_includes/svg/social/bitbucket.svg new file mode 100644 index 0000000000000000000000000000000000000000..f996c8aef87cdff2442900b00de0580bce12681f --- /dev/null +++ b/pages/_includes/svg/social/bitbucket.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/bitcoin.svg b/pages/_includes/svg/social/bitcoin.svg new file mode 100644 index 0000000000000000000000000000000000000000..b3c74c8ae6fd1412deea0f15fb0237fc11541845 --- /dev/null +++ b/pages/_includes/svg/social/bitcoin.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/blogger.svg b/pages/_includes/svg/social/blogger.svg new file mode 100644 index 0000000000000000000000000000000000000000..e7e34d4eb54c1370ad960dc393654640b254dc6e --- /dev/null +++ b/pages/_includes/svg/social/blogger.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/bootstrap.svg b/pages/_includes/svg/social/bootstrap.svg new file mode 100644 index 0000000000000000000000000000000000000000..21b02cde3a718fd03894aa0596df20e4579c48c4 --- /dev/null +++ b/pages/_includes/svg/social/bootstrap.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/buddy.svg b/pages/_includes/svg/social/buddy.svg new file mode 100644 index 0000000000000000000000000000000000000000..32f8fea61b13d87df0925b68cf90daa320bab734 --- /dev/null +++ b/pages/_includes/svg/social/buddy.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/circleci.svg b/pages/_includes/svg/social/circleci.svg new file mode 100644 index 0000000000000000000000000000000000000000..76a48fed3859dadaa54d8172b557f287cc7c2380 --- /dev/null +++ b/pages/_includes/svg/social/circleci.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/codepen.svg b/pages/_includes/svg/social/codepen.svg new file mode 100644 index 0000000000000000000000000000000000000000..abfc9a711ab1804b00f48fe8a77a6dcec39bb9ae --- /dev/null +++ b/pages/_includes/svg/social/codepen.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/codeship.svg b/pages/_includes/svg/social/codeship.svg new file mode 100644 index 0000000000000000000000000000000000000000..58a7548d923610a1042c74912d04821b447e6234 --- /dev/null +++ b/pages/_includes/svg/social/codeship.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/css3.svg b/pages/_includes/svg/social/css3.svg new file mode 100644 index 0000000000000000000000000000000000000000..a9ec528b71b45b37970491eba923328f6756ce20 --- /dev/null +++ b/pages/_includes/svg/social/css3.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/digitalocean.svg b/pages/_includes/svg/social/digitalocean.svg new file mode 100644 index 0000000000000000000000000000000000000000..cc37a6659893119301d530bee95c2aa37390b12f --- /dev/null +++ b/pages/_includes/svg/social/digitalocean.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/disqus.svg b/pages/_includes/svg/social/disqus.svg new file mode 100644 index 0000000000000000000000000000000000000000..bc8c2a979e3f7c74b8040eee552c0a8e7156e569 --- /dev/null +++ b/pages/_includes/svg/social/disqus.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/docker.svg b/pages/_includes/svg/social/docker.svg new file mode 100644 index 0000000000000000000000000000000000000000..a54c109b361f58f9583f48c4a9cec62f7b290846 --- /dev/null +++ b/pages/_includes/svg/social/docker.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/dribbble.svg b/pages/_includes/svg/social/dribbble.svg new file mode 100644 index 0000000000000000000000000000000000000000..17f1c03c52c72a941099cefd66d6132345ebd1e9 --- /dev/null +++ b/pages/_includes/svg/social/dribbble.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/dropbox.svg b/pages/_includes/svg/social/dropbox.svg new file mode 100644 index 0000000000000000000000000000000000000000..d440d16da910cddcd862432c4cbe8f92e78e5aa0 --- /dev/null +++ b/pages/_includes/svg/social/dropbox.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/facebook.svg b/pages/_includes/svg/social/facebook.svg new file mode 100644 index 0000000000000000000000000000000000000000..64f11f776f0fc50a7e65c1dcd908aa271929da14 --- /dev/null +++ b/pages/_includes/svg/social/facebook.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/figma.svg b/pages/_includes/svg/social/figma.svg new file mode 100644 index 0000000000000000000000000000000000000000..6ba000f99672eab036da3e83996e7ace3c40bfcc --- /dev/null +++ b/pages/_includes/svg/social/figma.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/flickr.svg b/pages/_includes/svg/social/flickr.svg new file mode 100644 index 0000000000000000000000000000000000000000..96902d2663fcd6651225ad84c8c45f3b1cdcb1ec --- /dev/null +++ b/pages/_includes/svg/social/flickr.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/foursquare.svg b/pages/_includes/svg/social/foursquare.svg new file mode 100644 index 0000000000000000000000000000000000000000..784df3e721fa37b301c4321432baceed13bb39e0 --- /dev/null +++ b/pages/_includes/svg/social/foursquare.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/git.svg b/pages/_includes/svg/social/git.svg new file mode 100644 index 0000000000000000000000000000000000000000..d2e7ea7b87ca6ff6846064fdfbbba3d66dd43e1b --- /dev/null +++ b/pages/_includes/svg/social/git.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/github.svg b/pages/_includes/svg/social/github.svg new file mode 100644 index 0000000000000000000000000000000000000000..c89c4768cca7fd3e6245ab1dc55d9869e7134b83 --- /dev/null +++ b/pages/_includes/svg/social/github.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/gitlab.svg b/pages/_includes/svg/social/gitlab.svg new file mode 100644 index 0000000000000000000000000000000000000000..8b7827d440db95fd41022ead65180b29231413ca --- /dev/null +++ b/pages/_includes/svg/social/gitlab.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/google.svg b/pages/_includes/svg/social/google.svg new file mode 100644 index 0000000000000000000000000000000000000000..77d2b8e7bbedc71b07b64bba7d118551432a54d6 --- /dev/null +++ b/pages/_includes/svg/social/google.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/googleplus.svg b/pages/_includes/svg/social/googleplus.svg new file mode 100644 index 0000000000000000000000000000000000000000..5fe6441c7bc9015e7b83ed86e4736135cc06986b --- /dev/null +++ b/pages/_includes/svg/social/googleplus.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/gravatar.svg b/pages/_includes/svg/social/gravatar.svg new file mode 100644 index 0000000000000000000000000000000000000000..95d9718ecf28238192bb4db22afc310af957f6f4 --- /dev/null +++ b/pages/_includes/svg/social/gravatar.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/hipchat.svg b/pages/_includes/svg/social/hipchat.svg new file mode 100644 index 0000000000000000000000000000000000000000..f7eb855b6da350d686887ee170406f7cf3f7ff50 --- /dev/null +++ b/pages/_includes/svg/social/hipchat.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/html5.svg b/pages/_includes/svg/social/html5.svg new file mode 100644 index 0000000000000000000000000000000000000000..b24d684cd2e2a64ee9e1dafd02993f3429f7cd06 --- /dev/null +++ b/pages/_includes/svg/social/html5.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/instagram.svg b/pages/_includes/svg/social/instagram.svg new file mode 100644 index 0000000000000000000000000000000000000000..f75e53402b94022e34648211b1eb83d9b1c1afc9 --- /dev/null +++ b/pages/_includes/svg/social/instagram.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/invision.svg b/pages/_includes/svg/social/invision.svg new file mode 100644 index 0000000000000000000000000000000000000000..04d4c9bc085f34c4213cd090abf34677ebee3f3b --- /dev/null +++ b/pages/_includes/svg/social/invision.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/javascript.svg b/pages/_includes/svg/social/javascript.svg new file mode 100644 index 0000000000000000000000000000000000000000..a6744c890ac98ef871c2d1a8d3f15301ceb5e0a8 --- /dev/null +++ b/pages/_includes/svg/social/javascript.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/kickstarter.svg b/pages/_includes/svg/social/kickstarter.svg new file mode 100644 index 0000000000000000000000000000000000000000..1873a73b8bb280052754801770f9e5cb235aba01 --- /dev/null +++ b/pages/_includes/svg/social/kickstarter.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/linkedin.svg b/pages/_includes/svg/social/linkedin.svg new file mode 100644 index 0000000000000000000000000000000000000000..e062d86212bdf37a9c875bcd470ec405a78326c6 --- /dev/null +++ b/pages/_includes/svg/social/linkedin.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/medium.svg b/pages/_includes/svg/social/medium.svg new file mode 100644 index 0000000000000000000000000000000000000000..5e3d6044f77f282bca9db244c636998c0407eac0 --- /dev/null +++ b/pages/_includes/svg/social/medium.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/meetup.svg b/pages/_includes/svg/social/meetup.svg new file mode 100644 index 0000000000000000000000000000000000000000..63770c27bc590de6ac4904e01c6dfb80f2d96b2b --- /dev/null +++ b/pages/_includes/svg/social/meetup.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/messenger.svg b/pages/_includes/svg/social/messenger.svg new file mode 100644 index 0000000000000000000000000000000000000000..1e960475f71a1743a14641aa95cbaee7ad728c27 --- /dev/null +++ b/pages/_includes/svg/social/messenger.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/netflix.svg b/pages/_includes/svg/social/netflix.svg new file mode 100644 index 0000000000000000000000000000000000000000..dd719d716773d83bfcd4d8be3d86189feb1c43bd --- /dev/null +++ b/pages/_includes/svg/social/netflix.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/pagekit.svg b/pages/_includes/svg/social/pagekit.svg new file mode 100644 index 0000000000000000000000000000000000000000..882f5a5ea2666841037d112814816da2ce360273 --- /dev/null +++ b/pages/_includes/svg/social/pagekit.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/paypal.svg b/pages/_includes/svg/social/paypal.svg new file mode 100644 index 0000000000000000000000000000000000000000..977f3d74d1d98e7a7286401765800c2b55820b08 --- /dev/null +++ b/pages/_includes/svg/social/paypal.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/pinterest.svg b/pages/_includes/svg/social/pinterest.svg new file mode 100644 index 0000000000000000000000000000000000000000..340992c20fdff7a7a0c562c217064d3895cec1d4 --- /dev/null +++ b/pages/_includes/svg/social/pinterest.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/producthunt.svg b/pages/_includes/svg/social/producthunt.svg new file mode 100644 index 0000000000000000000000000000000000000000..9c28feb3ca9429b8773fd806e94fb1ab23ffe7b6 --- /dev/null +++ b/pages/_includes/svg/social/producthunt.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/rss.svg b/pages/_includes/svg/social/rss.svg new file mode 100644 index 0000000000000000000000000000000000000000..762d114abaa92ead98de61e1578e852be1d98139 --- /dev/null +++ b/pages/_includes/svg/social/rss.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/sass.svg b/pages/_includes/svg/social/sass.svg new file mode 100644 index 0000000000000000000000000000000000000000..72a7eb78b79e141424f03db14a6b8830af08ffcc --- /dev/null +++ b/pages/_includes/svg/social/sass.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/sentry.svg b/pages/_includes/svg/social/sentry.svg new file mode 100644 index 0000000000000000000000000000000000000000..5ac663e16d87c7879d0966515d5d4fe20e19bfd6 --- /dev/null +++ b/pages/_includes/svg/social/sentry.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/skype.svg b/pages/_includes/svg/social/skype.svg new file mode 100644 index 0000000000000000000000000000000000000000..6c0b01a565ff729dca52df5ab68b0673bae99011 --- /dev/null +++ b/pages/_includes/svg/social/skype.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/slack.svg b/pages/_includes/svg/social/slack.svg new file mode 100644 index 0000000000000000000000000000000000000000..2b51b0d9b8f8ee01c3e4f25bcf9af92bfc024908 --- /dev/null +++ b/pages/_includes/svg/social/slack.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/snapchat.svg b/pages/_includes/svg/social/snapchat.svg new file mode 100644 index 0000000000000000000000000000000000000000..ed272f04abc580e668b182e11f942b35f515075f --- /dev/null +++ b/pages/_includes/svg/social/snapchat.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/spotify.svg b/pages/_includes/svg/social/spotify.svg new file mode 100644 index 0000000000000000000000000000000000000000..8c351ffb55c341bc66315b888c76e7caab7db5f0 --- /dev/null +++ b/pages/_includes/svg/social/spotify.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/strava.svg b/pages/_includes/svg/social/strava.svg new file mode 100644 index 0000000000000000000000000000000000000000..00ec454708c032757d56efecefe934c33ed34f37 --- /dev/null +++ b/pages/_includes/svg/social/strava.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/stripe.svg b/pages/_includes/svg/social/stripe.svg new file mode 100644 index 0000000000000000000000000000000000000000..ac3ff85fdafacd8dc38ebb1ba3238f9f61210893 --- /dev/null +++ b/pages/_includes/svg/social/stripe.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/tabler.svg b/pages/_includes/svg/social/tabler.svg new file mode 100644 index 0000000000000000000000000000000000000000..99dc6bb3b3b6467f3876e081894469706156fd3c --- /dev/null +++ b/pages/_includes/svg/social/tabler.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/telegram.svg b/pages/_includes/svg/social/telegram.svg new file mode 100644 index 0000000000000000000000000000000000000000..f1ee16336e9dd276453ab012c09c8ebd4b85b1af --- /dev/null +++ b/pages/_includes/svg/social/telegram.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/tumblr.svg b/pages/_includes/svg/social/tumblr.svg new file mode 100644 index 0000000000000000000000000000000000000000..e53fa0d0530785d80b973867665ac7f2a520f798 --- /dev/null +++ b/pages/_includes/svg/social/tumblr.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/twitter.svg b/pages/_includes/svg/social/twitter.svg new file mode 100644 index 0000000000000000000000000000000000000000..7b3d9b9d47e1ef4ebb4e7270dfc24ae263ea557b --- /dev/null +++ b/pages/_includes/svg/social/twitter.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/typescript.svg b/pages/_includes/svg/social/typescript.svg new file mode 100644 index 0000000000000000000000000000000000000000..aa05c110ac75011993b51c7d2e95a5b2f754e93d --- /dev/null +++ b/pages/_includes/svg/social/typescript.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/uber.svg b/pages/_includes/svg/social/uber.svg new file mode 100644 index 0000000000000000000000000000000000000000..6dfb1d510974b9b17963953a7a44f72830f84a47 --- /dev/null +++ b/pages/_includes/svg/social/uber.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/uikit.svg b/pages/_includes/svg/social/uikit.svg new file mode 100644 index 0000000000000000000000000000000000000000..431858f0b7c0cf2776d93f4ac174c5f0550601bb --- /dev/null +++ b/pages/_includes/svg/social/uikit.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/vimeo.svg b/pages/_includes/svg/social/vimeo.svg new file mode 100644 index 0000000000000000000000000000000000000000..b916db420e4e7872638673c544742ba86e24d3c5 --- /dev/null +++ b/pages/_includes/svg/social/vimeo.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/vk.svg b/pages/_includes/svg/social/vk.svg new file mode 100644 index 0000000000000000000000000000000000000000..b7770277b06b999def770cb3267175ef3fe063d5 --- /dev/null +++ b/pages/_includes/svg/social/vk.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/wechat.svg b/pages/_includes/svg/social/wechat.svg new file mode 100644 index 0000000000000000000000000000000000000000..fd0ce915e6072900c35edaf1926b18064c8d47f2 --- /dev/null +++ b/pages/_includes/svg/social/wechat.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/whatsapp.svg b/pages/_includes/svg/social/whatsapp.svg new file mode 100644 index 0000000000000000000000000000000000000000..728331cb53cddc7d153d7b57e0912c769badc2fa --- /dev/null +++ b/pages/_includes/svg/social/whatsapp.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/wordpress.svg b/pages/_includes/svg/social/wordpress.svg new file mode 100644 index 0000000000000000000000000000000000000000..041a5a883c69878180d056d232142953f0ae7786 --- /dev/null +++ b/pages/_includes/svg/social/wordpress.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/ycombinator.svg b/pages/_includes/svg/social/ycombinator.svg new file mode 100644 index 0000000000000000000000000000000000000000..5277070e365b0487f348e64f264426dba2e15065 --- /dev/null +++ b/pages/_includes/svg/social/ycombinator.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/svg/social/youtube.svg b/pages/_includes/svg/social/youtube.svg new file mode 100644 index 0000000000000000000000000000000000000000..58827d664520383d511fd2e4b28417875dfbddad --- /dev/null +++ b/pages/_includes/svg/social/youtube.svg @@ -0,0 +1,3 @@ + + + diff --git a/pages/_includes/ui/button.html b/pages/_includes/ui/button.html index 25ab55744a7057bbf8cc82be3a8c6032f2f35c57..6a0856784f6331ea68dc6b07ac3c7f192870eaaa 100644 --- a/pages/_includes/ui/button.html +++ b/pages/_includes/ui/button.html @@ -1,5 +1,14 @@ +{% removeemptylines %} {% assign spinner-class = false %} {% assign provider = include.provider | default: 'fe' %} {% if include.text %}{% assign spinner-class="mr-2" %}{% endif %} -{% assign element = include.element | default: 'button' %}<{{ element }}{% if element == 'a' %} href="{{ include.href | default: '#' }}"{% endif %} class="btn{% if include.height %} btn-{{ include.height }}{% endif %}{% if include.color %} btn-{% if include.outline %}outline-{% endif %}{{ include.color }}{% endif %}{% if include.disabled %} disabled{% endif %}{% if include.square %} btn-square{% endif %}{% if include.pill %} btn-pill{% endif %}{% if include.class %} {{ include.class }}{% endif %}{% if include.block %} btn-block{% endif %}{% if include.link %} btn-link{% endif %}{% if include.label %} btn-label{% endif %}">{% if include.spinner %} -{% include ui/spinner.html color=false size="sm" class=spinner-class element="span" %}{% endif %}{% if include.icon %}{% include ui/icon.html icon=include.icon provider=provider %}{% endif %}{% if include.label %}{% include ui/icon.html icon=include.label %}{% endif %}{{ include.text }} +{% assign element = include.element | default: 'button' %} +<{{ element }}{% if element == 'a' %} href="{{ include.href | default: '#' }}"{% endif %} class="btn{% if include.height %} btn-{{ include.height }}{% endif %}{% if include.color %} btn-{% if include.outline %}outline-{% endif %}{{ include.color }}{% endif %}{% if include.disabled %} disabled{% endif %}{% if include.square %} btn-square{% endif %}{% if include.pill %} btn-pill{% endif %}{% if include.class %} {{ include.class }}{% endif %}{% if include.block %} btn-block{% endif %}{% if include.link %} btn-link{% endif %}{% if include.label %} btn-label{% endif %}"> +{% if include.spinner %} +{% include ui/spinner.html color=false size="sm" class=spinner-class element="span" %}{% endif %} +{% if include.icon %}{% include ui/icon.html icon=include.icon use-svg=true %}{% endif %} +{{ include.text }} +{% if include.icon-right %}{% include ui/icon.html icon=include.icon-right use-svg=true right=true %}{% endif %} + + +{% endremoveemptylines %} diff --git a/pages/_includes/ui/icon.html b/pages/_includes/ui/icon.html index dded9c6d50ad99fe3dec58cdf3315e7e42ef2ffa..af39817ec8f6893e62f949a31253751543e448b5 100644 --- a/pages/_includes/ui/icon.html +++ b/pages/_includes/ui/icon.html @@ -1 +1,19 @@ -{% assign provider = include.provider | default: "fe" %} +{% removeemptylines %} + {% if include.use-svg %} + {% assign svg-file="svg/" | append: include.icon | append: ".svg" %} + {% capture svg-icon %} + {% include_cached {{ svg-file }} %} + {% endcapture %} + + {% if include.right %} + {% assign replace-to = 'class="icon icon-right"' %} + {% else %} + {% assign replace-to = 'class="icon"' %} + {% endif %} + + {{ svg-icon | replace_regex: 'class=\"[^"]+\"', replace-to }} +{% else %} + {% assign provider = include.provider | default: "fe" %} + +{% endif %} +{% endremoveemptylines %} diff --git a/pages/_plugins/jekyll-filters.rb b/pages/_plugins/jekyll-filters.rb index 4ce71ff09ddb9fd4df53012b753d3b882866e7fc..ae660c3e4f4c031924fd7eba3c374715f1cc14f3 100644 --- a/pages/_plugins/jekyll-filters.rb +++ b/pages/_plugins/jekyll-filters.rb @@ -77,7 +77,12 @@ module Jekyll else 'tabler.colors["'+ color[0] + '"]' end + end + + def replace_regex(input, reg_str, repl_str) + re = Regexp.new reg_str + input.gsub re, repl_str end end end diff --git a/pages/buttons.html b/pages/buttons.html index 07297244287e753ef63658430d2fab3aa308b9fc..9bfd18a74de7d0fe2668bb2806dd7774785ba79f 100644 --- a/pages/buttons.html +++ b/pages/buttons.html @@ -3,54 +3,78 @@ title: Buttons done: true --- -

- {% include ui/button.html text="Button" %} - {% include ui/button.html text="Button value" %} - {% include ui/button.html text="Button" color="primary" %} - {% include ui/button.html text="Button" color="secondary" %} - {% include ui/button.html text="Button" color="green" %} - {% include ui/button.html text="Button" color="teal" %} - {% include ui/button.html text="Button" color="yellow" %} - {% include ui/button.html text="Button" color="dark" %} - {% include ui/button.html text="Button" color="red" link=true %} - {% include ui/button.html text="Button" color="red" disabled=true %} - {% include ui/button.html text="Button" link=true %} - {% include ui/button.html text="Button" link=true class="text-danger" %} -

-

- {% include ui/button.html text="Button" color="red" square=true %} - {% include ui/button.html text="Button" color="red" pill=true %} - {% include ui/button.html text="Button" color="red" pill=true outline=true %} - {% include ui/button.html text="Button" color="red" outline=true %} - {% include ui/button.html text="Button" color="twitter" icon="twitter" %} - {% include ui/button.html color="facebook" icon="facebook" %} - {% include ui/button.html color="github" icon="github" %} -

-

- {% include ui/button.html text="Button" color="red" size="lg" %} - {% include ui/button.html text="Button" color="red" size="sm" %} -

-

- {% include ui/button.html text="Button" block=true color="primary" %} - {% include ui/button.html text="Button" block=true color="secondary" %} -

-

- {% include ui/avatar.html person-id="4" class="btn-avatar" %} Avatar - {% include ui/avatar.html person-id="5" class="btn-avatar" %} Avatar - {% include ui/avatar.html person-id="6" class="btn-avatar" %} Avatar -

-

- Loading… - Loading… - Loading… - Loading… -

- -

- {% include ui/button.html text="Button" label="star" color="primary" %} - {% include ui/button.html text="Button" label="star" color="green" %} - {% include ui/button.html text="Button" label="star" color="lime" %} - {% include ui/button.html text="Button" label="star" color="pink" %} - {% include ui/button.html text="Button" label="star" color="yellow" %} - {% include ui/button.html text="Button" label="star" color="orange" %} -

+
+
+
+
+

Buttons

+ +
+ {% for color in site.colors %} + {% assign c = color[0] %} + {% include ui/button.html text="Button" color=c %} + {% endfor %} +
+
+
+
+ +
+
+
+

Outlined buttons

+ +
+ {% for color in site.colors %} + {% assign c = color[0] %} + {% include ui/button.html text="Button" outline=true color=c %} + {% endfor %} +
+
+
+
+ +
+
+
+

Buttons with icons

+ +
+ {% for color in site.colors %} + {% assign c = color[0] %} + {% include ui/button.html text="Button" color=c icon="star" %} + {% endfor %} +
+
+
+
+ +
+
+
+

Outlined buttons with icons

+ +
+ {% for color in site.colors %} + {% assign c = color[0] %} + {% include ui/button.html text="Button" outline=true color=c icon-right="star" %} + {% endfor %} +
+
+
+
+ +
+
+
+

Social buttons

+ +
+ {% for social in site.socials %} + {% include ui/button.html text=social.title color=social.name icon=social.icon %} + {% endfor %} +
+
+
+
+
diff --git a/pages/markdown.html b/pages/markdown.html new file mode 100644 index 0000000000000000000000000000000000000000..7a1fe55d77f68e9a33ca5c24103fda9ef8c65d02 --- /dev/null +++ b/pages/markdown.html @@ -0,0 +1,45 @@ +--- +title: Markdown +--- + +
+
+
+ +
+
+ +

It's a hug, Michael. I'm hugging you.

+

Get me a vodka rocks. And a piece of toast. Say goodbye to these, because it's the last time! Guy's a pro. Michael! Across from where?

+

No… but I'd like to be asked! It's called 'taking advantage. ' It's what gets you ahead in life. Not tricks, Michael, illusions. Army had half a day.

+

Not tricks, Michael, illusions.

+

Well, what do you expect, mother? Say goodbye to these, because it's the last time! I don't understand the question, and I won't respond to it. No, I did not kill Kitty. However, I am going to oblige and answer the nice officer's questions because I am an honest man with no secrets to hide.

+
    +
  1. I'm afraid I just blue myself.
  2. It's called 'taking advantage.' It's what gets you ahead in life.
  3. I don't understand the question, and I won't respond to it.
  4. +
+ +

Across from where?

+

I don't criticize you! And if you're worried about criticism, sometimes a diet is the best defense. Did you enjoy your meal, Mom? You drank it fast enough. Did you enjoy your meal, Mom? You drank it fast enough.

+
    +
  • No! I was ashamed to be SEEN with you. I like being with you.
  • What's Spanish for "I know you speak English?"
  • No! I was ashamed to be SEEN with you. I like being with you.
  • +
+ +

Steve Holt! Guy's a pro. I don't understand the question, and I won't respond to it. There's so many poorly chosen words in that sentence.

+

Oh, you're gonna be in a coma, all right. Bad news. Andy Griffith turned us down. He didn't like his trailer. It's called 'taking advantage.' It's what gets you ahead in life. That's why you always leave a note!

+ +

That's what it said on 'Ask Jeeves.' Guy's a pro.

+

There's so many poorly chosen words in that sentence. There's only one man I've ever called a coward, and that's Brian Doyle Murray. No, what I'm calling you is a television actor.

+

Whoa, this guy's straight? Say goodbye to these, because it's the last time! That's why you always leave a note! There's only one man I've ever called a coward, and that's Brian Doyle Murray. No, what I'm calling you is a television actor.

+

Say goodbye to these, because it's the last time! I'm afraid I just blue myself. Steve Holt! We just call it a sausage. We just call it a sausage. Steve Holt!

+

Not tricks, Michael, illusions. Guy's a pro. No! I was ashamed to be SEEN with you. I like being with you. Really? Did nothing cancel? We just call it a sausage.

+

Now, when you do this without getting punched in the chest, you'll have more fun. Guy's a pro. That's what it said on 'Ask Jeeves.' I don't understand the question, and I won't respond to it. Whoa, this guy's straight?

+

As you may or may not know, Lindsay and I have hit a bit of a rough patch. He'll want to use your yacht, and I don't want this thing smelling like fish. No… but I'd like to be asked! Did you enjoy your meal, Mom? You drank it fast enough.

+

We just call it a sausage. I care deeply for nature. It's a hug, Michael. I'm hugging you. Well, what do you expect, mother?

+

I don't understand the question, and I won't respond to it. Well, what do you expect, mother? Marry me. No, I did not kill Kitty. However, I am going to oblige and answer the nice officer's questions because I am an honest man with no secrets to hide.

+

He'll want to use your yacht, and I don't want this thing smelling like fish. I'm half machine. I'm a monster. But I bought a yearbook ad from you, doesn't that mean anything anymore? That's what it said on 'Ask Jeeves.'

+
+
+ +
+
+
diff --git a/scss/_mixins.scss b/scss/_mixins.scss index 618e57dc769e697d7f4c8482696d74bb1be8ed54..c1cb0bb8805914cae86237f6483143b935697076 100644 --- a/scss/_mixins.scss +++ b/scss/_mixins.scss @@ -1,3 +1,2 @@ -@import "mixins/px2rem"; -@import "mixins/theme-color-lighter"; +@import "mixins/functions"; @import "mixins/container-breakpoints"; diff --git a/scss/_variables.scss b/scss/_variables.scss index 44d4cc0e012bb3a901c17efcff5a9ad100e42603..ad14f916fa39afc88e885daf7251059c293dba78 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1,10 +1,11 @@ // FONTS -$font-family-base: "Nunito", -apple-system, blinkmacsystemfont, "Segoe UI", roboto, "Helvetica Neue", arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default; +$google-font: 'Source Sans Pro' !default; + +$font-family-sans-serif: $google-font, -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol !default; $font-family-serif: "Georgia", "Times New Roman", times, serif !default; $font-icons: "tabler-webfont" !default; // EXTERNAL FONTS -$google-font-url: "https://fonts.googleapis.com/css?family=Nunito:300,400,600,700&display=swap" !default; $icon-fonts: () !default; // COLORS @@ -12,8 +13,8 @@ $full-black: rgba(0, 0, 0, 1) !default; $full-white: rgba(255, 255, 255, 1) !default; $light-black: rgba(0, 0, 0, .4) !default; $light-white: rgba(255, 255, 255, .4) !default; -$min-black: rgba(135, 150, 165, .064) !default; -$min-white: rgba(255, 255, 255, .064) !default; +$min-black: rgba(135, 150, 165, .032) !default; +$min-white: rgba(255, 255, 255, .032) !default; $gray-100: #f8f9fa !default; $gray-200: #e9ecef !default; @@ -31,8 +32,8 @@ $indigo: #6574cd !default; $purple: #a55eea !default; $pink: #f66d9b !default; $red: #fa4654 !default; -$orange: #fd9644 !default; -$yellow: #f1c40f !default; +$orange: #ff922b !default; +$yellow: #fcc419 !default; $lime: #7bd235 !default; $green: #5eba00 !default; $teal: #2bcbba !default; @@ -64,6 +65,7 @@ $social-colors: ( "rss": #ffa500, "flickr": #0063dc, "bitbucket": #0052cc, + "tabler": #206bc4 ) !default; $status-colors: ( @@ -106,24 +108,28 @@ $avatar-sizes: ( $font-size-base: .9375rem !default; $font-weight-base: 400 !default; $line-height-base: 1.6 !default; +$body-letter-spacing: null !default; $border-radius: 3px !default; //Typography $headings-color: #021f34 !default; -$headings-font-weight: 600 !default; +$headings-font-weight: 500 !default; $small-font-size: 87.5% !default; -$h1-font-size: $font-size-base * 2 !default; -$h2-font-size: $font-size-base * 1.75 !default; -$h3-font-size: $font-size-base * 1.5 !default; -$h4-font-size: $font-size-base * 1.25 !default; -$h5-font-size: $font-size-base * 1 !default; -$h6-font-size: $font-size-base * .875 !default; +$h1-font-size: (23em/15) !default; +$h2-font-size: (21em/15) !default; +$h3-font-size: (19em/15) !default; +$h4-font-size: (17em/15) !default; +$h5-font-size: (15em/15) !default; +$h6-font-size: (13em/15) !default; +$h7-font-size: (11em/15) !default; $blockquote-font-size: $h4-font-size !default; -$lead-font-size: $h3-font-size !default; + +$lead-font-size: $h4-font-size !default; +$lead-font-weight: 400 !default; $hr-opacity: .1 !default; $hr-margin-y: 1rem !default; @@ -212,10 +218,27 @@ $container-max-widths: ( //alerts $alert-link-font-weight: 600 !default; +//breadcrumb +$breadcrumb-variants: ( + dots: '·', + arrows: '›', + bullets: '\02022', +) !default; + +//badges +$badge-font-weight: 500 !default; + +//buttons +$input-btn-font-size: 15px !default; +$btn-padding-x: 1rem !default; + +$btn-font-weight: 500 !default; +$btn-border-radius: 3px !default; + //cards $card-border-color: $border-color !default; $card-border-radius: $border-radius !default; -$card-cap-bg: $body-bg !default; +$card-cap-bg: $min-black !default; $card-active-border-color: $blue !default; $card-status-size: 2px !default; @@ -228,21 +251,6 @@ $card-shadow-hover: rgba($dark, .08) 0 2px 12px 0; $close-font-weight: 400 !default; $close-font-size: 1.5rem !default; -//badges -$badge-font-weight: 600 !default; - -//buttons -$btn-font-weight: 600 !default; -$btn-font-size: 14px !default; -$btn-border-radius: 3px !default; - -//breadcrumb -$breadcrumb-variants: ( - dots: '·', - arrows: '›', - bullets: '\02022', -) !default; - //nav $nav-link-padding-y: .25rem !default; @@ -277,6 +285,9 @@ $spinner-height: 1.5rem !default; $spinner-border-width: 2px !default; $spinner-border-width-sm: 2px !default; +//tables +$table-head-border-color: $border-color !default; + //toasts $toast-border-color: $border-color !default; $toast-header-color: $text-muted !default; @@ -284,6 +295,10 @@ $toast-header-color: $text-muted !default; //other $yiq-contrasted-threshold: 200 !default; +//progress +$progress-bg: $gray-100 !default; +$progress-height: .75rem !default; + $list-group-border-color: $border-color !default; $list-group-action-color: inherit !default; diff --git a/scss/fonts/_webfonts.scss b/scss/fonts/_webfonts.scss index 40525a85d0049ff0302acb33d285bed73f8ddf08..c2a7f9a46c37131d16c21626d2ad66cbfbcea08a 100644 --- a/scss/fonts/_webfonts.scss +++ b/scss/fonts/_webfonts.scss @@ -1,4 +1,6 @@ -@if $google-font-url { +@if $google-font { + $google-font-url: "https://fonts.googleapis.com/css?family=" + str-replace($google-font, ' ', '+') + ":300,400,500,600,700" !default; + @import url($google-font-url); } diff --git a/scss/layout/_core.scss b/scss/layout/_core.scss index ad892e971aea7672b0b8c8a7dd47665b6e18a9fc..d580269445a66e8efee8de3c013a0e22234e60c9 100644 --- a/scss/layout/_core.scss +++ b/scss/layout/_core.scss @@ -2,20 +2,15 @@ html { height: 100%; font-size: 16px; - - @include media-breakpoint-down(md) { - font-size: 15px; - } } body { height: 100%; overflow-y: scroll; touch-action: manipulation; - -webkit-tap-highlight-color: transparent; - -webkit-text-size-adjust: none; text-rendering: optimizeLegibility; font-feature-settings: "liga" 0; + letter-spacing: $body-letter-spacing; } body *::-webkit-scrollbar { diff --git a/scss/layout/_navbar.scss b/scss/layout/_navbar.scss index 927c361ef9dbd525a7c95ff8b93c4ca585a5a98c..66a060b98f09341eb73c199971265358b9e832f0 100644 --- a/scss/layout/_navbar.scss +++ b/scss/layout/_navbar.scss @@ -335,7 +335,6 @@ Folded navbar } .nav-icon { - width: 1.5rem; font-size: px2rem(15px); opacity: 1; justify-content: center; @@ -359,7 +358,7 @@ Folded navbar .nav-icon { display: flex; - width: 1.75rem; + width: 1.5rem; border-radius: 100%; flex-shrink: 0; opacity: .8; diff --git a/scss/layout/_page.scss b/scss/layout/_page.scss index f728767fcd5e2f24b95f827ac037448cbb96ebda..4a51ab695d43fc227f3d69aafba82126241932cc 100644 --- a/scss/layout/_page.scss +++ b/scss/layout/_page.scss @@ -10,6 +10,7 @@ font-size: $h3-font-size; font-weight: 400; line-height: 2.5rem; + color: $body-color; } .page-title-options { diff --git a/scss/mixins/_functions.scss b/scss/mixins/_functions.scss new file mode 100644 index 0000000000000000000000000000000000000000..940046967590cb51e72ec4a5497df7b5e715c1c3 --- /dev/null +++ b/scss/mixins/_functions.scss @@ -0,0 +1,22 @@ +@function px2rem($px) { + @return ($px / 16px) * 1rem; +} + +@function theme-color-lighter($color) { + @return rgba($color, .2); +} + +@function theme-color-lightest($color) { + @return mix($color, #fff, 10%); +} + + +@function str-replace($string, $search, $replace: '') { + $index: str-index($string, $search); + + @if $index { + @return str-slice($string, 1, $index - 1) + $replace + str-replace(str-slice($string, $index + str-length($search)), $search, $replace); + } + + @return $string; +} diff --git a/scss/mixins/_px2rem.scss b/scss/mixins/_px2rem.scss deleted file mode 100644 index 24f47e1d8c588c99f395ecb672cc9d274e93f55b..0000000000000000000000000000000000000000 --- a/scss/mixins/_px2rem.scss +++ /dev/null @@ -1,3 +0,0 @@ -@function px2rem($px) { - @return ($px / 16px) * 1rem; -} diff --git a/scss/mixins/_theme-color-lighter.scss b/scss/mixins/_theme-color-lighter.scss deleted file mode 100644 index 951cd6fd4ce20674e5f63891c500bf93992f9f0e..0000000000000000000000000000000000000000 --- a/scss/mixins/_theme-color-lighter.scss +++ /dev/null @@ -1,8 +0,0 @@ -@function theme-color-lighter($color) { - @return rgba($color, .2); -} - -@function theme-color-lightest($color) { - @return mix($color, #fff, 10%); - //@return rgba($color, .1); -} diff --git a/scss/ui/_buttons.scss b/scss/ui/_buttons.scss index aba584f8cdf5a1ed1a573d61dff5043a4434db59..15204c4574a945025cd9dcf66de3513a66e185eb 100644 --- a/scss/ui/_buttons.scss +++ b/scss/ui/_buttons.scss @@ -1,9 +1,32 @@ .btn { - letter-spacing: .03em; + display: inline-flex; + align-items: center; + justify-content: center; box-shadow: 0 1px 1px rgba(0, 0, 0, .03); - .flag { - vertical-align: -5px; + &:not([class^='btn-outline']):not([class*=' btn-outline']) { + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .05), inset 0 2px 0 -1px rgba(255, 255, 255, .1); + text-shadow: 1px 1px 0 rgba(0, 0, 0, .1); + + svg.icon { + filter: drop-shadow(1px 1px 0 rgba(0, 0, 0, .1)); + } + } + + .icon { + font-size: 1.2em; + vertical-align: sub; + margin: 0 .5em 0 -.25em; + } + + .icon-right { + margin: 0 -.25em 0 .5em; + } + + svg.icon { + width: 1em; + height: 1em; + stroke-width: 1.5; } } @@ -41,9 +64,6 @@ } .btn-icon { - min-width: px2rem(35px); //todo: porpawic, wpisalem z palca - padding-right: .5rem; - padding-left: .5rem; } .btn-list { @@ -53,7 +73,6 @@ > .btn, > .dropdown { margin-bottom: .5rem; - display: inline-block; &:not(:last-child) { margin-right: .5rem; diff --git a/scss/ui/_cards.scss b/scss/ui/_cards.scss index 2e599aaf2f431c4e270b11a65c360d53dc2162c6..7c583a06ee96ec44f415b0689e030456f289301c 100644 --- a/scss/ui/_cards.scss +++ b/scss/ui/_cards.scss @@ -152,13 +152,14 @@ display: block; font-size: $h4-font-size; font-weight: $headings-font-weight; + margin: 0 0 1rem; @at-root a#{&}:hover { color: inherit; } .card-header & { - margin: -.125rem 0; + margin: 0; } } diff --git a/scss/ui/_empty.scss b/scss/ui/_empty.scss index b971503009e04f2870ffdec82c228445b350ed47..293a5fe39b9b86d72e924993f47122d92f943fd4 100644 --- a/scss/ui/_empty.scss +++ b/scss/ui/_empty.scss @@ -1,7 +1,7 @@ .empty { text-align: center; color: $text-muted; - padding: 2rem 3rem; + padding: 3rem; height: 100%; display: flex; diff --git a/scss/ui/_inputs.scss b/scss/ui/_inputs.scss index 490d096583a9e5ed0950c6a992d5239f47c17a2e..0e31acb9852fa1601de968bef1160053b19f826c 100644 --- a/scss/ui/_inputs.scss +++ b/scss/ui/_inputs.scss @@ -32,8 +32,8 @@ textarea { } .form-control-light { - background-color: $min-black; - border-color: $min-black; + background-color: $gray-100; + border-color: transparent; } .form-footer { diff --git a/scss/ui/_progress.scss b/scss/ui/_progress.scss index 48fcbe84e62e8fa9e40253a68db7f38f40f4eb62..f6ba8b2e428a5372f5caa9a5df6fe0b7864a353e 100644 --- a/scss/ui/_progress.scss +++ b/scss/ui/_progress.scss @@ -12,14 +12,12 @@ .progress { appearance: none; - background: $min-black; - height: .75rem; - line-height: .75rem; + line-height: $progress-height; position: relative; width: 100%; &::-webkit-progress-bar { - background: $min-black; + background: $gray-100; } &::-webkit-progress-value { diff --git a/scss/ui/_stamps.scss b/scss/ui/_stamps.scss index e09e5d85134ece3e8a6b4065accf185174cdbd55..7e46d22bac8fcf6f8191e4f7d3bb59fbecc99028 100644 --- a/scss/ui/_stamps.scss +++ b/scss/ui/_stamps.scss @@ -13,5 +13,6 @@ .icon { font-size: 1.25rem; + vertical-align: middle; } } diff --git a/scss/ui/_tables.scss b/scss/ui/_tables.scss index af5142c5511eea2ce21b6252232b82c125c00ff2..9bc3e06f6452d3bdef7853e50ee885189d30e2a2 100644 --- a/scss/ui/_tables.scss +++ b/scss/ui/_tables.scss @@ -6,17 +6,14 @@ border-width: $table-border-width; background: $min-black; text-transform: uppercase; - font-size: $h6-font-size; font-weight: 600; + font-size: 11px; + letter-spacing: .03em; } } th { - padding-top: .5rem; - padding-bottom: .5rem; - font-weight: 400; color: $text-muted; - white-space: nowrap; } } diff --git a/scss/ui/_typo.scss b/scss/ui/_typo.scss index 5b4ae7cb2a9565131303bbb50e660d132c162be4..3b28d4c8b45c2e2020bf1d97722ae8a2427c2ae3 100644 --- a/scss/ui/_typo.scss +++ b/scss/ui/_typo.scss @@ -20,7 +20,6 @@ h6, .h4, .h5, .h6 { - letter-spacing: -.012em; a { color: inherit; @@ -84,35 +83,6 @@ img { max-width: 100%; } -/** -Divider - */ -.divider { - display: flex; - flex: 0; - align-items: center; - width: 100%; - margin: 1.5rem auto; - font-size: $h6-font-size; - color: $text-muted; - letter-spacing: .5px; - font-weight: 400; - - &::before, - &::after { - flex-grow: 1; - content: ""; - border-top: 1px solid $border-color; - } - - &::before { - margin-right: 1rem; - } - - &::after { - margin-left: 1rem; - } -} /** Selection diff --git a/scss/utils/_text.scss b/scss/utils/_text.scss index 9ed37234a1f570f353d933e451be4d21160dc59e..12e31acb5efc1802b793a1ca19dafdd0d12ac07f 100644 --- a/scss/utils/_text.scss +++ b/scss/utils/_text.scss @@ -47,7 +47,6 @@ Antialiasing Markdown */ .markdown { - line-height: 1.66; > :first-child { margin-top: 0; @@ -57,18 +56,6 @@ Markdown margin-bottom: 0; } - > { - h1, - h2, - h3, - h4, - h5, - h6 { - margin-top: 1.5em; - font-weight: 600; - } - } - table { @extend .table, .table-bordered; }