diff --git a/_includes/design/icons.html b/_includes/design/icons.html index e73a9c8..ec9713f 100644 --- a/_includes/design/icons.html +++ b/_includes/design/icons.html @@ -1,16 +1,16 @@

Icons

- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + I2P uses the following icons in its interface.
{% for icons_hash in page.icons %} {% for icon in icons_hash %} -
+
- +
{{icon[0]}} diff --git a/_includes/head.html b/_includes/head.html index a9ba12c..fb41ee0 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -7,5 +7,6 @@ + diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 2922a21..08e2ebc 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -2,7 +2,7 @@
    {% for sidebar_hash in page.sidebar %} {% for link in sidebar_hash %} -
  • +
  • {{ link[1] }}
    • {% endfor %} diff --git a/_layouts/assets.html b/_layouts/assets.html deleted file mode 100644 index 2dc8097..0000000 --- a/_layouts/assets.html +++ /dev/null @@ -1,25 +0,0 @@ - - - {% include head.html %} - - {% include navbar.html %} -
    - -
    - {{ content }} - {% include /design/assets.html participants=site.data.profiles %} - {% include scrollspy.html %} - {% include scripts.html %} -
    -
    - - diff --git a/_layouts/colors.html b/_layouts/colors.html deleted file mode 100644 index f05e532..0000000 --- a/_layouts/colors.html +++ /dev/null @@ -1,25 +0,0 @@ - - - {% include head.html %} - - {% include navbar.html %} -
    - -
    - {{ content }} - {% include /design/colors.html participants=site.data.profiles %} - {% include scrollspy.html %} - {% include scripts.html %} -
    -
    - - diff --git a/_layouts/design.html b/_layouts/design.html index 713e420..4f7bbdd 100644 --- a/_layouts/design.html +++ b/_layouts/design.html @@ -16,6 +16,11 @@
{{ content }} + {% include design/colors.html %} + {% include design/grid.html %} + {% include design/typography.html %} + {% include design/icons.html %} + {% include design/assets.html %} {% include scrollspy.html %} {% include scripts.html %}
diff --git a/_layouts/grid.html b/_layouts/grid.html deleted file mode 100644 index 9cc0b2f..0000000 --- a/_layouts/grid.html +++ /dev/null @@ -1,25 +0,0 @@ - - - {% include head.html %} - - {% include navbar.html %} -
- -
- {{ content }} - {% include /design/grid.html participants=site.data.profiles %} - {% include scrollspy.html %} - {% include scripts.html %} -
-
- - diff --git a/_layouts/typography.html b/_layouts/typography.html deleted file mode 100644 index 0e22e65..0000000 --- a/_layouts/typography.html +++ /dev/null @@ -1,25 +0,0 @@ - - - {% include head.html %} - - {% include navbar.html %} -
- -
- {{ content }} - {% include /design/typography.html participants=site.data.profiles %} - {% include scrollspy.html %} - {% include scripts.html %} -
-
- - diff --git a/_site/404.html b/_site/404.html index 90e4838..469ac4a 100644 --- a/_site/404.html +++ b/_site/404.html @@ -9,6 +9,7 @@ + diff --git a/_site/assets/styles/layout.scss b/_site/assets/styles/layout.scss index ae05220..f47bfce 100644 --- a/_site/assets/styles/layout.scss +++ b/_site/assets/styles/layout.scss @@ -35,7 +35,7 @@ } .sidebar__link__light { - color: $oc-gray-6 !important; + color: $oc-gray-7 !important; &:hover { color: $oc-black !important; diff --git a/_site/assets/styles/main.css b/_site/assets/styles/main.css index a98b13b..1f24bfc 100644 --- a/_site/assets/styles/main.css +++ b/_site/assets/styles/main.css @@ -8,7 +8,7 @@ .sidebar-wrapper { background-color: #dee2e6; } -.sidebar__link__light { color: #868e96 !important; } +.sidebar__link__light { color: #495057 !important; } .sidebar__link__light:hover { color: #000000 !important; transition-timing-function: linear; -webkit-transition-timing-function: linear; -webkit-transition-duration: .3s; transition-duration: .3s; } .sidebar__link__light:active { color: #4661A9; } diff --git a/_site/components/index.html b/_site/components/index.html index df6d856..61bd523 100644 --- a/_site/components/index.html +++ b/_site/components/index.html @@ -9,6 +9,7 @@ + @@ -75,43 +76,43 @@
    -
  • +
  • Alerts
    • -
  • +
  • Badges
    • -
  • +
  • Buttons
    • -
  • +
  • Cards
    • -
  • +
  • Footer
    • -
  • +
  • Forms
    • -
  • +
  • Header
    • diff --git a/_site/copywriting/index.html b/_site/copywriting/index.html index a20b27b..fad3ad4 100644 --- a/_site/copywriting/index.html +++ b/_site/copywriting/index.html @@ -9,6 +9,7 @@ + @@ -75,61 +76,61 @@
      -
    • +
    • Goals & Principles
      • -
    • +
    • Voice & Tone
      • -
    • +
    • Grammar
      • -
    • +
    • Mechanics
      • -
    • +
    • People & Design
      • -
    • +
    • Blog Posts
      • -
    • +
    • Newsletter
      • -
    • +
    • Social Media
      • -
    • +
    • Copyright
      • -
    • +
    • Word List
      • diff --git a/_site/getting-started/index.html b/_site/getting-started/index.html index bf568a3..c990441 100644 --- a/_site/getting-started/index.html +++ b/_site/getting-started/index.html @@ -9,6 +9,7 @@ + diff --git a/_site/index.html b/_site/index.html index 230f029..f1e8a6f 100644 --- a/_site/index.html +++ b/_site/index.html @@ -9,6 +9,7 @@ + diff --git a/_site/jekyll/update/2018/05/06/welcome-to-jekyll.html b/_site/jekyll/update/2018/05/06/welcome-to-jekyll.html index 1813249..125a40c 100644 --- a/_site/jekyll/update/2018/05/06/welcome-to-jekyll.html +++ b/_site/jekyll/update/2018/05/06/welcome-to-jekyll.html @@ -9,6 +9,7 @@ + diff --git a/assets.md b/assets.md deleted file mode 100644 index 72a626e..0000000 --- a/assets.md +++ /dev/null @@ -1,26 +0,0 @@ ---- - layout: assets - title: Assets - permalink: /design/assets - - sidebar: - - colors: Colors - - grid: Grid - - typography: Typography - - assets: Assets - - icons: - - login: oi oi-account-login - - logout: oi oi-account-logout - - redo: oi oi-action-redo - - undo: oi oi-action-undo - - center: oi oi-align-center - - left: oi oi-align-left - - right: oi oi-align-right - - aperture: oi oi-aperture - - bottom: oi oi-arrow-bottom - - circleb: oi oi-arrow-circle-bottom - - circlel: oi oi-arrow-circle-left - - circler: oi oi-arrow-circle-right - - circlet: oi oi-arrow-circle-top ---- diff --git a/assets/fonts/i2p.css b/assets/fonts/i2p.css new file mode 100644 index 0000000..bec614d --- /dev/null +++ b/assets/fonts/i2p.css @@ -0,0 +1,77 @@ +@font-face { + font-family: 'i2p'; + src: url('i2p.eot'); + src: url('i2p.eot') format('embedded-opentype'), + url('i2p.woff2') format('woff2'), + url('i2p.woff') format('woff'), + url('i2p.ttf') format('truetype'), + url('i2p.svg') format('svg'); + font-weight: normal; + font-style: normal; +} +/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ +/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ +/* +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: 'i2p'; + src: url('../font/i2p.svg?48147931#i2p') format('svg'); + } +} +*/ + + [class^="icon-"]:before, [class*=" icon-"]:before { + font-family: "i2p"; + font-style: normal; + font-weight: normal; + speak: none; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + /* opacity: .8; */ + + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; + + /* fix buttons height, for twitter bootstrap */ + line-height: 1em; + + /* Animation center compensation - margins should be symmetric */ + /* remove if not needed */ + margin-left: .2em; + + /* you can be more comfortable with increased icons size */ + /* font-size: 120%; */ + + /* Font smoothing. That was taken from TWBS */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + /* Uncomment for 3D effect */ + /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ +} + +.icon-i2p-help:before { content: '\e800'; } /* '' */ +.icon-i2p-mail:before { content: '\e801'; } /* '' */ +.icon-i2p-plugin:before { content: '\e802'; } /* '' */ +.icon-i2p-router:before { content: '\e803'; } /* '' */ +.icon-i2p-dashboard:before { content: '\e804'; } /* '' */ +.icon-i2p-bandwidth:before { content: '\e805'; } /* '' */ +.icon-i2p-server:before { content: '\e806'; } /* '' */ +.icon-i2p-paste:before { content: '\e807'; } /* '' */ +.icon-i2p-bug:before { content: '\e808'; } /* '' */ +.icon-i2p-docs:before { content: '\e809'; } /* '' */ +.icon-i2p-address:before { content: '\e80a'; } /* '' */ +.icon-i2p-wiki:before { content: '\e80b'; } /* '' */ +.icon-i2p-sync:before { content: '\e80c'; } /* '' */ +.icon-i2p-power:before { content: '\e80d'; } /* '' */ +.icon-i2p-directory:before { content: '\e80e'; } /* '' */ +.icon-i2p-fingerprint:before { content: '\e80f'; } /* '' */ +.icon-i2p-alert:before { content: '\e810'; } /* '' */ +.icon-i2p-valid:before { content: '\e811'; } /* '' */ +.icon-i2p-fast:before { content: '\e812'; } /* '' */ +.icon-i2p-anon:before { content: '\e813'; } /* '' */ diff --git a/assets/fonts/i2p.eot b/assets/fonts/i2p.eot new file mode 100644 index 0000000..88a8c51 Binary files /dev/null and b/assets/fonts/i2p.eot differ diff --git a/assets/fonts/i2p.svg b/assets/fonts/i2p.svg new file mode 100644 index 0000000..a4a35f1 --- /dev/null +++ b/assets/fonts/i2p.svg @@ -0,0 +1,50 @@ + + + +Copyright (C) 2018 by original authors @ fontello.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/fonts/i2p.ttf b/assets/fonts/i2p.ttf new file mode 100644 index 0000000..6357008 Binary files /dev/null and b/assets/fonts/i2p.ttf differ diff --git a/assets/fonts/i2p.woff b/assets/fonts/i2p.woff new file mode 100644 index 0000000..93bbe7e Binary files /dev/null and b/assets/fonts/i2p.woff differ diff --git a/assets/fonts/i2p.woff2 b/assets/fonts/i2p.woff2 new file mode 100644 index 0000000..a9d81b8 Binary files /dev/null and b/assets/fonts/i2p.woff2 differ diff --git a/assets/styles/layout.scss b/assets/styles/layout.scss index ae05220..f47bfce 100644 --- a/assets/styles/layout.scss +++ b/assets/styles/layout.scss @@ -35,7 +35,7 @@ } .sidebar__link__light { - color: $oc-gray-6 !important; + color: $oc-gray-7 !important; &:hover { color: $oc-black !important; diff --git a/colors.md b/colors.md deleted file mode 100644 index feb917a..0000000 --- a/colors.md +++ /dev/null @@ -1,26 +0,0 @@ ---- - layout: colors - title: Colors - permalink: /design/colors - - sidebar: - - colors: Colors - - grid: Grid - - typography: Typography - - assets: Assets - - icons: - - login: oi oi-account-login - - logout: oi oi-account-logout - - redo: oi oi-action-redo - - undo: oi oi-action-undo - - center: oi oi-align-center - - left: oi oi-align-left - - right: oi oi-align-right - - aperture: oi oi-aperture - - bottom: oi oi-arrow-bottom - - circleb: oi oi-arrow-circle-bottom - - circlel: oi oi-arrow-circle-left - - circler: oi oi-arrow-circle-right - - circlet: oi oi-arrow-circle-top ---- diff --git a/design.md b/design.md index d5c9ddb..ae065ce 100644 --- a/design.md +++ b/design.md @@ -7,20 +7,28 @@ - colors: Colors - grid: Grid - typography: Typography + - icons: Icons - assets: Assets - + icons: - - login: oi oi-account-login - - logout: oi oi-account-logout - - redo: oi oi-action-redo - - undo: oi oi-action-undo - - center: oi oi-align-center - - left: oi oi-align-left - - right: oi oi-align-right - - aperture: oi oi-aperture - - bottom: oi oi-arrow-bottom - - circleb: oi oi-arrow-circle-bottom - - circlel: oi oi-arrow-circle-left - - circler: oi oi-arrow-circle-right - - circlet: oi oi-arrow-circle-top + - Help: icon-i2p-help + - Mail: icon-i2p-mail + - Plugin: icon-i2p-plugin + - Router: icon-i2p-router + - Dashboard: icon-i2p-dashboard + - Bandwidth: icon-i2p-bandwidth + - Server: icon-i2p-server + - Paste: icon-i2p-paste + - Bug: icon-i2p-bug + - Docs: icon-i2p-docs + - Address Book: icon-i2p-address + - Wiki: icon-i2p-wiki + - Sync: icon-i2p-sync + - Power: icon-i2p-power + - Directory: icon-i2p-directory + - Fingerprint: icon-i2p-fingerprint + - Alert: icon-i2p-alert + - Valid: icon-i2p-valid + - Fast: icon-i2p-fast + - Anonymous: icon-i2p-anon --- diff --git a/grid.md b/grid.md deleted file mode 100644 index bf4195a..0000000 --- a/grid.md +++ /dev/null @@ -1,26 +0,0 @@ ---- - layout: grid - title: Grid - permalink: /design/grid - - sidebar: - - colors: Colors - - grid: Grid - - typography: Typography - - assets: Assets - - icons: - - login: oi oi-account-login - - logout: oi oi-account-logout - - redo: oi oi-action-redo - - undo: oi oi-action-undo - - center: oi oi-align-center - - left: oi oi-align-left - - right: oi oi-align-right - - aperture: oi oi-aperture - - bottom: oi oi-arrow-bottom - - circleb: oi oi-arrow-circle-bottom - - circlel: oi oi-arrow-circle-left - - circler: oi oi-arrow-circle-right - - circlet: oi oi-arrow-circle-top ---- diff --git a/typography.md b/typography.md deleted file mode 100644 index e8bc517..0000000 --- a/typography.md +++ /dev/null @@ -1,26 +0,0 @@ ---- - layout: typography - title: Typography - permalink: /design/typography - - sidebar: - - colors: Colors - - grid: Grid - - typography: Typography - - assets: Assets - - icons: - - login: oi oi-account-login - - logout: oi oi-account-logout - - redo: oi oi-action-redo - - undo: oi oi-action-undo - - center: oi oi-align-center - - left: oi oi-align-left - - right: oi oi-align-right - - aperture: oi oi-aperture - - bottom: oi oi-arrow-bottom - - circleb: oi oi-arrow-circle-bottom - - circlel: oi oi-arrow-circle-left - - circler: oi oi-arrow-circle-right - - circlet: oi oi-arrow-circle-top ----