Compare commits

..

No commits in common. "852dc7400105680f5b311ab236b5657edc453aff" and "0f7b01bec326f4b623e97ff11f751ae89bdbce0d" have entirely different histories.

12 changed files with 11 additions and 20 deletions

View file

@ -2,6 +2,9 @@
@import "partials/clean/constants" @import "partials/clean/constants"
@import "partials/clean/mixins" @import "partials/clean/mixins"
@import fonts @import fonts
@import url("https://fonts.googleapis.com/css?family=Droid+Sans:400,700")
@import url("https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic")
@import url("https://fonts.googleapis.com/css?family=Calligraffitti")
/* Reset /* Reset

View file

@ -12,21 +12,3 @@
font-family: Delicious font-family: Delicious
font-style: italic font-style: italic
src: local("Delicious"), font-url("Delicious-Italic.otf") src: local("Delicious"), font-url("Delicious-Italic.otf")
@font-face
font-family: "Noto Sans"
src: local("Noto Sans"), font-url("NotoSans-Variable.ttf")
@font-face
font-family: "Noto Sans"
font-style: italic
src: local("Noto Sans"), font-url("NotoSans-Italic-Variable.ttf")
@font-face
font-family: "Noto Serif"
src: local("Noto Serif"), font-url("NotoSerif-Variable.ttf")
@font-face
font-family: "Noto Serif"
font-style: italic
src: local("Noto Serif"), font-url("NotoSerif-Italic-Variable.ttf")

View file

@ -19,8 +19,8 @@ $error-bg-color: #fbe3e4
$error-border-color: #fbc2c4 $error-border-color: #fbc2c4
$header-font: Delicious, Helvetica, Arial, Verdana, sans-serif $header-font: Delicious, Helvetica, Arial, Verdana, sans-serif
$main-font: "Noto Sans", Helvetica, Arial, Verdana, sans-serif $main-font: "Droid Sans", Helvetica, Arial, Verdana, sans-serif
$text-font: "Noto Serif", Georgia, "Times New Roman", Times, serif $text-font: "Droid Serif", Georgia, "Times New Roman", Times, serif
$object-img-size: 80px $object-img-size: 80px
$object-width: 100px $object-width: 100px

View file

@ -2,6 +2,8 @@
= form_tag load_pet_path, :id => 'bulk-pets-form' do = form_tag load_pet_path, :id => 'bulk-pets-form' do
- localized_cache :action_suffix => 'bulk_pets_content' do - localized_cache :action_suffix => 'bulk_pets_content' do
%h3= t '.header'
%p= t '.explanation' %p= t '.explanation'
= origin_tag bulk_pets_path = origin_tag bulk_pets_path

View file

@ -630,6 +630,7 @@ en-MEEP:
pets: pets:
bulk: bulk:
header: Meep pets in bulk
explanation: explanation:
Got a lot of pets to meep? Just keep meeping them into the box below, Got a lot of pets to meep? Just keep meeping them into the box below,
or even meep in a whole list of names, one name per line. Thanks for or even meep in a whole list of names, one name per line. Thanks for

View file

@ -751,6 +751,7 @@ en:
pets: pets:
bulk: bulk:
header: Model pets in bulk
explanation: explanation:
Got a lot of pets to model? Just keep typing them into the box below, Got a lot of pets to model? Just keep typing them into the box below,
or even paste in a whole list of names, one name per line. We'll or even paste in a whole list of names, one name per line. We'll

View file

@ -498,6 +498,7 @@ es:
default_human_name: (una especie nueva) default_human_name: (una especie nueva)
pets: pets:
bulk: bulk:
header: Hacer que desfilen varios pets a la vez
explanation: "¿Tienes muchos pets para que desfilen? explanation: "¿Tienes muchos pets para que desfilen?
Escribe o pega una lista de pets, recuerda añadir un nombre por línea :P ¡Muchas gracias por tu ayuda!" Escribe o pega una lista de pets, recuerda añadir un nombre por línea :P ¡Muchas gracias por tu ayuda!"

View file

@ -494,6 +494,7 @@ pt:
default_human_name: (uma nova espécie) default_human_name: (uma nova espécie)
pets: pets:
bulk: bulk:
header: Modele pets em massa
explanation: Tem um monte de pets para modelar? Basta digitar seus nomes na caixa abaixo, ou até mesmo colar toda uma lista de nomes, um nome por linha. Obrigado por sua ajuda! explanation: Tem um monte de pets para modelar? Basta digitar seus nomes na caixa abaixo, ou até mesmo colar toda uma lista de nomes, um nome por linha. Obrigado por sua ajuda!
submit: Carregar pet submit: Carregar pet
add: Adicionar add: Adicionar