From 95189338de891fd8cb4bd511d3650cf195dba7ab Mon Sep 17 00:00:00 2001 From: HydroJakobXIII Date: Wed, 8 Feb 2017 12:23:22 +0100 Subject: [PATCH 1/2] Layout update Sorting out isse with master-branch commit a9e8338 and updating layout. Introducing Bootstrap accordion. --- css/main.css | 19 +- graphics/Book Stack-32.png | Bin 0 -> 771 bytes graphics/GitHub-32.png | Bin 0 -> 1122 bytes graphics/Test Tube-16.png | Bin 0 -> 517 bytes graphics/Tweezers-32.png | Bin 0 -> 643 bytes index.html | 372 ++++++++++++++++++++++++------------- 6 files changed, 263 insertions(+), 128 deletions(-) create mode 100644 graphics/Book Stack-32.png create mode 100644 graphics/GitHub-32.png create mode 100644 graphics/Test Tube-16.png create mode 100644 graphics/Tweezers-32.png diff --git a/css/main.css b/css/main.css index 2efba8d..cb9cdca 100644 --- a/css/main.css +++ b/css/main.css @@ -2,15 +2,17 @@ body { padding-top: 150px; /* To offset the fixed-top navbar */ } .container { - max-width: 960px; + max-width: 1200px; padding: 30px; border-radius: 10px; border: 5px solid black; margin: auto; + background-color: #aba2a2; } .page-title { padding: 0; text-align: center; + overflow-x: hidden; } hr { display: block; @@ -39,12 +41,23 @@ hr { ul { list-style: none; } +tbody { + background-color: #ebe5ef; +} +th { + text-align: center; +} .local { font-weight: bold; } .online { font-weight: bold; } -.footer { - clear: both; +footer { + text-align: center; + color: white; + background-color: black; +} +.resources { + text-align: center; } \ No newline at end of file diff --git a/graphics/Book Stack-32.png b/graphics/Book Stack-32.png new file mode 100644 index 0000000000000000000000000000000000000000..472b81b5b9a6c08318c9bfa0e20687cf04f43241 GIT binary patch literal 771 zcmV+e1N{7nP)%1rZlvGOq2+GaLK+gaW zS#OeY_9_9l4}g=UVm$zBg7-)U2r|Hv4JE*zcalC)${v8P5abAAEggZpWRns;mQ*s) z0)Wm-eRj4-RepbKY2HgZ%K*-5dUlSj!uaa+rv9ACaF0gQ0$y%fU&QPdB{%~R2G;Iv zliX@qV;e91!~kF>6K+p~@yLz#8#}3EJVn9=fR;f!P>5tf&ZyN3Et}o_v0)u zfP*Gcy@DQ4fO)VYMO?zWLhdJM-=n;lffj%m6RtQjy*67MH%MnPl9fAk8crm%{CEjD z>|p7_o`wM8!D*CR6{me59>~FP z8o`X#tT;g(h%<3Gxhqb?$a|ib4N}^xaRigcaVDMlz)1I0jb)ku^i<&by2d#>Og;cn zCVr2d?rq%(;{Q+q+?Xu)0i2MYmRXK~X>B~#JZDY1NW`YXTAi@9a%Di4BdpH7!KCvl z7l}CIj{#6S>WP#vtAO-^e962IdVc^^X1p8I%ugK0AchMD;SXB{uJuTgnTU%S&HDg{ zO}v&0A{a8$l4RVbOvEne(Naq4VyDZF$ci%qnE16Vj^d*L`%MFP7ZxR8DC8&Sg% zf?OdOdGGz^p$i@;vdAKW5mH@9kT&n`B^Mcm90eZ+_q3 zC&Ub6Pe${hN;V9k7AhPt*%p&+g$f6TP-7LpyCbrBA6L+cYv=m=?T|>4G8Dia>1ZLjS1W-hU-j$>-UnP~&@6(SvCf zj{%`nhLp5&d6ay?_oG)QUhru*gw8Clo;3DkH18ZZH%H~cp~L00pZLlHvMT}EmAZU# zV_L;Vrptj!*6Xr8wF&RxW@278Y( zR&Hdvz=VG;3m_!iEts3^O70&TTf!xb0TTvQ*~$>iRZPHyqq5xWL55%ilYQ*|{83gu z5QCSP@cR`33__hMUv5bFZOD%OO0a@;Ui@gex`Ug#AgrsM-5ga`?bSmV!fWpsOYtIQIv zV)Or6FV@Mnf3}1yuh%bFCwJUhg9>W9e-8OXceox;|_E_*CLG9+maeF`$KpM4@YB zy5OqUiCaIL-2M7ROgM1>%GAFo0ciU&_hdBB z8u2L7a4^Y4V@R2BQqdhfbyOZPVX!NsCFfXuLwLpt-Rx{2TZ_d!V%rzC=dOSALG)NB z+gU$2>Lqjlu#@4QkmS&OpAKQ|}oPu0e!vFvP07*qoM6N<$f=b>QQ2+n{ literal 0 HcmV?d00001 diff --git a/graphics/Test Tube-16.png b/graphics/Test Tube-16.png new file mode 100644 index 0000000000000000000000000000000000000000..c7d930ddf435f0b692fbf3eae02b905d9aa6ea7c GIT binary patch literal 517 zcmV+g0{Z=lP)F1zzG|Aa2O@Lv2Aq^r=mv6IfFozk7T6F50*9qsI;hz^Q!P{<$X6m1AW zjnaXOHd$klHBwGZc5q@gwjBfO+ttL?h@(F6xp?2_{d^zZhp0{skIvjyw6J!X;OJ~$ zy|@2VFVik7S~wR=WsfsEd1Q9-h^4Z}iWbfZLAB9RNZ;_-)yP^>*9%4Hg(6nhHw*pp z#5GGY5s?s78~+ZlJiQvQ`X-_8t;f$F5Lrv=x$WG=0?z$~`|8}I#Malck$jKJQx%&Z zzWkKO=2c7b&{NJIL3_<964Tc$>{Ejf}u#3}r>Z z+m;sW@;pq&a41QrghDVGLnRc#yAJ!&3h!$oA|kE5{Zg#WRw~LeOvX+)@cU6#6c~bl zjpk--bKFUoG(@5QWcXKn7$$24o-uM1Tko0U|&Ih=7d%5g-FHP~X<{R%<0 z`v2IHbRmiB$>bmK*CZWDno4??^el;c#QQ1<81S*ATS;6WCG9xTU#lXpS8U#p^jho& z7y>?~%O(Kebx^r0=_yeUk)_rEc|LRb1pw<0Bth&gskilII6$sZjqN_ZiuDxUWhq4e zd`50j0<_XyQ5XfDJ4aA&m2dBDF4_fHOFzdS0{}RxKMRS|z|K;mzd8UgZ5898+{bnT za#200p(Y^rCj#Uf^)cVvyASs%%BbE_GkbNc0~t7~0iP*yk*T+tFn?_ffe4P3C?wZe z+(_CF4{RokCJ@0tO543uz_Y1$mDNp;0~8xYXTegT=cDEJ9P3#)6q>~^>+L~{06_G) z#k_qg%DJ7T3P)16h6pfZSRU5rhmy$aP(;GKJNR9VK(w(39LxQ#2RzNYS5PB>?Kazc zz#)uVxMo3n#{KZiy^Me#9zEb$-YGirUMtjU8=?Rko4IpRVwZG-^AGQUx3QVKLVyWK z)%$kqQl7P;S>Khrl3(AVqm)Mic4A?|k%m_8VvE|Lv-MrI2(9Y3YXif58NqwgmCg@p zz|{X(la*=XbIvlN09(UpaB@L_ZH6j;Ue7-A;H_meJTKi-2ylo%iJfAykNpX#wT!yK ztqp0vq0L5p;7)7*j{?rxF#dosN{>Sj)udp^rKJ%7kaHYqA=k`@g$iwmS= - + @@ -25,104 +25,243 @@ - Projekt + Jakob | Projects
-
-
-
-

Projekt

-

To boldly go...

-
+
+
+
+

Projects

+

To boldly go...

-
-
+
+
+
-
-
+
+
-

Pågående projekt

+

Ongoing projects

-
+
+
-
-
-

Projekt

- Local: e-learning | - Online: e-learning -
-
-

Att fixa

-
    -
  • -
-
-
-
-
- Local: Math | - Online:Math -
-
-
    -
  • Börja på linjär algebra
    • -
  • Taylorutveckling (teori och exempel)
    • -
  • Tentor
    • -
-
-
-
-
- Local: Alma mater | - Online:Alma mater -
-
-
    -
  • -
-
-
-
-
- Local: Träning | - Online:Träning -
-
-
    -
  • Skriva om matten mha MathML och MathJax
    • -
-
-
-
-
- Local: Hemsida | - Online:Hemsida -
-
- GitHub issues -
-
-
-
-

Misc

- -
-
- -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Project nameResources
Alma materOnline
e-learningOnline
MathOnline
TräningOnline
HemsidaOnline
KörkortOnline
ResourcesOnline
Ekonomi: SparandeOnline
ProjectsOnline
+
+
+
+
+

Things to improve

+ +
+
+ +
+
+
    +
  • + + + ∞ + + More points! + +
    • +
+
-
-
+
+ +
+
+
    +
  • Lägg till en timeline för när jag avklarat men framförallt när jag planerar på att starta.
    • +
  • add icon to websites
    • +
  • progress på duolingo
    • +
  • progress på lingvist
    • +
  • Add backend (NodeJS)
    • +
+
+
+
+
+ +
+
+
    +
  • Lägga till id till varje exempel (math)
    • +
  • Taylorutveckling (teori och exempel)
    • +
  • Tentor envarre och linalg
    • +
  • Komma på bra micro-badge lösning
    • +
  • Räkna ut calculus Khan Academy derivative application total tid
    • +
  • Räkna ut total tid på kurse differential calculus
    • +
  • Lägga till youtube, UCLA kurs, slcmath@pc
    • +
  • Lägga till MIT kurs
    • +
  • Ändra chevron länkarna till toppen på sidan (coursera, khan academy, etc)
    • +
  • Ändra chevrons, länkarna är fel
    • +
  • Lägg till diff calc länken i nav 2 (coursera) och lägg till span på "överskrifterna"
    • +
+
+
+
+
+ +
+
+
    +
  • Skriva om matten mha MathML och MathJax
    • +
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
    +
  • +
+
+
+
+
+ +
+
+
    +
  • Hitta en favicon
    • +
  • Försök ha en standard ordning på "design"->"website" etc
    • +
  • Alfabetisk ordning på sidorna (Engelsk)
    • +
+
+
+
+
+ +
+
+
    +
  • + + + ∞ + + +
    • +
+
+
+
+
+

Planerade projekt

Javascript

@@ -131,6 +270,7 @@

Javascript

  • Jordens gravitation
  • Träning (BMR, kaloriförbrukning)
    • +
  • Bilkörning (förbrukning, bromssträcka)

  • Spel

      • @@ -151,61 +291,43 @@

      Python

    HTML/CSS

      -
    • Körtkort lista med framsteg
      • +
    • Träning, påbörja sidan som ska sen bli huvudsidan m.a.p statistik.
    -
    +
    -
    -
    -

    Written by Jakob Papirov, Uppsala, Sweden 2016

    -
    -
    +
    +

    Written by Jakob Papirov, Uppsala, Sweden 2016 - 2017

    +
    -
    +
    -
    Resources used
    +
    Resources used
    -
    -
    Mjukvara
    - -
    -
    -
    Design
    - -
    -
    -
    Icons
    - -
    -
    -
    Math
    - -
    -
    +
    +
    + +
    +
    + +
    +
    + + GitHub +
    +
    +
    \ No newline at end of file From d884b225570002257a82450af75e0db7b3ef518b Mon Sep 17 00:00:00 2001 From: Jakob Papirov Date: Mon, 20 Feb 2017 20:11:37 +0100 Subject: [PATCH 2/2] Delete CNAME --- CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CNAME diff --git a/CNAME b/CNAME deleted file mode 100644 index 978e86b..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -projects.jakobpapirov.se