From 41804dfe31eb888c700b6bcbf29c997973dcd294 Mon Sep 17 00:00:00 2001 From: Hedy Date: Thu, 28 Aug 2014 22:51:53 +0200 Subject: [PATCH 1/2] =?UTF-8?q?am=C3=A9lioration=20du=20margin=20en=20vue?= =?UTF-8?q?=20tablette?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- theme_nin/css/style.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/theme_nin/css/style.css b/theme_nin/css/style.css index bdb84ae..af9b525 100755 --- a/theme_nin/css/style.css +++ b/theme_nin/css/style.css @@ -388,6 +388,8 @@ li { list-style: none; } html, body { height: 100%; min-height: 100%; background: #e2e1de; color: #66686b; font: 0.95em/1.3em "Roboto", sans-serif; font-weight: 400; } +body { margin: auto 10px;} + br { display: block; } img { background: #e2e1de; -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; } @@ -706,4 +708,6 @@ ul.dropdown-menu > li > a { display: block; padding: 3px 20px; clear: both; whit .postboard { margin: 0; padding: 10px; } .who-to-follow, .toptrends { display: none; } .mini-profile .post-area, .mini-profile .post-area-new { display: none; } - .following-list li { width: 98%; float: none; margin: 2% 1%; } } + .following-list li { width: 98%; float: none; margin: 2% 1%; } + body { margin: auto;} +} From 328ec1ad047b36647fb38c38bbfe90bc4cf73d2b Mon Sep 17 00:00:00 2001 From: Hedy Date: Thu, 28 Aug 2014 22:59:22 +0200 Subject: [PATCH 2/2] Small improvement of the body margin on tablet view --- theme_nin/sass/_commons.sass | 17 ++++++++++------- theme_nin/sass/_responsive.sass | 4 +++- theme_nin/sass/style.sass | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/theme_nin/sass/_commons.sass b/theme_nin/sass/_commons.sass index dd4aa02..0e9d935 100644 --- a/theme_nin/sass/_commons.sass +++ b/theme_nin/sass/_commons.sass @@ -1,6 +1,6 @@ * outline: none!important - + li list-style: none @@ -12,10 +12,13 @@ html, body font: .95em/1.3em $main-font-family font-weight: 400 +body + margin: auto 10px + br display: block -img +img background: $main-background-color +border-radius(2px) @@ -26,7 +29,7 @@ a color: $main-color-color text-decoration: none -p +p padding: 5px 0 @@ -36,13 +39,13 @@ h2, h3 letter-spacing: 0.07em font-weight: 500 line-height: 1.8em - + textarea, input[type=text] font: .95em/1.3em $main-font-family font-weight: 400 - + /* isFollowing */ @@ -57,7 +60,7 @@ textarea, input[type=text] line-height: 10px &:hover text-decoration: none!important - h3 & + h3 & display: none /************** BUTTONS ************/ @@ -68,7 +71,7 @@ button, a.button display: inline-block line-height: 1em font-weight: 500 - margin: 0 + margin: 0 float: none text-shadow: 2px 2px 0 rgba(black,0) +transition-property(background) diff --git a/theme_nin/sass/_responsive.sass b/theme_nin/sass/_responsive.sass index 589800f..94e21bc 100644 --- a/theme_nin/sass/_responsive.sass +++ b/theme_nin/sass/_responsive.sass @@ -10,7 +10,7 @@ .postboard width: 100% - + .following-list li width: 47% float: left @@ -23,6 +23,8 @@ left: 1% @media (max-width: 600px) + body + margin: auto .dashboard.left, .postboard position: static width: 100% diff --git a/theme_nin/sass/style.sass b/theme_nin/sass/style.sass index d0565d9..47fcdd9 100755 --- a/theme_nin/sass/style.sass +++ b/theme_nin/sass/style.sass @@ -1,7 +1,7 @@ @import _fonts @import compass/reset @import compass -@import "compass/utilities/" +@import compass/utilities @import _var @import _utils @import _menu