From beb7c0fa7161e435fe796170a2ba3b238a690bad Mon Sep 17 00:00:00 2001 From: Sami Samhuri Date: Sun, 19 Dec 2010 18:37:31 -0800 Subject: [PATCH] merge github finder css into proj.css directly --- GithubFinder/css/code_highlighter.css | 28 ------- GithubFinder/styles.css | 70 ----------------- assets/proj.css | 109 ++++++++++++++++++++++++++ templates/proj/proj/index.html | 2 - 4 files changed, 109 insertions(+), 100 deletions(-) delete mode 100644 GithubFinder/css/code_highlighter.css delete mode 100644 GithubFinder/styles.css diff --git a/GithubFinder/css/code_highlighter.css b/GithubFinder/css/code_highlighter.css deleted file mode 100644 index 1775476..0000000 --- a/GithubFinder/css/code_highlighter.css +++ /dev/null @@ -1,28 +0,0 @@ -#code.Dark { background-color: #191919; color: white; } -#code.Dark .comment { color: #5E5A5F; } -#code.Dark .string { color: #93996D; } -#code.Dark .keywords { color: #CAA76F;} -#code.Dark .brackets { color: #F5F8F8; } -#code.Dark .symbol { color: #C06F52; } - -/* CSS */ -#code.Dark .properties { color: #C4AD7A} -#code.Dark .selectors { color: #977042 } - - - - -#code.Light { background-color: white; color: black; } -#code.Light .comment { color: green; } -#code.Light .string { color: teal; } -#code.Light .keywords { color: navy; font-weight: bold; } -#code.Light .brackets { color: navy; } -#code.Light .symbol { font-weight: bold; } - -/* CSS */ -#code.Light .properties { color: #C4AD7A} -#code.Light .selectors { color: #977042 } - -/* CPP */ -#code.Ligh .datatype { color: #006699; } -#code.Dark .datatype { font-weight: bold;} \ No newline at end of file diff --git a/GithubFinder/styles.css b/GithubFinder/styles.css deleted file mode 100644 index dbf81cf..0000000 --- a/GithubFinder/styles.css +++ /dev/null @@ -1,70 +0,0 @@ -#gh-finder { font-size: 12px; font-family: Helvetica, Verdana, sans-serif; margin: 3em auto 1em; padding: 0; width: 92% } -#gh-finder .clear { clear:both } -#gh-finder a { color: #22a; text-decoration: none; border-bottom: none } -#gh-finder a:active { outline: none } -#gh-finder :focus { -moz-outline-style: none; outline: none;} -#gh-finder .p { padding: 10px; } -#gh-finder img { border: 0px} - -#finder { width: 100%; overflow: hidden; height: 343px } - -#r_w { width: 100%; background-color: #EAEAEA; border-bottom: 1px solid #CCC } -.tbb { border-bottom: 3px solid #CCC;} /* thick bottom border */ - - -/* logo */ -.big { font-size: 14px; font-weight: bold;} -#r_w { -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; border-top-right-radius: 7px; - -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px; border-top-left-radius: 7px - } -#in { color: transparent; padding: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px } -#in.on { background-color: #4F4A45; color: white } - -#b_w { overflow: hidden; overflow-x: auto; height: 300px } -.panel { float: left; width: 200px; border-right: 1px solid #CCC; overflow: hidden; overflow-y: auto; -height: 300px } - -.files { padding: 0; margin: 0; font-size: 1.3em } -.files li { list-style:none outside none; border-bottom: 1px solid #CCC; background-color: #F8F8F8; } - -.t { padding: 10px; border-bottom: 1px solid #CCC; font-size: 14px; font-weight: bold} /* title */ - -.tree { background: #F8F8F8 url('./img/la.gif') no-repeat 95% 50%; font-weight: bold; } -.ico { background:url('./img/txt.gif') no-repeat 3px 50%; display: block;} -.tree .ico { background-image: url('./img/dir.gif'); } -.cur { background: #3D8CFF url('./img/la_h.gif') no-repeat 95% 50% !important;} -#gh-finder .cur a { color: white;} -.blob { background-image: none !important; } -.files a { padding: 8px 8px 8px 23px; display:block; } - -#f_c_w .p {padding: 10px} -#f_c { overflow: hidden; } -#f_c_s { overflow-y: auto; } -#f { border: 1px solid #CCC; } - -#commits .big { padding: 10px; border-bottom: 1px solid #CCC;} - -/* commit entry */ -.ce { padding: 10px 0; border-bottom: 1px solid #CCC; } - -pre, #code, .meta, .diff { font:12px Monaco,monospace; margin: 0; } - -.meta, .diff thead th { background-color: #EEE; color:#333; overflow:hidden; padding:10px; border-bottom: 1px solid #CCC} -.meta span { margin-left: 5px; padding-left: 9px;} -.meta span:first-child { display: none } - -.ln, .diff th { background-color:#ECECEC; border-right:1px solid #DDD; color:#AAA; text-align: right; padding: 5px 5px } -#code { padding: 5px;} -/*.hover { background-color: #FFFFC7; }*/ - -.insert { background-color:#9E9 } - -#footer { padding: 10px } - - -/* extension stuff */ -.resize { cursor: col-resize; float: left; background-color: #DCDCDC;border-right: 1px solid #CCC;} -.hrz { cursor: row-resize !important; background-color: #DCDCDC; ;border-bottom: 1px solid #CCC;height: 3px; line-height: 3px; width: 99.9%} -#bml_w { float: right; font-size: 11px; width: 300px;} -.bml { border: 1px solid #CCC; padding: 1px; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; font-weight: bold;} -.bml:hover { background-color: white;} diff --git a/assets/proj.css b/assets/proj.css index 0d6759a..91bafa1 100644 --- a/assets/proj.css +++ b/assets/proj.css @@ -58,3 +58,112 @@ h4 { margin: 0.5em 0 0.7em } } #contributors-box a { line-height: 1.8em } + + +/* + * Github Finder + * + */ + +#gh-finder { font-size: 12px; font-family: Helvetica, Verdana, sans-serif; margin: 3em auto 1em; padding: 0; width: 92% } +#gh-finder .clear { clear:both } +#gh-finder a { color: #22a; text-decoration: none; border-bottom: none } +#gh-finder a:active { outline: none } +#gh-finder :focus { -moz-outline-style: none; outline: none;} +#gh-finder .p { padding: 10px; } +#gh-finder img { border: 0px} + +#finder { width: 100%; overflow: hidden; height: 343px } + +#r_w { width: 100%; background-color: #EAEAEA; border-bottom: 1px solid #CCC } +.tbb { border-bottom: 3px solid #CCC;} /* thick bottom border */ + + +/* logo */ +.big { font-size: 14px; font-weight: bold;} +#r_w { -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; border-top-right-radius: 7px; + -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px; border-top-left-radius: 7px + } +#in { color: transparent; padding: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px } +#in.on { background-color: #4F4A45; color: white } + +#b_w { overflow: hidden; overflow-x: auto; height: 300px } +.panel { float: left; width: 200px; border-right: 1px solid #CCC; overflow: hidden; overflow-y: auto; +height: 300px } + +.files { padding: 0; margin: 0; font-size: 1.3em } +.files li { list-style:none outside none; border-bottom: 1px solid #CCC; background-color: #F8F8F8; } + +.t { padding: 10px; border-bottom: 1px solid #CCC; font-size: 14px; font-weight: bold} /* title */ + +.tree { background: #F8F8F8 url('./img/la.gif') no-repeat 95% 50%; font-weight: bold; } +.ico { background:url('./img/txt.gif') no-repeat 3px 50%; display: block;} +.tree .ico { background-image: url('./img/dir.gif'); } +.cur { background: #3D8CFF url('./img/la_h.gif') no-repeat 95% 50% !important;} +#gh-finder .cur a { color: white;} +.blob { background-image: none !important; } +.files a { padding: 8px 8px 8px 23px; display:block; } + +#f_c_w .p {padding: 10px} +#f_c { overflow: hidden; } +#f_c_s { overflow-y: auto; } +#f { border: 1px solid #CCC; } + +#commits .big { padding: 10px; border-bottom: 1px solid #CCC;} + +/* commit entry */ +.ce { padding: 10px 0; border-bottom: 1px solid #CCC; } + +pre, #code, .meta, .diff { font:12px Monaco,monospace; margin: 0; } + +.meta, .diff thead th { background-color: #EEE; color:#333; overflow:hidden; padding:10px; border-bottom: 1px solid #CCC} +.meta span { margin-left: 5px; padding-left: 9px;} +.meta span:first-child { display: none } + +.ln, .diff th { background-color:#ECECEC; border-right:1px solid #DDD; color:#AAA; text-align: right; padding: 5px 5px } +#code { padding: 5px;} +/*.hover { background-color: #FFFFC7; }*/ + +.insert { background-color:#9E9 } + +#footer { padding: 10px } + + +/* extension stuff */ +.resize { cursor: col-resize; float: left; background-color: #DCDCDC;border-right: 1px solid #CCC;} +.hrz { cursor: row-resize !important; background-color: #DCDCDC; ;border-bottom: 1px solid #CCC;height: 3px; line-height: 3px; width: 99.9%} +#bml_w { float: right; font-size: 11px; width: 300px;} +.bml { border: 1px solid #CCC; padding: 1px; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; font-weight: bold;} +.bml:hover { background-color: white;} + + +/**** code highlighting ****/ + +#code.Dark { background-color: #191919; color: white; } +#code.Dark .comment { color: #5E5A5F; } +#code.Dark .string { color: #93996D; } +#code.Dark .keywords { color: #CAA76F;} +#code.Dark .brackets { color: #F5F8F8; } +#code.Dark .symbol { color: #C06F52; } + +/* CSS */ +#code.Dark .properties { color: #C4AD7A} +#code.Dark .selectors { color: #977042 } + + + + +#code.Light { background-color: white; color: black; } +#code.Light .comment { color: green; } +#code.Light .string { color: teal; } +#code.Light .keywords { color: navy; font-weight: bold; } +#code.Light .brackets { color: navy; } +#code.Light .symbol { font-weight: bold; } + +/* CSS */ +#code.Light .properties { color: #C4AD7A} +#code.Light .selectors { color: #977042 } + +/* CPP */ +#code.Light .datatype { color: #006699; } +#code.Dark .datatype { font-weight: bold;} \ No newline at end of file diff --git a/templates/proj/proj/index.html b/templates/proj/proj/index.html index e0310c4..e62eb32 100644 --- a/templates/proj/proj/index.html +++ b/templates/proj/proj/index.html @@ -4,8 +4,6 @@ {{name}} :: samhuri.net - -