From c3566d9338bb3429261cdcd1e8aea7eec05dc2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Fri, 26 Jan 2018 21:00:50 +0100 Subject: [PATCH] crosslinks --- www/data/css/styles.css | 59 +++++++++++++++------------ www/data/css/styles.min.css | 11 +++-- www/data/css/styles_about.scss | 13 ++++++ www/data/css/styles_global.scss | 33 +++++++++++++++ www/data/css/styles_programsview.scss | 33 --------------- www/data/images/icons.svg | 4 ++ www/index.php | 1 - www/pages/about.php | 53 ++++++++++++++++++++++-- www/pages/programs_view.php | 20 ++++----- 9 files changed, 151 insertions(+), 76 deletions(-) diff --git a/www/data/css/styles.css b/www/data/css/styles.css index b4e8563..4042d7d 100644 --- a/www/data/css/styles.css +++ b/www/data/css/styles.css @@ -115,6 +115,31 @@ body { .button:hover { background-color: #555; } +.iconbutton { + display: flex; + justify-content: center; + align-items: center; + background: #222; + color: #CCC; + text-decoration: none; + border: 1px solid #000; + margin: 5px 0; } + +.iconbutton:hover { + cursor: pointer; + background-color: #555; } + +.iconbutton svg { + width: 14pt; + height: 14pt; + margin: 0 4px; + fill: #CCC; } + +.iconbutton span { + flex-grow: 1; + text-align: center; + font-size: 14pt; } + /* 400px */ #headerdiv { z-index: 999; @@ -805,37 +830,12 @@ html, body { display: flex; justify-content: right; } -.prgv_dl_btn { - display: flex; - justify-content: center; - align-items: center; - background: #222; - color: #CCC; - text-decoration: none; - border: 1px solid #000; - margin: 5px 0; } - .prgv_dl_download { background: #442222; } .prgv_dl_github { background: #4078C0; } -.prgv_dl_btn:hover { - cursor: pointer; - background-color: #555; } - -.prgv_dl_btn svg { - width: 14pt; - height: 14pt; - margin: 0 4px; - fill: #CCC; } - -.prgv_dl_btn span { - flex-grow: 1; - text-align: center; - font-size: 14pt; } - .prgv_right_lang img { display: inline; height: 16pt; @@ -969,6 +969,15 @@ html, body { text-decoration: none; color: #22F; } +.about_circles { + display: flex; + flex-direction: column; } + +.about_circles a { + margin: 5px 0; } +.about_circles .iconbutton span { + text-align: left; } + /* 400px */ .admincontent { display: block; diff --git a/www/data/css/styles.min.css b/www/data/css/styles.min.css index 595d0b2..a41d41c 100644 --- a/www/data/css/styles.min.css +++ b/www/data/css/styles.min.css @@ -23,6 +23,10 @@ body{background-color:#EEE;color:#CCC;font-family:serif} .boxedcontent .bc_data{padding:8px} .button{color:#DDD;text-decoration:none;background-color:#222;font-size:1rem;border:1px solid black;height:36px;line-height:36px;padding:2px 2rem} .button:hover{background-color:#555} +.iconbutton{display:flex;justify-content:center;align-items:center;background:#222;color:#CCC;text-decoration:none;border:1px solid #000;margin:5px 0} +.iconbutton:hover{cursor:pointer;background-color:#555} +.iconbutton svg{width:14pt;height:14pt;margin:0 4px;fill:#CCC} +.iconbutton span{flex-grow:1;text-align:center;font-size:14pt} #headerdiv{z-index:999;background-color:#333;display:flex;border-bottom:1px solid #111;box-shadow:0 0 8px #000;position:fixed;width:100%} #headerdiv .logowrapper{flex:initial;margin:0;padding:0;height:42px} #headerdiv .logowrapper .logo{min-width:197.5px;height:30px;margin:4px 0 8px 6px;flex:initial} @@ -204,12 +208,8 @@ html,body{margin:0;padding:0;height:100%} .prgv_right_value a:hover{color:#339;text-decoration:none} .prgv_right_comb{grid-column:1 / span 2} .prgv_right_lang{display:flex;justify-content:right} -.prgv_dl_btn{display:flex;justify-content:center;align-items:center;background:#222;color:#CCC;text-decoration:none;border:1px solid #000;margin:5px 0} .prgv_dl_download{background:#422} .prgv_dl_github{background:#4078c0} -.prgv_dl_btn:hover{cursor:pointer;background-color:#555} -.prgv_dl_btn svg{width:14pt;height:14pt;margin:0 4px;fill:#CCC} -.prgv_dl_btn span{flex-grow:1;text-align:center;font-size:14pt} .prgv_right_lang img{display:inline;height:16pt;max-width:32px;margin:1px 2px 0 2px} .prgv_center{margin:0 8px 8px 8px;padding:16px;background:#EEE;border:1px solid rgba(0,0,0,0.15)} .prgv_sep{margin:40px 0 40px 0;display:block;border:0;color:white;height:1px;background:#666666FF;background:-moz-radial-gradient(circle,#666,#FFFFFF00);background:-webkit-radial-gradient(circle,#666 0,#FFFFFF00 100%)} @@ -238,6 +238,9 @@ html,body{margin:0;padding:0;height:100%} .egg_footer{margin-top:5px;text-align:right;margin-right:5px;margin-bottom:5px;color:#888} .egg_footer>a{text-decoration:none;color:inherit} .egg_footer>a:hover{text-decoration:none;color:#22F} +.about_circles{display:flex;flex-direction:column} +.about_circles a{margin:5px 0} +.about_circles .iconbutton span{text-align:left} .admincontent{display:block;width:100%} .admincontent .boxedcontent{margin-bottom:20px} .egh_ajaxOutput{display:flex;box-sizing:border-box;width:100%;align-self:center;justify-self:center;margin-left:auto;margin-right:auto;resize:none;height:300px} diff --git a/www/data/css/styles_about.scss b/www/data/css/styles_about.scss index 467880c..f2d4d69 100644 --- a/www/data/css/styles_about.scss +++ b/www/data/css/styles_about.scss @@ -101,4 +101,17 @@ .egg_footer > a:hover { text-decoration: none; color: #22F; +} + +.about_circles { + display: flex; + flex-direction: column; +} + +.about_circles { + + a { margin: 5px 0; } + + .iconbutton span {text-align: left;} + } \ No newline at end of file diff --git a/www/data/css/styles_global.scss b/www/data/css/styles_global.scss index cee0f97..1dfbfc0 100644 --- a/www/data/css/styles_global.scss +++ b/www/data/css/styles_global.scss @@ -119,4 +119,37 @@ body { .button:hover { background-color: #555; +} + +.iconbutton { + display: flex; + justify-content: center; + align-items: center; + + background: #222; + color: $COL_TEXT_NORMAL; + text-decoration: none; + border: 1px solid #000; + + margin: 5px 0; +} + +.iconbutton:hover { + cursor: pointer; + background-color: #555; +} + +.iconbutton svg { + width: 14pt; + height: 14pt; + margin: 0 4px; + + fill: $COL_TEXT_NORMAL; +} + +.iconbutton span { + flex-grow: 1; + text-align: center; + + font-size: 14pt; } \ No newline at end of file diff --git a/www/data/css/styles_programsview.scss b/www/data/css/styles_programsview.scss index ef45092..5b0280a 100644 --- a/www/data/css/styles_programsview.scss +++ b/www/data/css/styles_programsview.scss @@ -84,42 +84,9 @@ justify-content: right; } -.prgv_dl_btn { - display: flex; - justify-content: center; - align-items: center; - - background: #222; - color: $COL_TEXT_NORMAL; - text-decoration: none; - border: 1px solid #000; - - margin: 5px 0; -} - .prgv_dl_download { background: #442222; } .prgv_dl_github { background: $COL_GITHUB; } -.prgv_dl_btn:hover { - cursor: pointer; - background-color: #555; -} - -.prgv_dl_btn svg { - width: 14pt; - height: 14pt; - margin: 0 4px; - - fill: $COL_TEXT_NORMAL; -} - -.prgv_dl_btn span { - flex-grow: 1; - text-align: center; - - font-size: 14pt; -} - .prgv_right_lang img { display: inline; height: 16pt; diff --git a/www/data/images/icons.svg b/www/data/images/icons.svg index 24b49f4..b6c62f7 100644 --- a/www/data/images/icons.svg +++ b/www/data/images/icons.svg @@ -9,4 +9,8 @@ + + + + \ No newline at end of file diff --git a/www/index.php b/www/index.php index be3637d..4516e54 100644 --- a/www/index.php +++ b/www/index.php @@ -191,4 +191,3 @@ try { //TODO programs add [license] //TODO last 3 blog entries on /index/ (?) //TODO global uncached error logger -> send by mail -//TODO crosslinks to /about/ (goodreads, github, reddit, gitea, delphipraxis, stackoverflow) diff --git a/www/pages/about.php b/www/pages/about.php index 347d72c..f3b6a5e 100644 --- a/www/pages/about.php +++ b/www/pages/about.php @@ -23,19 +23,24 @@ global $OPTIONS;

About mikescher.com

+ +
About me
-

Welcome to my private homepage.

-

My name is Mike, and this is my homepage. I use it to upload programs I have written and sometimes for a little bit of blogging.

-

There are also sections about Project Euler, self-printed books and more

+

Welcome to my Mikescher.com

+

This is my personal homepage, I use it to upload programs I have written, web serials I have style-setted and sometimes for a little bit of blogging.

+

Its mostly just a collection of stuff I wanted to put only, but I guess thats the core of most personal homepages

+
+ +
My git timeline
@@ -47,6 +52,48 @@ global $OPTIONS;
+ + +
+
Other addresses
+ +
+ + + + + + Github + + + + + + Goodreads + + + + + + Stackoverflow + + + + + + Reddit + + + + + + Delphi-Praxis + + +
+ +
+ diff --git a/www/pages/programs_view.php b/www/pages/programs_view.php index ebe031f..760409c 100644 --- a/www/pages/programs_view.php +++ b/www/pages/programs_view.php @@ -52,16 +52,16 @@ if ($prog === NULL) httpError(404, 'Program not found'); $url) { - if ($type === 'download') echo 'Download'; - if ($type === 'github') echo 'Github'; - if ($type === 'homepage') echo 'Homepage'; - if ($type === 'wiki') echo 'Wiki'; - if ($type === 'playstore') echo 'Google Playstore'; - if ($type === 'amazonappstore') echo 'Amazon Appstore'; - if ($type === 'windowsstore') echo 'Microsoft Store'; - if ($type === 'itunesstore') echo 'App Store'; - if ($type === 'sourceforge') echo 'Sourceforge'; - if ($type === 'alternativeto') echo 'AlternativeTo'; + if ($type === 'download') echo 'Download'; + if ($type === 'github') echo 'Github'; + if ($type === 'homepage') echo 'Homepage'; + if ($type === 'wiki') echo 'Wiki'; + if ($type === 'playstore') echo 'Google Playstore'; + if ($type === 'amazonappstore') echo 'Amazon Appstore'; + if ($type === 'windowsstore') echo 'Microsoft Store'; + if ($type === 'itunesstore') echo 'App Store'; + if ($type === 'sourceforge') echo 'Sourceforge'; + if ($type === 'alternativeto') echo 'AlternativeTo'; } ?>