From da5be9170cd62b928605a80935e7256480964919 Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 21 Dec 2014 00:14:46 +0100 Subject: [PATCH] Nice looking serif fonts: palatino or URW Palladio L --- app/assets/stylesheets/all.css.sass | 12 ++++++------ app/assets/stylesheets/events.css.sass | 2 -- app/assets/stylesheets/lugs.css.sass | 1 + app/assets/stylesheets/mobile.css.sass | 2 +- app/views/lugs/_search.html.haml | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass index 67d1a1e0..130ec0db 100644 --- a/app/assets/stylesheets/all.css.sass +++ b/app/assets/stylesheets/all.css.sass @@ -13,7 +13,7 @@ html color: black height: 100% text-align: center - font-family: georgia, serif + font-family: Palatino, 'URW Palladio L', 'dejavu serif', georgia, serif background-color: #9CC5EE // Integrating adl in another website &.iframe @@ -77,7 +77,7 @@ header.top ul.countries float: right - font-size: 0.7em + font-size: smaller line-height: 1em margin-left: 29px margin-right: 11px @@ -97,14 +97,14 @@ header.top content: image-url('suisse.png') h1 + margin: 0.5em 0 font-size: 2.1em - letter-spacing: 2px h2 font: size: 1.2em style: italic weight: normal - margin-top: -0.5em + margin-top: -0.8em main, body.mce-content-body position: relative @@ -137,7 +137,7 @@ main, body.mce-content-body border: solid thin transparent font-size: initial min-height: 100% - font-family: georgia, serif + font-family: Palatino, 'URW Palladio L', 'dejavu serif', georgia, serif iframe border: none @@ -215,7 +215,7 @@ button.ws-popover-opener margin: 3px 0 border: 1px solid #868686 padding: 0.2em 0.8em - font-family: georgia, serif + font-family: Palatino, 'URW Palladio L', 'dejavu serif', georgia, serif background-color: white +border-radius(0.7em) &:focus diff --git a/app/assets/stylesheets/events.css.sass b/app/assets/stylesheets/events.css.sass index 94841dff..aa23b8bf 100644 --- a/app/assets/stylesheets/events.css.sass +++ b/app/assets/stylesheets/events.css.sass @@ -103,8 +103,6 @@ body.events.index table margin-right: -1em .event - font-size: smaller - line-height: 1.1em a:link, a:visited color: #111 font-weight: normal diff --git a/app/assets/stylesheets/lugs.css.sass b/app/assets/stylesheets/lugs.css.sass index d7342896..3bf34cbb 100644 --- a/app/assets/stylesheets/lugs.css.sass +++ b/app/assets/stylesheets/lugs.css.sass @@ -7,6 +7,7 @@ img.favicon form#lug_search right: 5% + width: 12em position: absolute font-size: larger text-align: right diff --git a/app/assets/stylesheets/mobile.css.sass b/app/assets/stylesheets/mobile.css.sass index 717489e2..52f0462c 100644 --- a/app/assets/stylesheets/mobile.css.sass +++ b/app/assets/stylesheets/mobile.css.sass @@ -20,7 +20,7 @@ margin: 0.6em auto table, table.list, table.dates, table.list.dates - border-spacing: 0 + border-spacing: 1px tbody th overflow: hidden max-width: 3em diff --git a/app/views/lugs/_search.html.haml b/app/views/lugs/_search.html.haml index 4a46f125..e1f1b237 100644 --- a/app/views/lugs/_search.html.haml +++ b/app/views/lugs/_search.html.haml @@ -2,7 +2,7 @@ = f.label :search, t('.label') %em.fa.fa-users = f.search_field :name_or_city_or_department_or_related_region_name_or_url_cont, - id: :q_search, size: 13, + id: :q_search, size: 16, placeholder: t('.title', entity: Lug.model_name.human) = f.button class: :search do %em.fa.fa-search