Browse Source

Merge pull request #2 from Spheerys/master

Small improvement of the body margin on tablet view
master
Mylène Bressan 10 years ago
parent
commit
9db048cc5b
  1. 6
      theme_nin/css/style.css
  2. 17
      theme_nin/sass/_commons.sass
  3. 4
      theme_nin/sass/_responsive.sass
  4. 2
      theme_nin/sass/style.sass

6
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; } 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; } br { display: block; }
img { background: #e2e1de; -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; } 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; } .postboard { margin: 0; padding: 10px; }
.who-to-follow, .toptrends { display: none; } .who-to-follow, .toptrends { display: none; }
.mini-profile .post-area, .mini-profile .post-area-new { 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;}
}

17
theme_nin/sass/_commons.sass

@ -1,6 +1,6 @@
* *
outline: none!important outline: none!important
li li
list-style: none list-style: none
@ -12,10 +12,13 @@ html, body
font: .95em/1.3em $main-font-family font: .95em/1.3em $main-font-family
font-weight: 400 font-weight: 400
body
margin: auto 10px
br br
display: block display: block
img img
background: $main-background-color background: $main-background-color
+border-radius(2px) +border-radius(2px)
@ -26,7 +29,7 @@ a
color: $main-color-color color: $main-color-color
text-decoration: none text-decoration: none
p p
padding: 5px 0 padding: 5px 0
@ -36,13 +39,13 @@ h2, h3
letter-spacing: 0.07em letter-spacing: 0.07em
font-weight: 500 font-weight: 500
line-height: 1.8em line-height: 1.8em
textarea, input[type=text] textarea, input[type=text]
font: .95em/1.3em $main-font-family font: .95em/1.3em $main-font-family
font-weight: 400 font-weight: 400
/* isFollowing */ /* isFollowing */
@ -57,7 +60,7 @@ textarea, input[type=text]
line-height: 10px line-height: 10px
&:hover &:hover
text-decoration: none!important text-decoration: none!important
h3 & h3 &
display: none display: none
/************** BUTTONS ************/ /************** BUTTONS ************/
@ -68,7 +71,7 @@ button, a.button
display: inline-block display: inline-block
line-height: 1em line-height: 1em
font-weight: 500 font-weight: 500
margin: 0 margin: 0
float: none float: none
text-shadow: 2px 2px 0 rgba(black,0) text-shadow: 2px 2px 0 rgba(black,0)
+transition-property(background) +transition-property(background)

4
theme_nin/sass/_responsive.sass

@ -10,7 +10,7 @@
.postboard .postboard
width: 100% width: 100%
.following-list li .following-list li
width: 47% width: 47%
float: left float: left
@ -23,6 +23,8 @@
left: 1% left: 1%
@media (max-width: 600px) @media (max-width: 600px)
body
margin: auto
.dashboard.left, .postboard .dashboard.left, .postboard
position: static position: static
width: 100% width: 100%

2
theme_nin/sass/style.sass

@ -1,7 +1,7 @@
@import _fonts @import _fonts
@import compass/reset @import compass/reset
@import compass @import compass
@import "compass/utilities/" @import compass/utilities
@import _var @import _var
@import _utils @import _utils
@import _menu @import _menu

Loading…
Cancel
Save