Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some changes on UI #4

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Some changes on UI #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1de3df
Improvements on popup UI
ooqiaDev Mar 26, 2015
aa29e25
Added profile color to header background
ooqiaDev Mar 26, 2015
3ec5dea
Test
Mar 26, 2015
7454a3e
Some changes on options UI
guti1690 Mar 27, 2015
5a7b448
Some changes on options UI
guti1690 Mar 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions _locales/es/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,92 +8,92 @@
"message": "Gestor y generador de contraseñas",
"description": ""
},

"default": {
"message": "Predeterminado",
"description": ""
},

"alphanumeric_and_special_chars": {
"message": "Alfanumérica y caracteres especiales",
"description": ""
},

"alphanumeric": {
"message": "Alfanumérica",
"description": ""
},

"numeric": {
"message": "Numérica",
"description": ""
},

"profile": {
"message": "Perfil",
"description": ""
},

"name": {
"message": "Nombre",
"description": ""
},

"private_key": {
"message": "Clave privada",
"description": ""
},

"color": {
"message": "Color",
"description": ""
},

"password_length": {
"message": "Longitud de contraseña",
"description": ""
},

"password_type": {
"message": "Tipo de contraseña",
"description": ""
},

"add_profile": {
"message": "Añadir perfil",
"description": ""
},

"remove_profile": {
"message": "Borrar perfil",
"description": ""
},

"new_profile": {
"message": "Nuevo perfil",
"description": ""
},

"website_tag": {
"message": "Etiqueta del sitio",
"description": ""
},

"options": {
"message": "Opciones",
"description": ""
},

"profile_options": {
"message": "Opciones de perfil",
"description": ""
},

"synchronization_options": {
"message": "Opciones de sincronización",
"description": ""
},

"synchronize": {
"message": "Sincronizar las claves privadas entre las instalaciones de Google Chrome.",
"description": ""
Expand All @@ -103,22 +103,22 @@
"message": "Tus claves privadas serán almacenadas en tu cuenta de Google y sólo podrán ser leídas por ti.",
"description": ""
},

"about": {
"message": "Acerca de Twik",
"description": ""
},

"about_content": {
"message" : "<strong>Twik</strong> es una aplicación que hace más fácil generar contraseñas seguras y diferentes para cada sitio web.<br/><br/><strong>Twik</strong> está basado en el mecanismo de generación de contraseñas de Password Hasher por Steve Cooper y Password Hasher Plus por Eric Woodruff.",
"description": ""
},

"license": {
"message": "Licencia",
"description": ""
},

"acknowledgements": {
"message": "Agradecimientos",
"description" : ""
Expand All @@ -128,12 +128,12 @@
"message": "Traducción al italiano por Claudio Arseni",
"description" : ""
},

"external_code": {
"message": "Código de terceras partes",
"description" : ""
},

"external_code_content": {
"message" : "Este proyecto usa código de terceras partes, licenciadas bajo sus propios términos:",
"description": ""
Expand Down
100 changes: 53 additions & 47 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with Twik. If not, see <http://www.gnu.org/licenses/>.
*
-->
-->

<!DOCTYPE html>
<html>
<!DOCTYPE html>
<html>
<head>
<title i18n="about"></title>
<link rel="stylesheet" type="text/css" href="css/theme.css"/>
Expand All @@ -29,52 +29,58 @@
</head>
<body>
<div id="twik-container">
<header>
<header class="twik-header twik-header-large">
<img src="images/icon-64.png" alt="Twik" width="64px" height="64px"/>
<h1>twik</h1>
<span class="twik-background-title">Twik</span>
<br/>
<span style="color: #fff;">Copyright &copy; 2014 Red Dye No. 2</span>
</header>

Copyright &copy; 2014 Red Dye No. 2
<br/><br/>
<div i18n="about_content"></div>

<h2 i18n="license">License</h2>
Twik is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.<br/><br/>
Twik is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
<br/><br/>

<h2 i18n="acknowledgements"></h2>
<div i18n="acknowledgements_content"></div>
<div class="twik-table">
<div i18n="about_content"></div>

<h2 i18n="external_code"></h2>
<div i18n="external_code_content"></div>
<h2 i18n="license">License</h2>
Twik is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.<br/><br/>
Twik is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
<br/><br/>

<ul>
<li>
<a href="https://addons.mozilla.org/en-US/firefox/addon/password-hasher/" target="_blank">Password Hasher</a> by Steve Cooper. Distributed under MPL 1.1/GPL 2.0/LGPL 2.1 licenses.
</li>
<li>
<a href="http://passwordhasherplus.com" target="_blank">Password Hasher Plus</a> by Eric Woodruff.
Distributed under MPL 1.1/GPL 2.0/LGPL 2.1 licenses.
</li>
<li>
<a href="http://jquery.com/" target="_blank">jQuery</a> by jQuery Foundation.
</li>
<li>
<a href="http://qtip2.com/" target="_blank">qTip 2</a> by Craig Thompson.
</li>
<li>
<a href="https://www.npmjs.org/package/tldjs" target="_blank">TLD</a> by Thomas Parisot. Distributed under the MIT license.
</li>
<li>
<a href="http://pajhome.org.uk/crypt/md5/" target="_blank">SHA1 Javascript Implementation</a> by Paul Johnston. Distributed under the BSD License.
</li>
<li>
<a href="https://code.google.com/p/adblockforchrome/source/browse/trunk/functions.js" target="_blank">Javascript i18n localization script</a> by the AdBlock Team. Distributed under the GNU GPL 3.0 License.
</li>
<h2 i18n="acknowledgements"></h2>
<div i18n="acknowledgements_content"></div>

<h2 i18n="external_code"></h2>
<div i18n="external_code_content"></div>

<ul>
<li>
<a href="https://addons.mozilla.org/en-US/firefox/addon/password-hasher/" target="_blank">Password Hasher</a> by Steve Cooper. Distributed under MPL 1.1/GPL 2.0/LGPL 2.1 licenses.
</li>
<li>
<a href="http://passwordhasherplus.com" target="_blank">Password Hasher Plus</a> by Eric Woodruff.
Distributed under MPL 1.1/GPL 2.0/LGPL 2.1 licenses.
</li>
<li>
<a href="http://jquery.com/" target="_blank">jQuery</a> by jQuery Foundation.
</li>
<li>
<a href="http://qtip2.com/" target="_blank">qTip 2</a> by Craig Thompson.
</li>
<li>
<a href="https://www.npmjs.org/package/tldjs" target="_blank">TLD</a> by Thomas Parisot. Distributed under the MIT license.
</li>
<li>
<a href="http://pajhome.org.uk/crypt/md5/" target="_blank">SHA1 Javascript Implementation</a> by Paul Johnston. Distributed under the BSD License.
</li>
<li>
<a href="https://code.google.com/p/adblockforchrome/source/browse/trunk/functions.js" target="_blank">Javascript i18n localization script</a> by the AdBlock Team. Distributed under the GNU GPL 3.0 License.
</li>
</ul>
</div>
</div>
</body>
</html>
50 changes: 45 additions & 5 deletions css/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
* along with Twik. If not, see <http://www.gnu.org/licenses/>.
*/

body {
margin: 0;
}

#twik-container header, #twik-popup-container header {
display: block;
vertical-align: baseline;
Expand All @@ -29,18 +33,25 @@
vertical-align: middle;
}

#twik-container h1, #twik-container h2, #twik-popup-container h1, #twik-popup-container h2 {
#twik-container h1 {
font-family: 'Roboto Condensed', sans-serif;
font-size: 48px;
color: #303030;
}

#twik-container h2, #twik-popup-container h1, #twik-popup-container h2 {
font-family: 'Roboto Condensed', sans-serif;
font-size: 48px;
color: #303030;
line-height: 1.3;
}

#twik-container h2, #twik-popup-container h2 {
font-size: 24px;
font-size: 30px;
}

#twik-popup-container h2 {
color: #fff;
margin-top: 0;
}

Expand All @@ -53,8 +64,9 @@
font-family: 'Roboto', sans-serif;
font-size: 15px;
width: auto;
padding: 8px;
background-color: #eceff1;
background-color: #fff;
/*padding: 8px;*/
/*background-color: #eceff1;*/
}

#twik-popup-container input, #twik-popup-container select {
Expand Down Expand Up @@ -123,7 +135,31 @@ a {
}

#profile-color-marker {
display: inline;
display: inline-block;
height: 22px;
vertical-align: top;
width: 22px;
}

.twik-header-large {
background-color: #4CAF50;
height: 6em;
}

.twik-background-title {
color: #fff;
display: inline-block;
font-size: 48px;
line-height: 1.3em;
vertical-align: middle;
}

.twik-header {
padding: 8px;
}

.twik-table {
padding: 8px;
}

.twik-table {
Expand All @@ -142,6 +178,10 @@ a {
padding: 7px 10px 5px 0px;
}

.twik-footer {
padding: 8px;
}

.twik-hide-pass-button {
background: url("chrome-extension://__MSG_@@extension_id__/images/ic_action_eye_open.png") transparent;
background-color: transparent !important;
Expand Down
Loading