summaryrefslogtreecommitdiffstats
path: root/blog
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2017-03-10 19:28:51 +0100
committerHarald Eilertsen <haraldei@anduin.net>2017-03-10 19:28:51 +0100
commit7603cecd364eb04fe6eac75971107796171287ef (patch)
tree365ca4077c408c45da535cacd98eeefb8464cc58 /blog
parent87cd103c98265adc2a0cb256b14cd7b1d2d8e543 (diff)
parent0cb9284d51b16d192f42e2d2a4c12a2911668b2e (diff)
downloadnorsk-urskog-main-7603cecd364eb04fe6eac75971107796171287ef.tar.gz
norsk-urskog-main-7603cecd364eb04fe6eac75971107796171287ef.tar.bz2
norsk-urskog-main-7603cecd364eb04fe6eac75971107796171287ef.zip
Merge branch 'responsive-design'
Diffstat (limited to 'blog')
-rw-r--r--blog/_assets/images/logos/norsk-urskog-web.svg57
-rw-r--r--blog/_assets/stylesheets/_config.scss9
-rw-r--r--blog/_assets/stylesheets/_header.scss27
-rw-r--r--blog/_assets/stylesheets/_post.scss23
-rw-r--r--blog/_assets/stylesheets/main.scss25
-rw-r--r--blog/_includes/head.html2
-rw-r--r--blog/_includes/header.html2
-rw-r--r--blog/_includes/menubar.html22
-rw-r--r--blog/_includes/post-excerpt.html8
-rw-r--r--blog/_layouts/default.html9
-rw-r--r--blog/_layouts/post.html8
11 files changed, 136 insertions, 56 deletions
diff --git a/blog/_assets/images/logos/norsk-urskog-web.svg b/blog/_assets/images/logos/norsk-urskog-web.svg
new file mode 100644
index 0000000..ea54bc5
--- /dev/null
+++ b/blog/_assets/images/logos/norsk-urskog-web.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="6.07333in"
+ height="1.26667in"
+ viewBox="0 0 1822 380"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="Norsk Urskog Logo.svg">
+ <metadata
+ id="metadata9">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs7" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1200"
+ inkscape:window-height="961"
+ id="namedview5"
+ showgrid="false"
+ inkscape:zoom="2.0052401"
+ inkscape:cx="275.1072"
+ inkscape:cy="56.540431"
+ inkscape:window-x="0"
+ inkscape:window-y="18"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg2" />
+ <path
+ id="Norsk Urskog Logo"
+ fill="none"
+ stroke="black"
+ stroke-width="1"
+ d="M 23.14,78.00 C 36.97,53.21 48.19,41.81 68.00,22.00 68.00,22.00 84.00,6.97 84.00,6.97 85.61,5.62 88.31,3.00 90.64,4.17 92.62,5.16 92.04,7.46 91.21,9.00 91.21,9.00 83.00,19.00 83.00,19.00 83.00,19.00 100.00,33.00 100.00,33.00 100.00,33.00 115.83,49.00 115.83,49.00 115.83,49.00 129.00,64.00 129.00,64.00 132.22,57.96 138.43,51.39 142.92,46.00 142.92,46.00 166.25,18.00 166.25,18.00 168.82,14.91 176.38,4.46 180.01,4.01 182.91,3.66 187.51,7.54 190.00,9.09 197.31,13.62 204.86,17.13 213.00,19.92 225.45,24.19 238.97,25.14 252.00,23.83 252.00,23.83 264.00,22.00 264.00,22.00 259.14,33.46 255.77,39.30 253.46,52.00 250.12,70.41 251.00,105.15 251.00,125.00 251.00,125.00 251.00,246.00 251.00,246.00 251.01,254.46 251.60,260.97 256.76,268.00 259.33,271.49 267.41,278.16 266.95,282.00 266.60,284.89 257.89,295.10 255.65,298.00 247.60,308.45 237.80,322.70 231.00,334.00 217.84,329.34 234.89,324.83 227.50,315.00 227.50,315.00 208.00,295.00 208.00,295.00 206.02,293.01 201.05,288.42 200.15,286.00 198.81,282.39 202.73,278.17 204.37,275.00 207.51,268.94 207.99,263.67 208.00,257.00 208.00,257.00 208.00,171.00 208.00,171.00 168.25,184.25 136.29,209.71 107.00,239.00 127.62,250.04 148.88,267.18 167.00,282.00 169.64,278.20 176.36,269.81 180.00,267.37 184.16,264.58 186.93,267.49 185.26,271.00 184.05,273.55 174.61,283.30 172.17,286.00 172.17,286.00 141.28,320.00 141.28,320.00 138.77,322.85 130.08,334.55 126.15,332.83 120.12,330.20 128.24,323.27 129.09,321.01 130.32,317.76 127.10,315.76 124.99,313.84 124.99,313.84 110.00,301.21 110.00,301.21 96.09,290.26 80.89,280.58 64.00,275.00 58.56,273.20 49.67,270.84 44.00,271.10 38.05,271.37 33.40,273.15 28.00,275.32 25.04,276.51 20.51,276.58 22.17,271.98 23.02,269.61 28.05,264.95 30.00,263.00 30.00,263.00 48.00,245.00 48.00,245.00 50.27,242.73 53.96,238.60 57.00,237.70 57.00,237.70 72.00,237.70 72.00,237.70 83.97,236.15 100.22,229.18 108.99,220.91 126.37,204.50 121.52,185.61 111.30,167.00 98.46,143.61 78.33,123.92 59.00,105.91 49.54,97.10 40.34,87.82 30.00,80.00 30.00,80.00 21.00,98.00 21.00,98.00 21.00,98.00 15.00,96.00 15.00,96.00 16.81,89.60 19.91,83.78 23.14,78.00 Z M 704.01,55.18 C 706.78,55.74 709.89,53.37 712.00,51.84 717.06,48.18 724.52,41.45 729.00,37.00 729.00,37.00 746.00,20.91 746.00,20.91 759.45,8.44 772.06,-3.59 791.00,6.80 794.28,8.60 796.33,10.30 798.91,13.02 802.45,16.75 805.65,21.43 808.00,26.00 808.00,26.00 801.00,28.00 801.00,28.00 798.83,24.29 797.34,22.25 793.99,19.47 777.19,5.54 757.65,14.88 747.88,32.00 740.17,45.51 740.00,60.98 740.00,76.00 740.00,76.00 740.00,117.00 740.00,117.00 740.00,117.00 755.00,105.54 755.00,105.54 763.83,98.34 772.09,90.23 779.96,82.00 782.52,79.33 788.94,69.43 792.85,71.17 795.62,72.40 794.96,74.98 793.63,77.00 791.47,80.30 786.21,83.42 787.70,88.00 788.34,89.95 794.00,96.85 795.63,99.00 802.41,108.01 816.82,127.36 815.66,139.00 814.64,149.27 807.08,157.18 800.00,163.96 796.84,166.98 789.98,171.40 790.10,176.00 790.14,177.63 792.70,184.08 793.42,186.00 793.42,186.00 801.80,207.00 801.80,207.00 801.80,207.00 826.05,269.00 826.05,269.00 826.05,269.00 836.00,295.00 836.00,295.00 821.18,303.32 807.08,316.14 795.00,328.00 793.52,329.44 790.94,332.14 789.02,332.83 786.18,333.86 784.15,331.82 785.17,328.98 786.45,325.41 794.61,319.64 795.28,314.00 795.60,311.23 793.58,305.76 792.67,303.00 792.67,303.00 785.05,281.00 785.05,281.00 785.05,281.00 765.19,228.00 765.19,228.00 765.19,228.00 754.00,199.00 754.00,199.00 746.80,202.10 740.17,203.30 740.00,212.00 740.00,212.00 740.00,265.00 740.00,265.00 740.03,279.69 748.15,276.85 759.00,292.00 759.00,292.00 727.72,324.00 727.72,324.00 725.70,326.32 719.79,334.55 716.33,332.83 711.22,330.30 721.13,320.96 723.00,319.00 723.00,319.00 688.00,294.00 688.00,294.00 689.76,288.47 692.54,288.13 695.47,283.00 698.55,277.60 698.99,272.04 699.00,266.00 699.00,266.00 699.00,173.00 699.00,173.00 699.00,173.00 699.00,86.00 699.00,86.00 698.78,67.31 689.72,51.80 683.00,35.00 683.00,35.00 689.00,33.00 689.00,33.00 691.93,38.15 698.42,54.04 704.01,55.18 Z M 1102.60,52.00 C 1101.26,56.08 1100.02,71.34 1100.00,76.00 1100.00,76.00 1100.00,255.00 1100.00,255.00 1100.04,262.31 1100.67,267.72 1104.70,274.00 1106.79,277.27 1111.93,282.12 1110.18,286.00 1109.10,288.39 1098.56,298.44 1096.00,301.00 1096.00,301.00 1075.01,323.00 1075.01,323.00 1075.01,323.00 1066.91,331.64 1066.91,331.64 1063.06,334.51 1060.01,332.28 1061.15,328.96 1062.11,326.16 1066.98,322.12 1067.51,319.00 1068.02,316.00 1064.30,311.45 1062.67,309.00 1062.67,309.00 1050.58,292.00 1050.58,292.00 1049.34,290.42 1046.63,286.74 1044.83,286.03 1041.18,284.57 1031.97,294.43 1029.00,297.00 1029.00,297.00 996.00,324.42 996.00,324.42 992.98,327.02 987.02,333.39 983.00,333.21 980.99,333.12 976.94,330.74 975.00,329.76 975.00,329.76 958.00,321.42 958.00,321.42 940.21,313.69 917.82,305.35 899.00,300.88 899.00,300.88 884.00,298.27 884.00,298.27 884.00,298.27 876.06,299.48 876.06,299.48 873.57,299.17 872.30,297.41 873.17,294.98 873.80,293.20 878.76,287.73 880.28,286.00 883.08,282.82 898.95,265.25 901.17,264.02 905.65,261.55 911.34,264.90 915.37,260.69 918.30,257.61 921.29,249.22 922.37,245.00 924.92,235.10 926.88,220.20 927.00,210.00 927.00,210.00 927.00,200.00 927.00,200.00 927.00,200.00 926.04,189.00 926.04,189.00 924.80,160.56 920.56,132.69 910.19,106.00 907.31,98.59 904.24,92.70 899.95,86.00 898.74,84.12 896.44,80.05 893.91,80.04 890.06,80.04 887.15,87.77 883.32,85.83 881.79,85.06 881.66,83.44 882.15,81.98 883.13,79.08 897.05,63.99 900.00,61.00 915.14,45.68 930.76,31.33 948.00,18.37 948.00,18.37 965.00,6.04 965.00,6.04 966.69,4.95 969.48,3.03 971.55,4.15 975.01,6.02 971.70,9.78 969.94,11.33 965.99,14.83 954.65,23.02 950.00,25.00 950.00,25.00 969.00,44.00 969.00,44.00 972.16,47.16 977.62,52.15 979.55,56.00 981.46,59.82 982.94,78.07 983.00,83.00 983.00,83.00 984.04,102.00 984.04,102.00 984.04,102.00 984.04,113.00 984.04,113.00 984.04,113.00 985.00,123.00 985.00,123.00 985.00,123.00 985.00,138.00 985.00,138.00 985.00,138.00 986.00,158.00 986.00,158.00 986.00,158.00 1005.00,146.60 1005.00,146.60 1005.00,146.60 1039.00,127.75 1039.00,127.75 1043.15,125.67 1054.66,120.84 1056.40,116.79 1057.12,115.11 1057.00,111.88 1057.00,110.00 1057.00,110.00 1057.00,74.00 1057.00,74.00 1056.98,71.85 1057.13,69.22 1055.98,67.33 1054.41,64.74 1049.70,62.60 1047.00,61.25 1040.40,57.95 1031.97,54.42 1025.00,52.00 1025.00,52.00 1025.00,50.00 1025.00,50.00 1034.29,43.55 1049.30,29.60 1056.56,21.00 1056.56,21.00 1066.20,9.00 1066.20,9.00 1067.34,7.61 1069.39,4.85 1071.15,4.34 1073.50,3.64 1075.18,5.67 1074.76,8.02 1074.30,10.59 1069.76,15.91 1068.00,18.00 1068.00,18.00 1085.00,26.14 1085.00,26.14 1085.00,26.14 1110.00,36.00 1110.00,36.00 1110.00,36.00 1102.60,52.00 1102.60,52.00 Z M 1395.47,50.00 C 1396.74,52.01 1398.54,54.66 1401.04,55.18 1403.77,55.75 1406.92,53.35 1409.00,51.84 1414.55,47.83 1420.15,42.82 1425.00,38.00 1425.00,38.00 1439.00,24.83 1439.00,24.83 1450.35,14.56 1459.38,2.61 1476.00,3.01 1480.62,3.13 1483.97,4.03 1488.00,6.36 1491.07,8.14 1494.21,11.02 1496.68,13.58 1500.08,17.10 1503.09,21.50 1505.00,26.00 1496.38,29.29 1497.48,23.72 1489.00,17.63 1482.30,12.83 1475.98,11.73 1468.00,13.31 1454.46,15.99 1445.37,28.58 1441.34,41.00 1435.03,60.49 1437.00,95.50 1437.00,117.00 1437.00,117.00 1452.00,105.68 1452.00,105.68 1460.85,98.38 1468.98,90.20 1476.99,82.00 1486.44,72.31 1485.30,68.99 1493.00,72.00 1490.79,79.55 1484.20,82.27 1484.88,87.00 1485.27,89.69 1491.89,97.34 1493.85,100.00 1500.16,108.57 1511.66,124.43 1512.81,135.00 1514.17,147.38 1505.01,156.08 1497.00,164.00 1493.95,167.01 1487.17,171.62 1487.36,176.00 1487.36,176.00 1497.95,204.00 1497.95,204.00 1497.95,204.00 1521.81,265.00 1521.81,265.00 1524.71,272.50 1531.75,288.09 1533.00,295.00 1519.96,302.32 1507.91,312.93 1497.00,323.09 1494.53,325.39 1487.64,333.75 1484.16,332.66 1481.30,331.77 1482.15,328.83 1483.37,327.00 1485.05,324.47 1490.95,319.75 1492.21,315.00 1493.17,311.40 1490.84,305.52 1489.67,302.00 1489.67,302.00 1466.80,239.00 1466.80,239.00 1466.80,239.00 1451.00,199.00 1451.00,199.00 1443.39,202.28 1437.18,203.67 1437.00,213.00 1437.00,213.00 1437.00,264.00 1437.00,264.00 1437.02,274.38 1440.61,275.88 1448.00,282.96 1450.21,285.08 1455.54,288.61 1454.66,292.01 1454.03,294.47 1448.01,299.99 1446.00,302.00 1446.00,302.00 1425.85,323.00 1425.85,323.00 1423.90,325.21 1418.51,331.99 1416.01,332.66 1413.56,333.33 1411.75,331.40 1412.32,328.98 1412.88,326.63 1418.20,320.95 1420.00,319.00 1413.40,315.20 1402.24,306.68 1396.00,301.79 1391.58,298.32 1387.54,296.12 1385.00,291.00 1396.91,282.39 1395.23,275.59 1396.09,263.00 1396.09,263.00 1397.00,252.00 1397.00,252.00 1397.00,252.00 1397.00,222.00 1397.00,222.00 1397.00,222.00 1397.00,134.00 1397.00,134.00 1397.00,134.00 1397.00,100.00 1397.00,100.00 1397.00,100.00 1395.90,88.00 1395.90,88.00 1395.90,88.00 1395.90,79.00 1395.90,79.00 1394.50,69.13 1391.62,61.07 1387.72,52.00 1385.27,46.30 1381.64,40.04 1381.00,34.00 1381.00,34.00 1387.00,33.00 1387.00,33.00 1387.00,33.00 1395.47,50.00 1395.47,50.00 Z M 169.00,160.00 C 176.31,152.69 184.39,146.23 193.00,140.52 206.27,131.71 207.98,135.24 208.00,124.00 208.00,124.00 209.42,97.00 209.42,97.00 209.42,97.00 212.37,77.00 212.37,77.00 212.90,74.82 214.34,70.56 212.94,68.60 211.82,67.03 208.77,66.85 207.00,66.58 207.00,66.58 191.00,64.20 191.00,64.20 191.00,64.20 162.00,57.85 162.00,57.85 158.68,56.94 150.97,53.89 148.04,54.41 144.22,55.08 136.69,65.33 135.85,69.00 135.01,72.71 138.70,76.93 140.55,80.00 145.34,87.95 149.83,96.34 153.19,105.00 157.80,116.90 162.28,133.21 161.99,146.00 161.99,146.00 159.00,170.00 159.00,170.00 159.00,170.00 169.00,160.00 169.00,160.00 Z M 133.98,183.00 C 133.76,171.68 129.04,159.16 124.29,149.00 113.69,126.29 96.65,104.65 79.00,87.00 71.36,79.36 54.05,62.83 45.00,58.00 43.48,60.14 39.04,65.46 39.16,67.91 39.28,70.38 43.27,73.37 45.00,75.04 45.00,75.04 60.00,90.00 60.00,90.00 78.47,108.47 104.95,135.41 116.11,159.00 120.87,169.05 123.35,176.07 125.55,187.00 126.61,192.27 126.58,199.84 129.00,204.00 131.07,195.18 134.18,192.95 133.98,183.00 Z M 946.00,225.00 C 946.00,225.00 947.00,204.00 947.00,204.00 947.00,204.00 946.00,187.00 946.00,187.00 945.96,161.15 944.14,121.07 939.58,96.00 937.17,82.77 930.64,76.06 921.00,67.09 918.33,64.60 912.97,58.94 909.02,60.82 906.26,62.14 904.43,65.02 905.70,68.00 905.70,68.00 913.68,80.00 913.68,80.00 918.61,89.25 921.60,99.88 924.13,110.00 928.78,128.65 930.77,147.89 932.09,167.00 932.09,167.00 933.00,178.00 933.00,178.00 933.00,178.00 934.00,200.00 934.00,200.00 934.02,213.67 934.37,227.61 931.10,241.00 928.92,249.93 926.46,253.98 923.00,262.00 942.11,259.00 945.97,241.70 946.00,225.00 Z M 290.83,268.00 C 293.13,243.98 292.04,203.59 292.00,178.00 291.99,169.48 290.30,148.32 288.74,140.00 288.06,136.39 284.10,126.64 285.15,124.09 286.30,121.30 298.85,112.32 302.00,109.80 302.00,109.80 334.00,82.83 334.00,82.83 339.07,78.27 344.33,71.95 351.00,70.00 353.87,77.42 349.69,79.69 344.00,84.00 344.00,84.00 363.00,91.58 363.00,91.58 375.11,96.14 402.70,104.99 415.00,106.00 415.00,106.00 411.43,118.00 411.43,118.00 409.09,126.26 407.01,140.43 407.00,149.00 407.00,149.00 410.00,206.00 410.00,206.00 410.00,206.00 410.00,215.00 410.00,215.00 410.00,215.00 411.00,222.00 411.00,222.00 411.00,222.00 411.00,232.00 411.00,232.00 411.00,232.00 412.00,242.00 412.00,242.00 412.07,248.54 411.51,256.02 408.67,262.00 404.46,270.89 393.39,280.78 386.00,287.28 386.00,287.28 358.00,313.00 358.00,313.00 358.00,313.00 342.00,328.98 342.00,328.98 340.08,330.81 337.12,334.07 334.15,332.83 332.17,332.01 331.48,329.94 332.17,328.00 333.00,325.63 338.06,320.94 340.00,319.00 340.00,319.00 324.00,312.01 324.00,312.01 324.00,312.01 284.00,298.00 284.00,298.00 285.44,288.71 289.35,283.44 290.83,268.00 Z M 466.71,81.00 C 471.28,75.73 475.38,66.37 482.00,74.00 482.00,74.00 473.00,86.00 473.00,86.00 476.95,87.15 489.16,93.02 490.08,97.10 490.77,100.17 487.30,105.71 488.00,113.00 491.68,106.02 507.56,87.75 513.58,80.00 519.68,72.13 519.64,69.14 527.00,72.00 524.59,79.28 519.47,82.24 519.27,87.00 519.16,89.50 522.39,98.25 523.42,101.00 525.72,107.15 532.95,128.38 532.81,134.00 532.69,138.68 529.21,143.24 526.66,147.00 522.08,153.73 509.91,170.56 504.00,175.00 499.42,167.96 504.10,167.48 504.81,159.00 505.93,145.72 493.59,132.59 485.00,124.00 485.00,124.00 485.00,264.00 485.00,264.00 485.00,266.34 484.80,269.74 486.02,271.78 488.02,275.10 500.01,279.30 504.00,281.00 507.23,282.37 512.59,285.51 516.00,284.03 517.96,283.17 520.30,280.64 521.67,279.00 530.25,268.72 528.98,259.15 528.00,247.00 528.00,247.00 535.00,247.00 535.00,247.00 536.09,255.28 536.61,263.92 533.90,272.00 529.78,284.26 521.68,290.36 513.00,299.00 501.73,310.22 491.52,320.39 483.00,334.00 483.00,334.00 476.00,330.00 476.00,330.00 476.00,330.00 485.00,319.00 485.00,319.00 485.00,319.00 466.00,311.20 466.00,311.20 466.00,311.20 430.00,298.00 430.00,298.00 433.14,291.03 439.36,285.93 442.59,279.00 444.78,274.30 444.99,269.08 445.00,264.00 445.00,264.00 445.00,177.00 445.00,177.00 445.00,167.12 446.04,143.17 442.71,135.00 440.34,129.16 434.00,124.59 430.00,119.00 430.00,119.00 466.71,81.00 466.71,81.00 Z M 555.04,311.00 C 541.34,291.83 543.08,268.78 552.31,248.00 552.31,248.00 560.86,231.00 560.86,231.00 562.85,227.41 565.20,224.33 564.58,220.00 564.58,220.00 555.69,196.00 555.69,196.00 551.07,183.01 547.72,169.60 545.43,156.00 544.72,151.74 542.33,136.32 544.03,133.09 545.66,129.97 562.14,117.11 566.00,114.00 566.00,114.00 608.00,77.17 608.00,77.17 609.64,75.70 614.07,71.80 615.98,71.15 618.90,70.17 620.87,72.28 619.83,74.93 619.08,76.86 613.77,81.31 612.00,83.00 612.00,83.00 645.00,100.58 645.00,100.58 647.93,101.85 653.99,104.76 657.00,104.67 661.63,104.53 668.03,99.56 662.50,92.00 657.62,85.33 648.82,81.78 641.00,80.00 641.00,80.00 641.00,73.00 641.00,73.00 645.22,73.38 651.11,74.84 655.00,76.52 657.79,77.73 662.45,80.53 664.71,82.53 669.80,87.02 673.37,94.07 672.66,101.00 671.39,113.44 654.64,133.28 646.00,142.00 646.00,142.00 663.00,152.40 663.00,152.40 665.35,153.82 669.30,155.76 670.30,158.33 671.64,161.08 670.45,166.05 670.30,169.00 670.30,169.00 669.00,188.00 669.00,188.00 669.00,188.00 670.09,223.00 670.09,223.00 670.09,223.00 672.00,247.00 672.00,247.00 672.18,263.09 667.09,264.91 656.00,276.00 656.00,276.00 642.01,289.04 642.01,289.04 642.01,289.04 632.97,299.00 632.97,299.00 626.75,305.58 619.31,315.19 614.73,323.00 613.23,325.57 610.03,332.61 606.95,332.97 599.00,333.91 607.86,320.76 609.00,319.00 609.00,319.00 587.00,302.42 587.00,302.42 587.00,302.42 552.00,277.00 552.00,277.00 552.24,282.32 553.25,290.14 555.34,295.00 559.97,305.76 567.56,311.88 574.00,321.00 574.00,321.00 571.00,325.00 571.00,325.00 564.53,323.10 558.89,316.39 555.04,311.00 Z M 1162.93,82.00 C 1170.60,73.53 1171.19,68.65 1179.00,72.00 1179.00,72.00 1171.00,86.00 1171.00,86.00 1174.62,87.34 1186.96,93.33 1187.52,97.21 1188.12,101.27 1184.22,104.50 1186.00,112.00 1186.00,112.00 1210.63,80.00 1210.63,80.00 1214.94,74.27 1216.54,68.77 1224.00,72.00 1221.57,79.62 1216.57,82.72 1216.29,86.28 1216.14,88.26 1218.89,95.70 1219.67,98.00 1222.31,105.84 1230.71,127.71 1229.78,135.00 1229.06,140.58 1223.55,147.45 1220.29,152.00 1220.29,152.00 1207.20,168.98 1207.20,168.98 1205.74,170.70 1203.01,174.18 1200.35,172.83 1198.43,171.86 1198.91,169.64 1199.38,168.00 1201.14,161.90 1202.91,160.12 1201.67,153.00 1199.67,141.48 1189.87,131.87 1182.00,124.00 1182.00,124.00 1182.00,264.00 1182.00,264.00 1182.00,264.00 1183.02,271.61 1183.02,271.61 1183.02,271.61 1192.00,276.85 1192.00,276.85 1192.00,276.85 1214.00,286.00 1214.00,286.00 1216.69,280.30 1221.25,277.11 1223.80,271.00 1226.81,263.81 1226.00,254.75 1226.00,247.00 1226.00,247.00 1233.00,247.00 1233.00,247.00 1233.00,257.41 1233.96,265.05 1229.91,275.00 1224.25,288.89 1206.62,301.21 1196.29,313.00 1196.29,313.00 1185.65,326.00 1185.65,326.00 1184.32,327.75 1181.54,332.00 1179.68,332.85 1177.65,333.77 1175.86,332.73 1174.00,332.00 1174.00,332.00 1182.00,319.00 1182.00,319.00 1166.20,312.68 1142.99,301.65 1127.00,298.00 1132.74,285.62 1141.97,284.62 1142.00,266.00 1142.00,266.00 1142.00,149.00 1142.00,149.00 1141.99,141.80 1141.40,136.07 1137.06,130.00 1137.06,130.00 1127.00,119.00 1127.00,119.00 1127.00,119.00 1162.93,82.00 1162.93,82.00 Z M 1257.04,303.00 C 1257.04,303.00 1269.42,319.00 1269.42,319.00 1270.78,322.49 1268.14,324.94 1265.00,323.83 1261.95,322.76 1257.07,316.61 1254.92,314.00 1243.18,299.75 1241.17,287.93 1243.17,270.00 1244.37,259.27 1249.34,247.53 1254.26,238.00 1256.76,233.14 1262.48,225.48 1261.75,220.00 1261.75,220.00 1253.34,197.00 1253.34,197.00 1248.77,183.83 1245.63,170.66 1243.00,157.00 1243.00,157.00 1241.01,140.00 1241.01,140.00 1240.75,137.76 1240.14,135.19 1241.01,133.09 1242.48,130.13 1255.65,120.11 1259.00,117.39 1259.00,117.39 1299.00,82.91 1299.00,82.91 1301.60,80.51 1310.16,72.12 1313.00,71.16 1316.01,70.14 1317.27,72.01 1319.00,74.00 1319.00,74.00 1309.00,83.00 1309.00,83.00 1309.00,83.00 1340.00,99.25 1340.00,99.25 1343.57,101.03 1351.08,104.88 1355.00,104.54 1362.27,103.91 1363.43,96.18 1359.49,91.17 1354.58,84.92 1345.55,81.54 1338.00,80.00 1338.00,80.00 1338.00,73.00 1338.00,73.00 1352.34,74.20 1370.83,83.21 1369.89,100.00 1369.49,107.30 1364.69,115.12 1360.65,121.00 1360.65,121.00 1348.87,135.99 1348.87,135.99 1347.54,137.55 1344.85,139.83 1345.96,142.10 1347.10,144.44 1360.02,152.08 1363.00,153.94 1364.73,155.02 1367.59,156.40 1368.34,158.39 1368.97,160.05 1367.56,169.65 1367.10,172.00 1367.10,172.00 1367.10,181.00 1367.10,181.00 1367.10,181.00 1366.00,197.00 1366.00,197.00 1366.00,197.00 1368.28,235.00 1368.28,235.00 1369.18,242.56 1370.89,253.21 1367.33,260.00 1364.40,265.59 1350.22,278.78 1345.00,284.00 1329.73,299.27 1314.97,313.88 1306.00,334.00 1306.00,334.00 1300.00,332.00 1300.00,332.00 1300.00,332.00 1304.42,319.61 1304.42,319.61 1304.42,319.61 1290.00,306.88 1290.00,306.88 1290.00,306.88 1274.00,294.42 1274.00,294.42 1274.00,294.42 1250.00,277.00 1250.00,277.00 1250.00,288.28 1250.33,293.34 1257.04,303.00 Z M 1544.83,268.00 C 1547.00,245.43 1546.04,200.69 1546.00,176.00 1545.99,168.64 1544.28,147.02 1542.79,140.00 1542.05,136.53 1538.28,126.57 1539.23,124.04 1540.41,120.87 1551.74,113.01 1555.00,110.40 1555.00,110.40 1587.00,83.72 1587.00,83.72 1590.06,81.02 1598.68,72.28 1601.96,71.15 1605.30,70.01 1607.05,73.09 1605.87,75.99 1604.82,78.58 1600.21,82.08 1598.00,84.00 1598.00,84.00 1615.00,90.58 1615.00,90.58 1627.27,95.24 1656.69,104.97 1669.00,106.00 1669.00,106.00 1665.15,119.00 1665.15,119.00 1662.98,127.14 1661.01,141.59 1661.00,150.00 1661.00,150.00 1662.91,190.00 1662.91,190.00 1662.91,190.00 1664.09,214.00 1664.09,214.00 1664.09,214.00 1665.00,221.00 1665.00,221.00 1665.00,221.00 1665.00,231.00 1665.00,231.00 1665.00,231.00 1666.00,241.00 1666.00,241.00 1666.07,247.50 1665.72,254.95 1663.12,261.00 1660.22,267.74 1654.16,273.89 1649.00,279.00 1649.00,279.00 1620.00,305.17 1620.00,305.17 1620.00,305.17 1608.00,316.96 1608.00,316.96 1608.00,316.96 1599.00,325.04 1599.00,325.04 1597.04,326.91 1592.43,332.03 1590.04,332.66 1587.21,333.42 1585.39,330.64 1586.25,328.00 1587.04,325.56 1592.04,320.96 1594.00,319.00 1575.88,311.19 1557.34,302.41 1538.00,298.00 1539.44,288.71 1543.35,283.47 1544.83,268.00 Z M 1691.25,275.00 C 1694.80,263.96 1695.31,252.44 1696.09,241.00 1696.09,241.00 1697.00,231.00 1697.00,231.00 1697.00,231.00 1697.00,178.00 1697.00,178.00 1697.00,178.00 1696.00,157.00 1696.00,157.00 1695.98,152.10 1694.62,139.71 1693.50,135.00 1692.79,132.01 1690.19,126.79 1691.23,124.09 1692.29,121.34 1703.09,113.54 1706.00,111.20 1706.00,111.20 1740.00,82.28 1740.00,82.28 1743.00,79.65 1752.04,69.75 1755.84,71.25 1762.27,73.79 1750.97,82.08 1749.00,84.00 1749.00,84.00 1781.00,94.57 1781.00,94.57 1781.00,94.57 1802.00,99.56 1802.00,99.56 1802.00,99.56 1819.00,102.00 1819.00,102.00 1819.00,102.00 1815.08,114.00 1815.08,114.00 1812.43,121.76 1810.95,131.82 1810.04,140.00 1810.04,140.00 1810.04,149.00 1810.04,149.00 1810.04,149.00 1809.00,159.00 1809.00,159.00 1809.00,159.00 1809.00,179.00 1809.00,179.00 1809.00,179.00 1810.00,196.00 1810.00,196.00 1810.00,196.00 1812.17,240.00 1812.17,240.00 1812.17,240.00 1816.00,278.00 1816.00,278.00 1816.00,278.00 1816.00,287.00 1816.00,287.00 1816.00,287.00 1817.00,297.00 1817.00,297.00 1817.14,309.58 1817.85,325.70 1811.65,337.00 1805.27,348.62 1792.17,355.74 1781.00,362.15 1756.20,376.38 1735.98,388.73 1708.00,372.54 1700.75,368.34 1695.27,363.44 1689.00,358.00 1687.06,360.49 1683.18,364.77 1680.02,365.53 1677.61,366.10 1675.66,364.49 1676.34,361.98 1677.11,359.09 1687.25,350.95 1690.00,348.58 1690.00,348.58 1724.00,319.00 1724.00,319.00 1724.00,319.00 1703.00,305.45 1703.00,305.45 1703.00,305.45 1682.00,294.00 1682.00,294.00 1686.21,286.47 1688.47,283.68 1691.25,275.00 Z M 1184.00,112.00 C 1184.00,112.00 1185.00,113.00 1185.00,113.00 1185.00,113.00 1185.00,112.00 1185.00,112.00 1185.00,112.00 1184.00,112.00 1184.00,112.00 Z M 740.57,125.30 C 739.87,126.96 740.00,130.15 740.00,132.00 740.00,132.00 740.00,198.00 740.00,198.00 746.44,196.16 752.17,192.51 758.00,189.30 763.58,186.24 768.02,183.62 773.00,179.54 777.36,175.96 781.71,171.62 783.20,166.00 784.57,160.82 781.99,154.74 779.99,150.00 773.94,135.70 764.56,127.00 756.00,115.00 751.68,116.26 742.38,121.06 740.57,125.30 Z M 1472.99,176.96 C 1477.57,172.48 1481.45,167.80 1480.80,161.00 1479.84,150.86 1467.91,132.99 1461.55,125.00 1458.95,121.73 1454.75,115.07 1450.00,116.14 1446.91,116.83 1438.82,122.37 1437.57,125.30 1436.87,126.96 1437.00,130.15 1437.00,132.00 1437.00,132.00 1437.00,198.00 1437.00,198.00 1446.35,195.33 1466.07,183.72 1472.99,176.96 Z M 597.00,122.15 C 589.09,117.71 582.17,114.58 582.00,127.00 581.80,141.93 585.44,157.09 590.81,171.00 592.72,175.94 594.37,182.18 598.00,186.00 606.56,174.69 629.92,154.89 635.00,143.00 620.12,136.59 610.66,129.83 597.00,122.15 Z M 1298.00,124.20 C 1294.50,122.11 1287.25,117.44 1283.13,118.36 1277.14,119.68 1279.15,131.64 1279.72,136.00 1282.47,157.18 1286.16,166.41 1294.00,186.00 1298.39,182.78 1314.78,164.97 1319.15,160.00 1323.69,154.85 1329.49,149.41 1332.00,143.00 1320.60,138.09 1308.72,130.59 1298.00,124.20 Z M 368.17,207.00 C 368.17,207.00 366.91,185.00 366.91,185.00 366.91,185.00 366.00,172.00 366.00,172.00 366.07,166.51 367.29,154.26 368.63,149.00 369.32,146.31 371.45,140.93 369.94,138.50 368.54,136.24 361.64,134.20 359.00,133.19 359.00,133.19 329.00,121.00 329.00,121.00 329.00,121.00 331.00,149.00 331.00,149.00 331.00,149.00 332.00,164.00 332.00,164.00 332.00,164.00 332.00,178.00 332.00,178.00 332.00,178.00 333.00,194.00 333.00,194.00 333.04,217.42 332.15,241.92 328.00,265.00 328.00,265.00 366.00,283.00 366.00,283.00 374.09,258.53 370.56,232.07 368.17,207.00 Z M 1583.00,121.00 C 1583.00,121.00 1586.00,162.00 1586.00,162.00 1586.00,162.00 1586.00,176.00 1586.00,176.00 1586.00,176.00 1587.00,191.00 1587.00,191.00 1587.04,215.75 1586.39,240.58 1582.00,265.00 1582.00,265.00 1595.00,270.31 1595.00,270.31 1595.00,270.31 1621.00,282.00 1621.00,282.00 1621.00,282.00 1623.72,267.00 1623.72,267.00 1623.72,267.00 1625.00,241.00 1625.00,241.00 1625.00,241.00 1623.17,218.00 1623.17,218.00 1623.17,218.00 1620.91,184.00 1620.91,184.00 1620.91,184.00 1620.01,171.00 1620.01,171.00 1620.01,171.00 1621.46,154.00 1621.46,154.00 1621.46,154.00 1625.00,137.00 1625.00,137.00 1625.00,137.00 1583.00,121.00 1583.00,121.00 Z M 1758.00,131.58 C 1758.00,131.58 1738.00,125.00 1738.00,125.00 1738.00,125.00 1738.00,213.00 1738.00,213.00 1738.00,213.00 1737.00,228.00 1737.00,228.00 1737.00,228.00 1735.72,251.00 1735.72,251.00 1735.35,254.05 1733.71,262.43 1734.33,264.90 1735.27,268.66 1740.90,271.08 1744.00,273.05 1744.00,273.05 1764.00,286.91 1764.00,286.91 1768.59,288.50 1774.25,283.40 1774.84,278.99 1774.84,278.99 1773.00,253.00 1773.00,253.00 1773.00,253.00 1772.00,237.00 1772.00,237.00 1772.00,237.00 1772.00,223.00 1772.00,223.00 1772.00,223.00 1771.00,206.00 1771.00,206.00 1771.00,206.00 1772.00,186.00 1772.00,186.00 1772.14,174.09 1773.98,162.33 1777.75,151.00 1777.75,151.00 1783.00,138.00 1783.00,138.00 1783.00,138.00 1758.00,131.58 1758.00,131.58 Z M 1002.00,156.43 C 998.85,158.23 988.59,163.73 987.02,166.33 985.99,168.04 986.02,170.08 986.17,172.00 986.17,172.00 987.00,180.00 987.00,180.00 992.80,178.15 1001.44,171.87 1007.00,168.42 1007.00,168.42 1041.00,149.26 1041.00,149.26 1053.02,143.40 1056.83,145.22 1057.00,136.00 1057.00,136.00 1057.00,129.00 1057.00,129.00 1040.65,136.03 1017.41,147.59 1002.00,156.43 Z M 161.46,176.00 C 157.25,181.12 152.88,186.57 151.00,193.00 156.48,190.18 160.91,186.11 166.00,182.67 175.01,176.57 184.25,171.09 194.00,166.25 205.47,160.55 207.86,162.01 208.00,154.00 208.00,154.00 208.00,143.00 208.00,143.00 192.89,147.31 171.36,163.98 161.46,176.00 Z M 1006.00,176.61 C 1002.31,178.87 989.83,186.95 988.02,190.17 986.46,192.96 987.18,200.25 986.71,204.00 985.53,213.59 983.35,219.34 977.33,227.00 964.84,242.88 942.35,257.38 936.00,265.00 954.52,268.73 978.16,276.19 996.00,282.69 996.00,282.69 1011.00,289.25 1011.00,289.25 1013.50,290.44 1017.19,292.51 1020.00,292.16 1023.06,291.78 1025.78,289.00 1028.00,287.05 1028.00,287.05 1042.00,274.00 1042.00,274.00 1046.88,269.09 1053.48,261.63 1055.75,255.00 1057.87,248.80 1057.00,225.01 1057.00,217.00 1057.00,217.00 1057.00,153.00 1057.00,153.00 1036.37,159.88 1024.66,165.23 1006.00,176.61 Z M 581.40,215.00 C 578.84,218.20 571.06,227.06 571.23,231.00 571.41,235.12 580.85,242.75 584.00,245.41 584.00,245.41 614.00,268.66 614.00,268.66 619.50,272.40 624.53,276.15 631.04,278.00 633.96,267.59 631.02,249.15 631.04,238.00 631.04,238.00 631.04,213.00 631.04,213.00 631.04,213.00 631.04,197.00 631.04,197.00 631.52,193.33 632.63,187.64 631.69,184.04 630.58,179.83 624.43,176.65 621.00,174.00 609.92,181.42 590.18,204.02 581.40,215.00 Z M 1329.00,259.00 C 1329.00,259.00 1329.00,243.00 1329.00,243.00 1329.00,243.00 1328.00,227.00 1328.00,227.00 1328.00,227.00 1328.00,209.00 1328.00,209.00 1328.00,209.00 1329.00,193.00 1329.00,193.00 1329.01,184.73 1330.64,182.16 1323.00,177.35 1321.21,176.22 1319.23,174.88 1317.00,175.44 1314.10,176.17 1306.24,184.49 1303.83,187.04 1303.83,187.04 1277.00,217.00 1277.00,217.00 1274.47,220.19 1267.73,227.81 1268.73,232.00 1269.74,236.21 1279.45,243.82 1283.00,246.75 1293.83,255.70 1315.34,273.49 1328.00,278.00 1330.76,269.64 1329.01,267.25 1329.00,259.00 Z M 150.00,193.00 C 150.00,193.00 151.00,194.00 151.00,194.00 151.00,194.00 151.00,193.00 151.00,193.00 151.00,193.00 150.00,193.00 150.00,193.00 Z M 149.00,194.00 C 149.00,194.00 150.00,195.00 150.00,195.00 150.00,195.00 150.00,194.00 150.00,194.00 150.00,194.00 149.00,194.00 149.00,194.00 Z M 1758.00,302.00 C 1748.01,308.69 1731.14,319.83 1724.00,329.00 1724.00,329.00 1733.00,336.68 1733.00,336.68 1741.11,343.27 1753.62,348.44 1764.00,349.71 1767.83,350.19 1773.59,350.58 1776.49,347.57 1779.13,344.83 1778.98,340.53 1779.00,337.00 1779.00,337.00 1777.83,309.00 1777.83,309.00 1777.83,309.00 1776.00,290.00 1776.00,290.00 1769.51,293.18 1763.99,297.99 1758.00,302.00 Z"
+ style="fill:#333333" />
+</svg>
diff --git a/blog/_assets/stylesheets/_config.scss b/blog/_assets/stylesheets/_config.scss
index c8b5066..77d3c8b 100644
--- a/blog/_assets/stylesheets/_config.scss
+++ b/blog/_assets/stylesheets/_config.scss
@@ -1,8 +1,11 @@
+$base-font-size: 12pt;
+$huge-font-size: $base-font-size * 1.25;
+
$body-bg: rgba(0, 0, 0, 0.4);
-$text-color: #acbed5;
-$heading-color: #3379BF;
+$text-color: #6c7683;
+$heading-color: #2B4662;
$dimmed-text-color: darken($text-color, 20%);
-$link-color: #93A2B1; //#686;
+$link-color: #384e68; //#686;
$link-hover-color: lighten(#686, 5%);
$side-bar-background: rgba(20, 20, 20, 0.7);
$menu-bar-background: transparentize(#243B48, 0.2); //rgba(128, 256, 128, 0.15);
diff --git a/blog/_assets/stylesheets/_header.scss b/blog/_assets/stylesheets/_header.scss
index 7998bb5..fc93a19 100644
--- a/blog/_assets/stylesheets/_header.scss
+++ b/blog/_assets/stylesheets/_header.scss
@@ -1,20 +1,33 @@
#header {
width: 100%;
- font-size: 110%;
- font-weight: 600;
+ font-weight: bold;
#logo {
- position: relative;
- width: 479px;
text-align: center;
+ float: left;
p {
margin-top: 0;
}
+
+ @media screen and (min-width: 28cm) {
+ width: 50%; //479px;
+ }
}
#banner-pos-1 {
- position: absolute;
- top: 1.5em;
- right: 0;
+ text-align: center;
+ float: left;
+ visibility: hidden;
+ display: none;
+
+ @media screen and (min-width: 28cm) {
+ width: 50%; //479px;
+ visibility: visible;
+ display: block;
+ }
+ }
+
+ #page-menu {
+ clear: both;
}
}
diff --git a/blog/_assets/stylesheets/_post.scss b/blog/_assets/stylesheets/_post.scss
index 436b828..b2e737f 100644
--- a/blog/_assets/stylesheets/_post.scss
+++ b/blog/_assets/stylesheets/_post.scss
@@ -49,4 +49,27 @@
visibility: hidden;
clear: both;
}
+ .post-image {
+ text-align: center;
+ float: right;
+
+ @media screen and (max-width: 590px){
+ float: none;
+ img {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ }
+}
+
+.post-excerpt {
+ .post-body {
+ .post-image {
+ @media screen and (min-width: 500px) {
+ float: right;
+ width: 300px;
+ }
+ }
+ }
}
diff --git a/blog/_assets/stylesheets/main.scss b/blog/_assets/stylesheets/main.scss
index a4e284c..5da3093 100644
--- a/blog/_assets/stylesheets/main.scss
+++ b/blog/_assets/stylesheets/main.scss
@@ -32,18 +32,14 @@ h1, h2, h3, h4, h5, h6 {
}
h1 {
- font-size: 20pt;
-}
-
-strong {
- color: $dimmed-text-color;
+ font-size: $huge-font-size;
}
#page-container {
position: relative;
- width: 28cm;
+ max-width: 28cm;
margin: {
- top: 10mm;
+ //top: 10mm;
left: auto;
right: auto;
}
@@ -61,24 +57,19 @@ strong {
min-height: 700px;
line-height: 170%;
- padding: 1cm;
- font-size: 16pt;
+ font-size: $base-font-size;
background-color: $body-bg;
+ @media screen and (min-width: 28cm) {
+ padding: 1cm;
+ }
+
@include round-corners;
#body {
- float: left;
- width: 16cm;
}
#side-body {
- float: right;
- width: 8cm;
- padding: 2mm;
- background: {
- color: $side-bar-background
- }
}
#news, #links {
diff --git a/blog/_includes/head.html b/blog/_includes/head.html
index e345ae5..eac4a09 100644
--- a/blog/_includes/head.html
+++ b/blog/_includes/head.html
@@ -1,6 +1,6 @@
<head>
<meta charset="utf-8">
- <meta name="viewport" content="width=device-width initial-scale=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>
{{ site.title }}
diff --git a/blog/_includes/header.html b/blog/_includes/header.html
index 6813c67..0372333 100644
--- a/blog/_includes/header.html
+++ b/blog/_includes/header.html
@@ -1,6 +1,6 @@
<header id="header">
<div id="logo">
- {% image header.png alt="Norsk Urskog" %}
+ {% image "logos/norsk-urskog-web.svg" alt:"Norsk Urskog" width:100% height:100% %}
<p>Norwegian Underground Metal Sampler</p>
</div>
<div id="banner-pos-1">
diff --git a/blog/_includes/menubar.html b/blog/_includes/menubar.html
index 04be761..3076326 100644
--- a/blog/_includes/menubar.html
+++ b/blog/_includes/menubar.html
@@ -1,10 +1,12 @@
-<nav class="site-nav">
- <a class="page-link" href="{{ site.baseurl | append: "/" }}">{% t titles.home %}</a>
- <a class="page-link" href="{{ site.baseurl_root | append: "/registration" }}">{% t titles.registration %}</a>
- {% for page in site.pages %}
- {% if page.title and (!page.hidden == true) %}
- <a class="page-link" href="{{ page.url | prepend: site.baseurl | remove: 'index.html' }}">{% page_title page.title %}</a>
- {% endif %}
- {% endfor %}
- {% include language-switcher.html %}
-</nav>
+<div id="page-menu">
+ <nav class="site-nav">
+ <a class="page-link" href="{{ site.baseurl | append: "/" }}">{% t titles.home %}</a>
+ <a class="page-link" href="{{ site.baseurl_root | append: "/registration" }}">{% t titles.registration %}</a>
+ {% for page in site.pages %}
+ {% if page.title and (!page.hidden == true) %}
+ <a class="page-link" href="{{ page.url | prepend: site.baseurl | remove: 'index.html' }}">{% page_title page.title %}</a>
+ {% endif %}
+ {% endfor %}
+ {% include language-switcher.html %}
+ </nav>
+</div>
diff --git a/blog/_includes/post-excerpt.html b/blog/_includes/post-excerpt.html
index e87b12b..b3616d8 100644
--- a/blog/_includes/post-excerpt.html
+++ b/blog/_includes/post-excerpt.html
@@ -1,13 +1,11 @@
{% assign post = include.post %}
-<article class="post">
+<article class="post-excerpt">
{% include post-header.html post = post %}
<section class="post-body">
{% if post.page-image %}
- {% if include.sidebar %}
+ <div class="post-image">
{{ post.page-image | img: "magick:resize:290x" }}
- {% else %}
- {{ post.page-image | img: "magick:resize:290x class:right" }}
- {% endif %}
+ </div>
{% endif %}
{{ post.excerpt }}
<p><a href="{{ post.url | prepend: site.baseurl }}">{% t global.read_more %}</a></p>
diff --git a/blog/_layouts/default.html b/blog/_layouts/default.html
index 2488ce3..bd0ee80 100644
--- a/blog/_layouts/default.html
+++ b/blog/_layouts/default.html
@@ -10,15 +10,6 @@
<section id="body">
{{ content }}
</section>
- <section id="side-body">
- {% include news.html sidebar=true %}
-
- {% if site.links %}
- <section id="links">
- <h2>{% t home.links %}</h2>
- </section>
- {% endif %}
- </section>
</section>
</section>
diff --git a/blog/_layouts/post.html b/blog/_layouts/post.html
index 555bdc6..8a3cccb 100644
--- a/blog/_layouts/post.html
+++ b/blog/_layouts/post.html
@@ -5,9 +5,11 @@ layout: default
<article class="post">
{% include post-header.html post = page %}
<section class="post-body">
- {% if page.page-image %}
- {{ page.page-image | img: "magick:resize:590x" }}
- {% endif %}
+ <div class="post-image">
+ {% if page.page-image %}
+ {{ page.page-image | img: "magick:resize:590x" }}
+ {% endif %}
+ </div>
{{ content }}
</section>
<footer>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 02:16:10 +0000