diff --git a/_articles/importing/import-from-1password.md b/_articles/importing/import-from-1password.md index 5a9ac6b1..ed5e90a4 100644 --- a/_articles/importing/import-from-1password.md +++ b/_articles/importing/import-from-1password.md @@ -11,13 +11,16 @@ Importing your data from 1Password into bitwarden is easy. 1Password has two ver 1Password 4 and 1Password 6. Depending on which operating system and version of 1Password and you are using, follow the proper steps below. -**Export Your 1Password 1pif Logins** +## Export Your 1Password 1pif Logins -
-

This set of instructions is only for:

- -

These instructions may vary slightly for macOS users.

-
+{% alert info %} +This set of instructions is only for: + +- 1Password 4 users on macOS and Windows +- 1Password 6 users on macOS + +These instructions may vary slightly for macOS users. +{% endalert %} 1. Open the 1Password desktop application on your computer and enter your 1Password master password to unlock your vault. @@ -29,12 +32,13 @@ follow the proper steps below. 6. Select a folder to save your export file to (recommended to use your desktop folder). Click save to export your .1pif data file. -**Export Your 1Password 6 csv Logins From Windows** +## Export your 1Password 6 csv logins from Windows -
-

This set of instructions is only for:

- -
+{% alert info %} +This set of instructions is only for: + +- 1Password 6 users on Windows +{% endalert %} 1. Open the 1Password 6 desktop application on your computer and enter your 1Password master password to unlock your vault. @@ -46,7 +50,7 @@ follow the proper steps below. 5. Select a folder to save your export file to (recommended to use your desktop folder). Enter a file name and click Save. -**Import Your 1Password Logins Into bitwarden** +## Import your logins into bitwarden 1. Go to the [bitwarden web vault][bitwarden-vault] and log in. 2. Navigate to "Tools" > "Import". diff --git a/_articles/importing/import-from-chrome.md b/_articles/importing/import-from-chrome.md index db6ba485..698900d9 100644 --- a/_articles/importing/import-from-chrome.md +++ b/_articles/importing/import-from-chrome.md @@ -9,26 +9,25 @@ tags: [import, chrome, opera, vivaldi] Importing your data from Google Chrome into bitwarden is easy. -**Export Your Chrome Passwords** +{% alert info %} +The process is exactly the same for Opera and Vivaldi browser users. +{% endalert %} -1. Open Chrome and enter `chrome://flags/#password-import-export` into the address bar and press enter. This will open - the Chrome system flags page. +## Export your Chrome passwords + +1. Open Chrome and enter `chrome://flags/#password-import-export` into the address bar and press enter. This will open the Chrome system flags page. 2. Look for the "Password import and export" option and change the dropdown option to "Enabled". -3. A prompt will pop up from the bottom asking you to "Relaunch Now". Click the button to restart the browser so that the - changes can take effect. -4. After relaunching the browser, enter `chrome://settings/passwords` into the address bar and press enter. This will - open a window with all your saved passwords for Chrome. +3. A prompt will pop up from the bottom asking you to "Relaunch Now". Click the button to restart the browser so that the changes can take effect. +4. After relaunching the browser, enter `chrome://settings/passwords` into the address bar and press enter. This will open a window with all your saved passwords for Chrome. 5. Scroll down through the list and look for the "Export" and "Import" buttons at the end of the list. 6. Click the "Export" button. You'll be prompted to enter your computer's password for authorization. -7. Once your computer's password is entered and validated, you can save your passwords to a [CSV][csv] file on your - computer. Save this file to your desktop as `chromedata.csv`. +7. Once your computer's password is entered and validated, you can save your passwords to a [CSV][csv] file on your computer. Save this file to your desktop as `chromedata.csv`. -**Import Your Chrome Passwords Into bitwarden** +## Import your passwords into bitwarden 1. Go to the [bitwarden web vault][bitwarden-vault] and log in. 2. Navigate to "Tools" > "Import". -3. Select "Chrome (csv)" as the source and select your `chromedata.csv` file from the desktop that you created in step 7 - above. +3. Select "Chrome (csv)" as the source and select your `chromedata.csv` file from the desktop that you created in step 7 above. 4. Click the "Import" button. Congratulations! You have just transferred all of your data from Google Chrome into bitwarden. diff --git a/_articles/importing/import-from-lastpass.md b/_articles/importing/import-from-lastpass.md index 91237909..086c01e4 100644 --- a/_articles/importing/import-from-lastpass.md +++ b/_articles/importing/import-from-lastpass.md @@ -9,36 +9,24 @@ tags: [import, lastpass] Importing your data from LastPass into bitwarden is easy. -**Export Your Passwords From The LastPass.com Web Vault** +{% alert warning %} +It is recommended to export through the LastPass web vault in order to avoid known bugs with the LastPass extension exporter. +{% endalert %} + +## Export your sites from the LastPass.com web vault 1. Log into your LastPass account and navigate to "More Options" > "Advanced" > "Export". -2. This will take you to a page that then asks you to enter your LastPass master password for verification. - Enter your LastPass master password. +2. This will take you to a page that then asks you to enter your LastPass master password for verification. Enter your LastPass master password. 3. Your data will be decrypted and shown on screen in [CSV][csv] format. 4. Highlight all of the data on the page and copy it to your clipboard. 5. Create a new text file on your desktop called "lastpass_export.csv". 6. Edit this file, paste your CSV data that was copied from step 4. Save. -**Export Your Passwords From The LastPass Browser Extension** - -
-

It is recommended to export through the LastPass web vault in order to avoid known bugs with the LastPass extension exporter.

-
- -1. Click the LastPass icon in your browser and navigate to "More Options" > "Advanced" > "Export" > "LastPass CSV File". -2. This will take you to a page that then asks you to enter your LastPass master password for verification. - Enter your LastPass master password. -3. Your data will be decrypted and shown on screen in [CSV][csv] format. -4. Highlight all of the data on the page and copy it to your clipboard. -5. Create a new text file on your desktop called "lastpass_export.csv". -6. Edit this file, paste your CSV data that was copied from step 4. Save. - -**Import Your LastPass Passwords Into bitwarden** +## Import your sites into bitwarden 1. Go to the [bitwarden web vault][bitwarden-vault] and log in. 2. Navigate to "Tools" > "Import". -3. Select "LastPass" as the source and select your "lastpass_export.csv" file from the desktop that you created in step 5 - above. +3. Select "LastPass" as the source and select your "lastpass_export.csv" file from the desktop that you created in step 5 above. 4. Click the "Import" button. Congratulations! You have just transferred all of your data from LastPass into bitwarden. diff --git a/_plugins/alert.rb b/_plugins/alert.rb new file mode 100644 index 00000000..81a26d14 --- /dev/null +++ b/_plugins/alert.rb @@ -0,0 +1,27 @@ +# Source: https://stackoverflow.com/questions/19169849/how-to-get-markdown-processed-content-in-jekyll-tag-plugin + +module Jekyll + module Tags + class AlertTag < Liquid::Block + def initialize(tag_name, type, tokens) + super + type.strip! + if %w(info danger warning).include?(type) + @type = type + else + puts "#{type} alert not supported. Defaulting to info" + @type = "info" + end + end + + def render(context) + site = context.registers[:site] + converter = site.find_converter_instance(::Jekyll::Converters::Markdown) + output = converter.convert(super(context)) + "
#{output}
" + end + end + end +end + +Liquid::Template.register_tag('alert', Jekyll::Tags::AlertTag) \ No newline at end of file diff --git a/_plugins/callout.rb b/_plugins/callout.rb new file mode 100644 index 00000000..8bc311dc --- /dev/null +++ b/_plugins/callout.rb @@ -0,0 +1,27 @@ +# Source: https://stackoverflow.com/questions/19169849/how-to-get-markdown-processed-content-in-jekyll-tag-plugin + +module Jekyll + module Tags + class CalloutTag < Liquid::Block + def initialize(tag_name, type, tokens) + super + type.strip! + if %w(info danger warning).include?(type) + @type = type + else + puts "#{type} callout not supported. Defaulting to info" + @type = "info" + end + end + + def render(context) + site = context.registers[:site] + converter = site.find_converter_instance(::Jekyll::Converters::Markdown) + output = converter.convert(super(context)) + "
#{output}
" + end + end + end +end + +Liquid::Template.register_tag('callout', Jekyll::Tags::CalloutTag) \ No newline at end of file diff --git a/_plugins/liquid_pluralize.rb b/_plugins/pluralize.rb similarity index 100% rename from _plugins/liquid_pluralize.rb rename to _plugins/pluralize.rb diff --git a/_sass/_help.scss b/_sass/_help.scss index 7917063f..81244da1 100644 --- a/_sass/_help.scss +++ b/_sass/_help.scss @@ -250,4 +250,31 @@ footer { } } } + + h2, h3 { + text-transform: uppercase; + font-weight: bold; + } + + h2 { + font-size: $font-size-h2 * .6; + } + + h3 { + font-size: $font-size-base; + } + + h4 { + font-size: $font-size-base; + } +} + +.alert { + p, ul, ol { + margin-bottom: 12.5px; + } + + p:last-child, ul:last-child, ol:last-child { + margin-bottom: 0; + } }