Skip to content

Commit 96e2a5b

Browse files
committed
Merge branch 'master' of git://github.com/swanson/stringer
2 parents d503e84 + 1b60c71 commit 96e2a5b

3 files changed

Lines changed: 94 additions & 3 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ foreman start
8787

8888
The application will be running on port `5000`
8989

90+
You can launch an interactive console (ala `rails c`) using `racksh`
91+
9092
# Acknowledgements
9193
Most of the heavy-lifting is done by [`feedzirra`](https://github.com/pauldix/feedzirra) and [`feedbag`](https://github.com/dwillis/feedbag).
9294

‎app/public/css/styles.css‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,31 @@ hr {
5353
}
5454

5555
.btn {
56+
position: relative;
57+
top: 0px;
5658
background-color: #484948;
5759
box-shadow: inset 0 -3px 0 rgba(0, 0, 0, 0.12);
5860
}
5961

62+
.btn:active {
63+
top: 1px;
64+
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.12);
65+
}
66+
6067
.btn.btn-primary {
6168
background-color: #F67100;
6269
}
6370

64-
.btn.btn-primary:hover, .btn.btn-primary:focus {
71+
.btn.btn-primary:hover, .btn.btn-primary:focus, .btn.btn-primary:active {
6572
background-color: #F59745;
6673
}
6774

68-
.btn:hover, .btn:focus {
75+
.btn:hover, .btn:focus, .btn:active {
6976
background-color: #7F8281;
7077
}
7178

7279
.btn:focus {
73-
outline:0px !important;
80+
outline: 0px !important;
7481
-webkit-appearance:none;
7582
}
7683

‎config/locales/es.yml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
es:
2+
feeds:
3+
add:
4+
title: "¿Necesitas nuevas historias?"
5+
description: "Pega en la URL del blog lo que quieras leer"
6+
fields:
7+
feed_url: "Feed URL"
8+
submit: "Añadir"
9+
index:
10+
add_some_feeds: "Hey, deberias %{add} algunos feeds."
11+
add: "añadir"
12+
first_run:
13+
password:
14+
title: 'Stringer es'
15+
anti_social: 'anti-social'
16+
subtitle: "Hay solo un usuario: tu."
17+
description: "Incorporemos una contraseña para que solo tu puedas leer tus historias"
18+
fields:
19+
password: "Contraseña"
20+
password_confirmation: "Confirmar"
21+
next: "Siguiente"
22+
partials:
23+
action_bar:
24+
mark_all: "Marcar todas como leidas"
25+
refresh: "Refrescar"
26+
view_feeds: "Ver feeds"
27+
add_feed: "Añadir feed"
28+
feed:
29+
last_updated: "Última actualización"
30+
feed_action_bar:
31+
home: "Volver a historias"
32+
feeds: "Ver feeds"
33+
add_feed: "Añadir a feed"
34+
shortcuts:
35+
title: "Atajos de teclado"
36+
keys:
37+
jk: "Siguiente/Anterior historia"
38+
oenter: "Arrastrar historia abierta/cerrada"
39+
v: "Ir a URL de la historia"
40+
shifta: "Marcar todas como leidas"
41+
r: "Refrescar"
42+
zen:
43+
zero: "You’ve reached RSS Zero™"
44+
gtfo: 'Ahora deja de leer blogs y'
45+
go_make: 've a hacer algo'
46+
sessions:
47+
new:
48+
title: 'Stringer que habla'
49+
rss: 'RSS'
50+
subtitle: "Bienvenido de nuevo, amigo."
51+
fields:
52+
password: "Contraseña"
53+
submit: "Acceder"
54+
import:
55+
title: "Bienvenido a bordo."
56+
subtitle: "Vamos a configurar tus feeds"
57+
description: "%{link} tus feeds de google reader e importarlos"
58+
export: "Exportar"
59+
fields:
60+
import: "Importar"
61+
not_now: "No ahora"
62+
layout:
63+
title: "stringer | Tu Amigo RSS"
64+
logout: "Salir"
65+
export: "Exportar"
66+
support: "Suporte"
67+
hey: "Hey!"
68+
back_to_work: "¡Vuelve al trabajo, holgazán!"
69+
tutorial:
70+
mark_all: "marcar todos"
71+
as_read: "como leidos"
72+
refresh: "refrescar"
73+
your_feeds: "tus feeds"
74+
add_feed: "añadir feed"
75+
your_stories: "tus historias"
76+
click_to_read: "(click para leer)"
77+
title: 'Stringer es '
78+
simple: "simple"
79+
subtitle: "Acá está el manual de instrucciones."
80+
description: "Estamos recibiendo algunas historias para leer, darnos un segundo."
81+
start: "Comenzar a leer"
82+
ready: "Okay, ¡esta listo!"

0 commit comments

Comments
 (0)