From b03fd560b6f9c50837bbde5799edc8aebbee3a2c Mon Sep 17 00:00:00 2001 From: Andrew Senetar Date: Sun, 14 Jul 2013 00:52:04 -0400 Subject: [PATCH] Update app stylesheet, remove hardcoded favicon New version of stylesheets now with pygments styles. Favicon now uses FAVICON configuration parameter to set path. --- static/css/app.css | 66 ++++++++++++++++++ static/images/favicon.ico | Bin 14118 -> 0 bytes static/sass/app.scss | 1 + .../voltaicideas/components/_scrollbar.scss | 47 ------------- .../pelican-red/_iconSettings.scss | 1 + .../sass/voltaicideas/pelican-red/_icons.scss | 4 +- .../pelican-red/_pygments-github.scss | 65 +++++++++++++++++ 7 files changed, 136 insertions(+), 48 deletions(-) delete mode 100644 static/images/favicon.ico delete mode 100644 static/sass/voltaicideas/components/_scrollbar.scss create mode 100644 static/sass/voltaicideas/pelican-red/_pygments-github.scss diff --git a/static/css/app.css b/static/css/app.css index fbc1331..0ec11dc 100644 --- a/static/css/app.css +++ b/static/css/app.css @@ -517,8 +517,10 @@ table tr th, table tr td { padding: 0.5625em 0.625em; font-size: 0.875em; color: table tr.even, table tr.alt, table tr:nth-of-type(even) { background: #f9f9f9; } table thead tr th, table tfoot tr th, table tbody tr td, table tr td, table tfoot tr td { display: table-cell; line-height: 1.125em; } +/* Icon Font */ @font-face { font-family: "pelican-red"; src: url('../fonts/pelican-red.eot'); src: url('../fonts/pelican-red.eot?#iefix') format('eot'), url('../fonts/pelican-red.woff') format('woff'), url('../fonts/pelican-red.ttf') format('truetype'), url('../fonts/pelican-red.svg') format('svg'); font-weight: normal; font-style: normal; } +/* Icon font Styles */ [class*="icon-"] { background-image: none; background-position: 0% 0%; background-repeat: repeat; display: inline; height: auto; width: auto; vertical-align: baseline; line-height: 1; margin-top: 0; speak: none; font-family: "pelican-red"; font-style: normal; font-weight: normal; font-variant: normal; text-transform: none; text-decoration: inherit; -webkit-font-smoothing: antialiased; } [class*="icon-"]:before { text-decoration: inherit; display: inline-block; speak: none; } @@ -563,6 +565,7 @@ a [class*="icon-"]:before { display: inline; } .animate-spin { -webkit-animation: spin 2s infinite linear; -moz-animation: spin 2s infinite linear; -o-animation: spin 2s infinite linear; animation: spin 2s infinite linear; } +/* Icon Font List */ .icon-grooveshark:before { content: "\e805"; } .icon-reddit:before { content: "\e804"; } @@ -643,6 +646,69 @@ a [class*="icon-"]:before { display: inline; } .icon-link:before { content: "\e81b"; } +/* Pygments Code Highlight */ +.highlight .hll { background-color: #ffffcc; } +.highlight .c { color: #999988; font-style: italic; } +.highlight .err { color: #a61717; background-color: #e3d2d2; } +.highlight .k { color: #000000; font-weight: bold; } +.highlight .o { color: #000000; font-weight: bold; } +.highlight .cm { color: #999988; font-style: italic; } +.highlight .cp { color: #999999; font-weight: bold; font-style: italic; } +.highlight .c1 { color: #999988; font-style: italic; } +.highlight .cs { color: #999999; font-weight: bold; font-style: italic; } +.highlight .gd { color: #000000; background-color: #ffdddd; } +.highlight .ge { color: #000000; font-style: italic; } +.highlight .gr { color: #aa0000; } +.highlight .gh { color: #999999; } +.highlight .gi { color: #000000; background-color: #ddffdd; } +.highlight .go { color: #888888; } +.highlight .gp { color: #555555; } +.highlight .gs { font-weight: bold; } +.highlight .gu { color: #aaaaaa; } +.highlight .gt { color: #aa0000; } +.highlight .kc { color: #000000; font-weight: bold; } +.highlight .kd { color: #000000; font-weight: bold; } +.highlight .kn { color: #000000; font-weight: bold; } +.highlight .kp { color: #000000; font-weight: bold; } +.highlight .kr { color: #000000; font-weight: bold; } +.highlight .kt { color: #445588; font-weight: bold; } +.highlight .m { color: #009999; } +.highlight .s { color: #d01040; } +.highlight .na { color: teal; } +.highlight .nb { color: #0086b3; } +.highlight .nc { color: #445588; font-weight: bold; } +.highlight .no { color: teal; } +.highlight .nd { color: #3c5d5d; font-weight: bold; } +.highlight .ni { color: purple; } +.highlight .ne { color: #990000; font-weight: bold; } +.highlight .nf { color: #990000; font-weight: bold; } +.highlight .nl { color: #990000; font-weight: bold; } +.highlight .nn { color: #555555; } +.highlight .nt { color: navy; } +.highlight .nv { color: teal; } +.highlight .ow { color: #000000; font-weight: bold; } +.highlight .w { color: #bbbbbb; } +.highlight .mf { color: #009999; } +.highlight .mh { color: #009999; } +.highlight .mi { color: #009999; } +.highlight .mo { color: #009999; } +.highlight .sb { color: #d01040; } +.highlight .sc { color: #d01040; } +.highlight .sd { color: #d01040; } +.highlight .s2 { color: #d01040; } +.highlight .se { color: #d01040; } +.highlight .sh { color: #d01040; } +.highlight .si { color: #d01040; } +.highlight .sx { color: #d01040; } +.highlight .sr { color: #009926; } +.highlight .s1 { color: #d01040; } +.highlight .ss { color: #990073; } +.highlight .bp { color: #999999; } +.highlight .vc { color: teal; } +.highlight .vg { color: teal; } +.highlight .vi { color: teal; } +.highlight .il { color: #009999; } + html { height: 100%; } body { height: 100%; } diff --git a/static/images/favicon.ico b/static/images/favicon.ico deleted file mode 100644 index 5810b4963002702d349b807eb45f69aa67b63f24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14118 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 diff --git a/static/sass/app.scss b/static/sass/app.scss index d4575ac..035f9fa 100644 --- a/static/sass/app.scss +++ b/static/sass/app.scss @@ -44,6 +44,7 @@ // VoltaicIdeas Imports $set: 'pelican-red'; @import "voltaicideas/pelican-red/icons"; // icon fonts +@import "voltaicideas/pelican-red/pygments-github"; // pygments css @import "compass/css3/box-shadow"; @import "compass/css3/border-radius"; diff --git a/static/sass/voltaicideas/components/_scrollbar.scss b/static/sass/voltaicideas/components/_scrollbar.scss deleted file mode 100644 index fdc3522..0000000 --- a/static/sass/voltaicideas/components/_scrollbar.scss +++ /dev/null @@ -1,47 +0,0 @@ -// -// RangerTBC Style Components -// - -// Scrollbar Component components/_scrollbar.scss -// Version: 0.1 -// Created By: Andrew Senetar -// Date: May, 22 2013 -// Used: Google+ Style as Starting Point - -//// Variables - -//// Mixins - -// this was going to be more cool? -@mixin scrollbar(){ - ::-webkit-scrollbar{ - width: 12px; - height: 12px; - } - ::-webkit-scrollbar-button,{ - height: 0; - width: 0; - } - ::-webkit-scrollbar-track{ - border: solid transparent; - background-color: #f5f5f5; - } - ::-webkit-scrollbar-track-piece { - background-color: #f5f5f5; - @include box-shadow(inset 1px 0 0 rgba(0,0,0,.14),inset -1px 0 0 rgba(0,0,0,.07)); - } - ::-webkit-scrollbar-thumb { - min-height: 30px; - background-color: rgba(0,0,0,0.2); - border: none; - @include box-shadow(inset 1px 1px 0 rgba(0,0,0,.1),inset 0 -1px 0 rgba(0,0,0,.07)); - &:hover{ - background-color: rgba(0,0,0,0.4); - } - } -} - -//// Style - -//scrollbar styling -@include scrollbar(); \ No newline at end of file diff --git a/static/sass/voltaicideas/pelican-red/_iconSettings.scss b/static/sass/voltaicideas/pelican-red/_iconSettings.scss index 9f2947f..5575e08 100644 --- a/static/sass/voltaicideas/pelican-red/_iconSettings.scss +++ b/static/sass/voltaicideas/pelican-red/_iconSettings.scss @@ -58,3 +58,4 @@ $iconDark: #333 !default; normal, normal); } + diff --git a/static/sass/voltaicideas/pelican-red/_icons.scss b/static/sass/voltaicideas/pelican-red/_icons.scss index 0eaa51a..dd3cedd 100644 --- a/static/sass/voltaicideas/pelican-red/_icons.scss +++ b/static/sass/voltaicideas/pelican-red/_icons.scss @@ -10,10 +10,11 @@ @import "voltaicideas/pelican-red/iconSettings"; +/* Icon Font */ @include face(#{$set}); //@font-face //// global icon styles (from Foundation Icons + Font Awesome) - +/* Icon font Styles */ [class*="#{$classPrefix}"] { background-image: none; background-position: 0% 0%; @@ -130,5 +131,6 @@ a [class*="#{$classPrefix}"]:before { } //// Actual Icons +/* Icon Font List */ @import "voltaicideas/pelican-red/_iconList.scss" diff --git a/static/sass/voltaicideas/pelican-red/_pygments-github.scss b/static/sass/voltaicideas/pelican-red/_pygments-github.scss new file mode 100644 index 0000000..e215e6d --- /dev/null +++ b/static/sass/voltaicideas/pelican-red/_pygments-github.scss @@ -0,0 +1,65 @@ +/* Pygments Code Highlight */ + +.highlight { + .hll { background-color: #ffffcc } + .c { color: #999988; font-style: italic } // Comment + .err { color: #a61717; background-color: #e3d2d2 } // Error + .k { color: #000000; font-weight: bold } // Keyword + .o { color: #000000; font-weight: bold } // Operator + .cm { color: #999988; font-style: italic } // Comment.Multiline + .cp { color: #999999; font-weight: bold; font-style: italic } // Comment.Preproc + .c1 { color: #999988; font-style: italic } // Comment.Single + .cs { color: #999999; font-weight: bold; font-style: italic } // Comment.Special + .gd { color: #000000; background-color: #ffdddd } // Generic.Deleted + .ge { color: #000000; font-style: italic } // Generic.Emph + .gr { color: #aa0000 } // Generic.Error + .gh { color: #999999 } // Generic.Heading + .gi { color: #000000; background-color: #ddffdd } // Generic.Inserted + .go { color: #888888 } // Generic.Output + .gp { color: #555555 } // Generic.Prompt + .gs { font-weight: bold } // Generic.Strong + .gu { color: #aaaaaa } // Generic.Subheading + .gt { color: #aa0000 } // Generic.Traceback + .kc { color: #000000; font-weight: bold } // Keyword.Constant + .kd { color: #000000; font-weight: bold } // Keyword.Declaration + .kn { color: #000000; font-weight: bold } // Keyword.Namespace + .kp { color: #000000; font-weight: bold } // Keyword.Pseudo + .kr { color: #000000; font-weight: bold } // Keyword.Reserved + .kt { color: #445588; font-weight: bold } // Keyword.Type + .m { color: #009999 } // Literal.Number + .s { color: #d01040 } // Literal.String + .na { color: #008080 } // Name.Attribute + .nb { color: #0086B3 } // Name.Builtin + .nc { color: #445588; font-weight: bold } // Name.Class + .no { color: #008080 } // Name.Constant + .nd { color: #3c5d5d; font-weight: bold } // Name.Decorator + .ni { color: #800080 } // Name.Entity + .ne { color: #990000; font-weight: bold } // Name.Exception + .nf { color: #990000; font-weight: bold } // Name.Function + .nl { color: #990000; font-weight: bold } // Name.Label + .nn { color: #555555 } // Name.Namespace + .nt { color: #000080 } // Name.Tag + .nv { color: #008080 } // Name.Variable + .ow { color: #000000; font-weight: bold } // Operator.Word + .w { color: #bbbbbb } // Text.Whitespace + .mf { color: #009999 } // Literal.Number.Float + .mh { color: #009999 } // Literal.Number.Hex + .mi { color: #009999 } // Literal.Number.Integer + .mo { color: #009999 } // Literal.Number.Oct + .sb { color: #d01040 } // Literal.String.Backtick + .sc { color: #d01040 } // Literal.String.Char + .sd { color: #d01040 } // Literal.String.Doc + .s2 { color: #d01040 } // Literal.String.Double + .se { color: #d01040 } // Literal.String.Escape + .sh { color: #d01040 } // Literal.String.Heredoc + .si { color: #d01040 } // Literal.String.Interpol + .sx { color: #d01040 } // Literal.String.Other + .sr { color: #009926 } // Literal.String.Regex + .s1 { color: #d01040 } // Literal.String.Single + .ss { color: #990073 } // Literal.String.Symbol + .bp { color: #999999 } // Name.Builtin.Pseudo + .vc { color: #008080 } // Name.Variable.Class + .vg { color: #008080 } // Name.Variable.Global + .vi { color: #008080 } // Name.Variable.Instance + .il { color: #009999 } // Literal.Number.Integer.Long +}