Skip to content

Commit

Permalink
Merge pull request #6 from Rabbit-Company/dev
Browse files Browse the repository at this point in the history
Updated to Passky v7.0.0
  • Loading branch information
zigazajc007 authored Jul 12, 2022
2 parents bc82cf9 + 2d18858 commit b5eec7f
Show file tree
Hide file tree
Showing 14 changed files with 474 additions and 233 deletions.
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
root = true

[*]
indent_style = tab
indent_size = 2
charset = utf-8
insert_final_newline = false
trim_trailing_whitespace = true
end_of_line = lf

[*.yml]
indent_style = space
indent_size = 2

[*.md]
trim_trailing_whitespace = false
34 changes: 17 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "passky-website",
"description": "Website for Passky (password manager)",
"version": "6.3.0",
"version": "7.0.0",
"main": "tailwind.config.js",
"scripts": {
"build": "npx tailwindcss -i ./tailwind.css -o ./website/css/tailwind.min.css"
Expand All @@ -17,6 +17,6 @@
},
"homepage": "https://github.com/Rabbit-Company/Passky-Website#readme",
"devDependencies": {
"tailwindcss": "^3.1.4"
"tailwindcss": "^3.1.6"
}
}
2 changes: 1 addition & 1 deletion website/css/tailwind.min.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
! tailwindcss v3.1.4 | MIT License | https://tailwindcss.com
! tailwindcss v3.1.6 | MIT License | https://tailwindcss.com
*/

/*
Expand Down
217 changes: 217 additions & 0 deletions website/css/themes/nord.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
/*
Nord theme
*/

/*
Text colors
*/

.primaryColor{
color: #88c0d0 !important;
}

.secondaryColor{
color: #6B7280 !important;
}

.tertiaryColor{
color: #FFFFFF !important;
}

/*
Background colors
*/

.primaryBackgroundColor{
background-color: #2e3440 !important;
}

.secondaryBackgroundColor{
background-color: #3b4252 !important;
}

.tertiaryBackgroundColor{
background-color: #434c5e !important;
}

.quaternaryBackgroundColor{
background-color: #88c0d0 !important;
}

/*
Button colors
*/

.primaryButton{
background-color: #88c0d0 !important;
color: #FFFFFF !important;
}

.primaryButton:hover{
background-color: #7fbbcc !important;
}

.successButton{
background-color: #a2bd8b !important;
color: #FFFFFF !important;
}

.successButton:hover{
background-color: #97b57d !important;
}

.dangerButton{
background-color: #75647a !important;
color: #FFFFFF !important;
}

.dangerButton:hover{
background-color: #6b5c70 !important;
}

.cancelButton{
background-color: #434c5e !important;
border-color: #3b4252 !important;
color: #FFFFFF !important;
}

.cancelButton:hover{
background-color: #434c5e !important;
}

/*
Elements
*/

input{
background-color: #434c5e !important;
color: #FFFFFF !important;
border-color: #3b4252 !important;
}

textarea{
background-color: #434c5e !important;
color: #FFFFFF !important;
border-color: #3b4252 !important;
}

svg{
stroke: #88c0d0 !important;
}

/*
Main menu
*/

.mainMenuLink{
background-color: #3b4252 !important;
color: #6B7280 !important;
}

.mainMenuLink:hover{
color: #FFFFFF !important;
border-color: #D1D5DB !important;
}

.mainMenuLinkSelected{
color: #FFFFFF !important;
border-color: #88c0d0 !important;
}

.mainMenuMobileLink{
background-color: #3b4252 !important;
color: #FFFFFF !important;
}

.mainMenuMobileLink:hover{
background-color: #434c5e !important;
border-color: #6B7280 !important;
}

.mainMenuMobileLinkSelected{
background-color: #434c5e !important;
border-color: #88c0d0 !important;
color: #88c0d0 !important;
}

#main-menu-toggle-btn{
color: #9CA3AF !important;
}

#main-menu-toggle-btn:hover{
color: #6B7280 !important;
background-color: #434c5e !important;
}

/*
Border colors
*/

.primaryBorderColor{
border-color: #3b4252 !important;
}

/*
Placeholder colors
*/

.primaryBorderColor::placeholder{
color: #6B7280;
opacity: 1;
}

.primaryBorderColor::-ms-input-placeholder { /* Microsoft Edge */
color: #6B7280;
opacity: 1;
}

/*
Stroke colors
*/

.primaryStrokeColor{
stroke: #FFFFFF !important;
}

/*
Passwords
*/

.passwordsBackgroundColor{
background-color: #2e3440 !important;
}

.passwordsBorderColor{
border-color: #111827 !important;
}

/*
Import and Export buttons
*/

.importExportButtons{
color: #b1bfce !important;
border-color: #2e3440 !important;
}

.importExportButtons:hover{
color: #91a6ba !important;
}

/*
Scroll bar
*/

::-webkit-scrollbar-track {
background: #3b4252;
}

::-webkit-scrollbar-thumb {
background: #88c0d0;
}

::-webkit-scrollbar-thumb:hover {
background: #7fbbcc;
}
2 changes: 1 addition & 1 deletion website/js/PasskyAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

static username(username){
if(typeof(username) == 'undefined' || username == null) return false;
return /^[a-z0-9.]{6,30}$/i.test(username);
return /^[a-z0-9._]{6,30}$/i.test(username);
}

static password(password){
Expand Down
2 changes: 1 addition & 1 deletion website/js/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function setTheme(){
if(readData('lang') == null || typeof(readData('lang')) == 'undefined') writeData('lang', 'en');
if(readData('sessionDuration') == null || typeof(readData('sessionDuration')) == 'undefined') writeData('sessionDuration', '20');

if(!(["dark", "tokyoNight", "monokai", "solarizedDark", "light", "blue", "dracula", "gray"].includes(readData('theme')))) writeData('theme', 'dark');
if(!(["dark", "tokyoNight", "monokai", "solarizedDark", "light", "blue", "nord", "dracula", "gray"].includes(readData('theme')))) writeData('theme', 'dark');
document.getElementById("css-theme").href = "css/themes/" + readData('theme') + ".css";
}

Expand Down
Loading

0 comments on commit b5eec7f

Please sign in to comment.