Commit: 6bbc54ca90f36ee00c3e023a78099478c6b5ac84

Author: alkemann | Date: 2009-11-19 01:06:35 +0100
moved away from seperate css rules to one set of colours
diff --git a/views/layouts/default.html.php b/views/layouts/default.html.php index 9449848..98c4d56 100644 --- a/views/layouts/default.html.php +++ b/views/layouts/default.html.php @@ -15,15 +15,10 @@ <head> <?php echo $this->html->charset(); ?> <title>Li3 Paste Bin</title> - <?php echo $this->html->style('bin'); ?> + <?php echo $this->html->style('bin.0.3'); ?> <?php echo $this->scripts(); ?> <?php echo $this->html->link('Icon', null, array('type' => 'icon')); ?> <?php echo $this->html->script(array('jquery-1.3.2.min.js', 'ZeroClipboard.js', 'bin.js')); ?> - <?php - if (isset($paste) && $paste->language) { - echo $this->html->style('syntax.' . $paste->language); - } - ?> </head> <body> <div id="container"> diff --git a/webroot/css/bin.0.3.css b/webroot/css/bin.0.3.css new file mode 100644 index 0000000..e69a1b8 --- /dev/null +++ b/webroot/css/bin.0.3.css @@ -0,0 +1,146 @@ +* { + margin: 0; + padding: 0; +} + +html { + height:100%; +} +body { + min-height:101%; +} +html, body { + margin:0; + padding:0; + background:white url(../img/accent.png) no-repeat bottom right fixed; + color:#333; + font-family:Helvetica, Arial, sans-serif; +} +a { + color: #333; +} +p { + margin-top: 1em; +} +h1 { + margin: 0; + color: #555; +} +#menu { + float: right; + margin: 30px 50px 0 0; +} +#menu ul { + list-style: none; +} +#menu li { + display: inline; + padding: 5px 5px 2px; + background-color: white; +} +#menu a { +} + +div#content { + margin: 0 30px; +} +h2 { + font-size: 20px; +} +h3 { + font-size: 12px; + font-weight: normal; +} +ul.latest, ul.latest li { + margin: 1em; +} +input[type=text] { + display: block; + width: 70%; + padding: 1px 3px; + font-size: 110%; +} +input[type=submit] { + display: block; + width: auto; + font-size: 110%; +} +input[type=checkbox] { + margin: 10px 0 0 0px; +} +select { + display:block; +} +textarea { + display: block; + width: 70%; + padding: 0 0 0 3px ; + font-size: 110%; +} +label { + font-size: 85%; +} +label.required, div.required label { + font-weight: bold; +} +div#paste, div#clean { + margin: 10px 0 10px 30px; + padding: 4px; + border-top: 2px solid #333333; + border-right: 2px solid #AAAAAA; + border-bottom: 2px solid #AAAAAA; + border-left: 2px solid #333333; + background-color: white; +} +a#toggle { + margin-left: 2em; +} +div#footer { + position: absolute; + padding: 30px 0 35px; + text-align: center; + font-size: 70%; + bottom: 0; + right: 20px; +} + +pre.debug { + background-color: orange; + padding: 15px 5px; + display: block; +} +li.li1 { + background-color: white; +} +li.li2 { + background-color: #eee; +} +a { + text-decoration: underline; +} +.kw0, .kw1, .kw2, .kw3, .kw4 { + color: black; + font-weight: bold; +} +.br0, .br1, .br2, .br3, .br4 { + font-weight: bold; + color: blue; +} +.re0, .re1, .re2, .re3, .re4{ + color: magenta; +} +.st_h, .st0, .st1, .st2, .st3, .st4 { + color:red; +} + +.me0, .me1, .me2, .me3, .me4 { + color: green; +} + +.sy0, .sy1, .sy2, .sy3, .sy4 { + font-weight: bold; +} +/* code comment */ +.co1, .co2, .co3, .co4 { + color: #888; +} diff --git a/webroot/css/bin.css b/webroot/css/bin.css deleted file mode 100644 index 091b79b..0000000 --- a/webroot/css/bin.css +++ /dev/null @@ -1,117 +0,0 @@ -* { - margin: 0; - padding: 0; -} - -html { - height:100%; -} -body { - min-height:101%; -} -html, body { - margin:0; - padding:0; - background:white url(../img/accent.png) no-repeat bottom right fixed; - color:#333; - font-family:Helvetica, Arial, sans-serif; -} -a { - color: #333; -} -p { - margin-top: 1em; -} -h1 { - margin: 0; - color: #555; -} -#menu { - float: right; - margin: 30px 50px 0 0; -} -#menu ul { - list-style: none; -} -#menu li { - display: inline; - padding: 5px 5px 2px; - background-color: white; -} -#menu a { -} - -div#content { - margin: 0 30px; -} -h2 { - font-size: 20px; -} -h3 { - font-size: 12px; - font-weight: normal; -} -ul.latest, ul.latest li { - margin: 1em; -} -input[type=text] { - display: block; - width: 70%; - padding: 1px 3px; - font-size: 110%; -} -input[type=submit] { - display: block; - width: auto; - font-size: 110%; -} -input[type=checkbox] { - margin: 10px 0 0 0px; -} -select { - display:block; -} -textarea { - display: block; - width: 70%; - padding: 0 0 0 3px ; - font-size: 110%; -} -label { - font-size: 85%; -} -label.required, div.required label { - font-weight: bold; -} -div#paste, div#clean { - margin: 10px 0 10px 30px; - padding: 4px; - border-top: 2px solid #333333; - border-right: 2px solid #AAAAAA; - border-bottom: 2px solid #AAAAAA; - border-left: 2px solid #333333; - background-color: white; -} -a#toggle { - margin-left: 2em; -} -div#footer { - position: absolute; - padding: 30px 0 35px; - text-align: center; - font-size: 70%; - bottom: 0; - right: 20px; -} - -pre.debug { - background-color: orange; - padding: 15px 5px; - display: block; -} -li.li1 { - background-color: white; -} -li.li2 { - background-color: #eee; -} \ No newline at end of file diff --git a/webroot/css/syntax.html.css b/webroot/css/syntax.html.css deleted file mode 100644 index 79dcd2a..0000000 --- a/webroot/css/syntax.html.css +++ /dev/null @@ -1,48 +0,0 @@ -/** - * CSS rules for GeSHI paste bin - * - */ - -/* keyword 2 -*/ -.kw1, .kw2 { - color: black; - font-weight: bold; -} -/* linked keyword*/ -a { - text-decoration: underline; -} -.kw3, .kw4 { - color: blue; - font-weight: bold; -} - -/* -*/ -.br0 { - font-weight: bold; -} -/* -*/ -.re0 { - color: blue; -} -/* -*/ -.st_h { - color:red; -} -/* -*/ -.me1 { - color: green; -} -/* */ -.sy0 { - font-weight: bold; -} -/* code comment */ -.co1, .co2, .co3, .co4 { - color: #888; -} diff --git a/webroot/css/syntax.javascript.css b/webroot/css/syntax.javascript.css deleted file mode 100644 index 20d8d24..0000000 --- a/webroot/css/syntax.javascript.css +++ /dev/null @@ -1,53 +0,0 @@ -/** - * CSS rules for GeSHI paste bin - * - */ - -/* keyword 2 -class extends etc -*/ -.kw1, .kw2, .kw3, .kw4 { - color: blue; - font-weight: bold; -} -/* linked keyword*/ -a { - text-decoration: underline; -} -.kw3, .kw4 { - color: blue; - font-weight: bold; -} - -/* break points -{ [ ] } -*/ -.br0 { - font-weight: bold; -} -/* variable names -$name $id -*/ -.re0 { - color: blue; -} -/* strings -'dfs' "sdfs" -*/ -.st_h, .st0 { - color:red; -} -/* class methods -->link( -*/ -.me1 { - color: green; -} -/* -> => ; */ -.sy0 { - font-weight: bold; -} -/* code comment */ -.co1, .co2, .co3, .co4 { - color: #888; -}