diff --git a/Makefile b/Makefile index 3184a9a..0c45bf2 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ all: clean css stamp clean: @# clean scss @printf "\033[31m RM \033[0m%s\n" src/public/css - @rm -f src/public/css/*.css + @rm -fr src/public/css/* @git stash -- src/public/css/prism.css > /dev/null @# clean stamps diff --git a/src/public/css/bucket/legacy.css b/src/public/css/bucket/legacy.css deleted file mode 100644 index 9075e82..0000000 --- a/src/public/css/bucket/legacy.css +++ /dev/null @@ -1 +0,0 @@ -#webring{height:5px} diff --git a/src/public/css/ie/boxsizing.css b/src/public/css/ie/boxsizing.css deleted file mode 100644 index 1301de2..0000000 --- a/src/public/css/ie/boxsizing.css +++ /dev/null @@ -1 +0,0 @@ -*{behavior:url(boxsizing.htc)} diff --git a/src/public/css/ie/ie.css b/src/public/css/ie/ie.css index 2ff327a..b39dc37 100644 --- a/src/public/css/ie/ie.css +++ b/src/public/css/ie/ie.css @@ -1 +1 @@ -#header .ie-nav{margin-left:90px}#main .col{display:block !important;width:100% !important}#main .col.left{padding-right:0 !important}#main .section .heading{background:#366199 !important}#main #post .posted,#main #writeup .posted{margin-top:16px}#main #comments #new_comment{width:400px}#main #comments #new_comment #author,#main #comments #new_comment #content{width:400px !important}#main table{behavior:url(boxsizing.htc)} +#header .ie-nav{margin-left:90px}#main .col{display:block;width:100%}#main .col.left{padding-right:0}#main .section h2.heading{background:#366199}#main #post .posted,#main #writeup .posted{margin-top:16px}#main #comments form,#main #comments form#new_comment{width:400px}#main #comments form input,#main #comments form input#author,#main #comments form input#content,#main #comments form#new_comment input,#main #comments form#new_comment input#author,#main #comments form#new_comment input#content{width:400px}#main table{behavior:url(boxsizing.htc)} diff --git a/src/public/css/ie/ie4.css b/src/public/css/ie/ie4.css new file mode 100644 index 0000000..d0b006b --- /dev/null +++ b/src/public/css/ie/ie4.css @@ -0,0 +1 @@ +#header #nav li{padding:0px !important;margin:0px !important;margin-top:16px} diff --git a/src/public/css/ie/ie5.css b/src/public/css/ie/ie5.css deleted file mode 100644 index c533312..0000000 --- a/src/public/css/ie/ie5.css +++ /dev/null @@ -1 +0,0 @@ -.ie-nav{margin-left:90px}#main .col{display:block !important;width:100% !important}#main .left{padding-right:0 !important;padding-bottom:16px}#main .right{margin-top:16px}#new_comment{width:400px}#new_comment .input{width:400px} diff --git a/src/public/css/ie/ie6.css b/src/public/css/ie/ie6.css index e19ec4e..809bdc0 100644 --- a/src/public/css/ie/ie6.css +++ b/src/public/css/ie/ie6.css @@ -1 +1 @@ -*{behavior:url(boxsizing.htc)}body #main .col.left{margin-bottom:16px}body #main .col.right{margin-top:16px !important}body #contact{margin-bottom:0 !important}body #footer{margin-top:16px !important} +*{behavior:url(boxsizing.htc)}body #main .coldiv.left{margin-bottom:16px}body #main .coldiv.right{margin-top:16px}body div#contact{margin-bottom:0}body div#footer{margin-top:16px} diff --git a/src/public/css/ie/ie6.scss.css b/src/public/css/ie/ie6.scss.css deleted file mode 100644 index 1301de2..0000000 --- a/src/public/css/ie/ie6.scss.css +++ /dev/null @@ -1 +0,0 @@ -*{behavior:url(boxsizing.htc)} diff --git a/src/public/css/ie/main.css b/src/public/css/ie/main.css deleted file mode 100644 index c533312..0000000 --- a/src/public/css/ie/main.css +++ /dev/null @@ -1 +0,0 @@ -.ie-nav{margin-left:90px}#main .col{display:block !important;width:100% !important}#main .left{padding-right:0 !important;padding-bottom:16px}#main .right{margin-top:16px}#new_comment{width:400px}#new_comment .input{width:400px} diff --git a/src/scss/blog.scss b/src/scss/blog.scss index 415530a..6fad483 100644 --- a/src/scss/blog.scss +++ b/src/scss/blog.scss @@ -42,7 +42,8 @@ } } - #new_comment { + form, /* ie4 */ + form#new_comment { margin-left: $inner-gap; max-width: 400px; padding-right: $inner-gap; @@ -53,6 +54,7 @@ input#author, input#content { + display: block; width: 100%; } diff --git a/src/scss/ie/ie.scss b/src/scss/ie/ie.scss index bf8cc4f..f65d6b9 100644 --- a/src/scss/ie/ie.scss +++ b/src/scss/ie/ie.scss @@ -10,18 +10,18 @@ #main { .col { - display: block !important; - width: 100% !important; + display: block; + width: 100%; &.left { - padding-right: 0 !important; + padding-right: 0; } } .section { - .heading { - background: $blue !important; + h2.heading { + background: $blue; } } @@ -33,12 +33,15 @@ } #comments { - #new_comment { + form, /* ie4 */ + form#new_comment { + width: 400px; - #author, - #content { - width: 400px !important; + input, + input#author, + input#content { + width: 400px; } } } diff --git a/src/scss/ie/ie4.scss b/src/scss/ie/ie4.scss new file mode 100644 index 0000000..e2335a7 --- /dev/null +++ b/src/scss/ie/ie4.scss @@ -0,0 +1,16 @@ +/* IE 4 Only */ + +@import "../variables"; + +/** + * Display inner block does not seem to work on thead + * li elements in IE4, so just make the list vertical + */ + +#header { + #nav li { + padding: 0px !important; + margin: 0px !important; + margin-top: $inner-gap; + } +} diff --git a/src/scss/ie/ie6.scss b/src/scss/ie/ie6.scss index 2731e24..a443956 100644 --- a/src/scss/ie/ie6.scss +++ b/src/scss/ie/ie6.scss @@ -20,22 +20,22 @@ body { #main { .col { - &.left { + &div.left { margin-bottom: $inner-gap; } - &.right { - margin-top: $inner-gap !important; + &div.right { + margin-top: $inner-gap; } } } - #contact { - margin-bottom: 0 !important; + div#contact { + margin-bottom: 0; } - #footer { - margin-top: $inner-gap !important; + div#footer { + margin-top: $inner-gap; } } diff --git a/src/web/_model/blog.php b/src/web/_model/blog.php index c91bfa8..94ca049 100644 --- a/src/web/_model/blog.php +++ b/src/web/_model/blog.php @@ -42,7 +42,7 @@ class Blog_model extends Model { $base = $this->get_url(''); $replace = ""; - $replace .= IE_START . "\"\\2\"" . IE_END; + $replace .= ie('
') . "\"\\2\"" . ie('
'); $replace .= "
"; $md = preg_replace($pattern, $replace, $md); diff --git a/src/web/_views/comments.php b/src/web/_views/comments.php index bf30ec5..0828753 100644 --- a/src/web/_views/comments.php +++ b/src/web/_views/comments.php @@ -18,24 +18,24 @@

- -
+
+ placeholder="">
- - + ')?> diff --git a/src/web/_views/head.php b/src/web/_views/head.php index e54fd1c..f184953 100644 --- a/src/web/_views/head.php +++ b/src/web/_views/head.php @@ -21,15 +21,17 @@ "> "> - + link_css('css/main.css');?> + embed_css('css/ie/ie.css'))?> + embed_css('css/ie/ie4.css'), 4)?> embed_css($file); ?> + ')?> link_js($file); ?> + ')?> diff --git a/src/web/_views/header.php b/src/web/_views/header.php index c06cef8..90a31ea 100644 --- a/src/web/_views/header.php +++ b/src/web/_views/header.php @@ -1,13 +1,10 @@ view('head', $data); - echo $this->link_css('css/main.css'); ?> - +')?>