summaryrefslogtreecommitdiffstats
path: root/blog/_assets
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2015-09-13 12:42:03 +0200
committerHarald Eilertsen <haraldei@anduin.net>2015-09-13 12:42:03 +0200
commit1114ff7947d742df516131c8d67609f31d6ee67a (patch)
tree0a42bed7afb3656f1deef29c7faab931f2951ddb /blog/_assets
parent78c50bf4993790a8a19f676f1ffc6099cf16978e (diff)
downloadnorsk-urskog-main-1114ff7947d742df516131c8d67609f31d6ee67a.tar.gz
norsk-urskog-main-1114ff7947d742df516131c8d67609f31d6ee67a.tar.bz2
norsk-urskog-main-1114ff7947d742df516131c8d67609f31d6ee67a.zip
Move news section to side-body.
Diffstat (limited to 'blog/_assets')
-rw-r--r--blog/_assets/stylesheets/_navbar.scss5
-rw-r--r--blog/_assets/stylesheets/main.scss47
2 files changed, 14 insertions, 38 deletions
diff --git a/blog/_assets/stylesheets/_navbar.scss b/blog/_assets/stylesheets/_navbar.scss
index 754169f..5fb3d48 100644
--- a/blog/_assets/stylesheets/_navbar.scss
+++ b/blog/_assets/stylesheets/_navbar.scss
@@ -5,7 +5,10 @@
}
@include round-corners;
width: 100%;
- padding: 1mm;
+ padding: {
+ top: 1mm;
+ bottom: 1mm;
+ }
a {
text-decoration: none;
diff --git a/blog/_assets/stylesheets/main.scss b/blog/_assets/stylesheets/main.scss
index fbf13e5..ca50211 100644
--- a/blog/_assets/stylesheets/main.scss
+++ b/blog/_assets/stylesheets/main.scss
@@ -54,54 +54,27 @@ h1 {
position: relative;
min-height: 700px;
- padding: 1em;
+ padding: 1cm;
+
@include round-corners;
#body {
- padding-right: 20em;
+ float: left;
+ width: 16cm;
}
- #side_body {
- position: absolute;
- width: 244px;
- bottom: 1em;
- right: 1em;
- top: 1em;
- overflow: auto;
- .inner {
- padding: 10px;
- }
+ #side-body {
+ float: right;
+ width: 8cm;
background: {
color: $side-bar-background
}
- @include round-corners;
-
- h1 {
- font: {
- size: 20px;
- weight: bold;
- }
- }
-
- h2 {
- font: {
- size: 16px;
- weight: bold;
- }
- }
-
- h3 {
- font: {
- size: 12px;
- weight: bold;
- }
- }
}
#news, #links {
- width: 8.55cm;
- float: left;
- margin-right: 5mm;
+ //width: 8.55cm;
+ //float: left;
+ //margin-right: 5mm;
&.wide {
width: 100%;