1. Carl Meyer
  2. django-project-template

Commits

eriiicam  committed 04658ac

updated gems

  • Participants
  • Parent commits 90062a7
  • Branches default

Comments (0)

Files changed (4)

File .hgignore

View file
 ^deploy/servers-new.py$
 ^site_media/
 \.DS_Store$
-^sass/\.sass-cache/
+^.sass-cache/
 ^\.obc_env$
 ^djangodb.sqlite$
 .git/

File requirements/gems.txt

View file
-sass==3.1.0.alpha.217
+sass==3.1.0.alpha.214
 compass==0.11.beta.0
 compass-susy-plugin==0.8.1
 compass-rgbapng==0.1.1
-chunky_png==0.10.5
+chunky_png==0.10.5
+compass-slickmap==0.4.0

File static/css/print.css

View file
 @charset "UTF-8";
-/* Reset --------------------------------------------------------------*/
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; outline: 0; font-weight: inherit; font-style: inherit; font-size: 100%; font-family: inherit; vertical-align: baseline; }
-
-body { line-height: 1; color: black; background: white; }
-
-ol, ul { list-style: none; }
-
-table { border-collapse: separate; border-spacing: 0; vertical-align: middle; }
-
-caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; }
-
-q, blockquote { quotes: "" ""; }
-q:before, q:after, blockquote:before, blockquote:after { content: ""; }
-
-a img { border: none; }
-
-/* HTML5 Reset --------------------------------------------------------------*/
-article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { margin: 0; padding: 0; border: 0; outline: 0; display: block; }
-
-/* Typography -------------------------------------------------------------- */
-/* The following classes are for use with @extend. */
-html { text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; }
-
-.serif, body { font-family: Cambria, Georgia, serif; }
-
-.sans { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; }
-
-.mono, pre, code, tt { font-family: "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, Courier, monospace, sans-serif; }
-
-.caps, .allcaps, h1, h2, caption, .smallcaps, h4 { letter-spacing: 0.1em; }
-
-.allcaps, h1, h2, caption { text-transform: uppercase; }
-
-.smallcaps, h4 { font-variant: small-caps; }
-
-/* Body -------------------------------------------------------------- */
-body { color: #4c4c4c; }
-
-/* Selected Text -------------------------------------------------------------- */
-/* -moz- must be declared separately */
-::-moz-selection { color: white; background: #005498; text-shadow: none; }
-
-::selection { color: white; background: #005498; text-shadow: none; }
-
-/* Links -------------------------------------------------------------- */
-a:link, a:visited { color: #005498; }
-a:link, a:visited, a:hover, a:active { outline: none; }
-a:focus, a:hover, a:active { color: #984400; text-decoration: none; }
-a:focus { outline: thin dotted; }
-
-/* Headings -------------------------------------------------------------- */
-h2, h3, h4, h5, h6 { margin-bottom: 1.5em; }
-
-h1 { font-size: 1.313em; line-height: 1.143em; margin-bottom: 1.143em; }
-
-h3 { font-weight: bold; }
-
-h4 { text-transform: lowercase; }
-
-h5, h6 { font-style: italic; }
-
-/* Inline -------------------------------------------------------------- */
-cite, em, dfn, address, i { font-style: italic; }
-
-strong, dfn, b { font-weight: bold; }
-
-sup, sub { font-size: smaller; line-height: 0; }
-
-sup { vertical-align: super; }
-
-sub { vertical-align: sub; }
-
-abbr, acronym { border-bottom: 1px dotted; cursor: help; }
-
-ins { text-decoration: underline; }
-
-del { text-decoration: line-through; }
-
-mark { background: #ffff99; background-color: rgba(255, 255, 0, 0.5); text-shadow: none; }
-
-small { font-size: 0.75em; line-height: 2em; }
-
-q { font-style: italic; }
-q em { font-style: normal; }
-
-/* Block -------------------------------------------------------------- */
-p { margin-bottom: 1.5em; }
-
-pre { margin: 1.5em; white-space: pre; white-space: pre-wrap; white-space: pre-line; word-wrap: break-word; }
-
-blockquote { margin: 1.5em; font-style: italic; }
-
-/* Replaced -------------------------------------------------------------- */
-img { vertical-align: text-bottom; max-width: 100%; -ms-interpolation-mode: bicubic; }
-
-/* Lists -------------------------------------------------------------- */
-ol, ul, dl { margin-bottom: 1.5em; margin-left: 1.5em; }
-
-ol { list-style: decimal; }
-
-ul { list-style: disc; }
-li ul { list-style-type: circle; }
-
-dt { margin-top: 1.5em; font-style: italic; }
-
-dd { padding-left: 1.5em; }
-
-/* Tables -------------------------------------------------------------- */
-/* tables still need 'cellspacing="0"' in the markup */
-table { margin-bottom: 1.5em; width: 100%; border-collapse: separate; border-spacing: 0; }
-
-table, td, th { vertical-align: top; }
-
-th, thead th { font-weight: bold; }
-
-th, td, caption { padding: 0.75em; text-align: left; font-weight: normal; }
-
-table, th { border-bottom-style: solid; border-bottom-width: 0.063em; padding-bottom: 0.688em; }
-
-tfoot { font-size: 0.875em; line-height: 1.714em; }
-
-/* Forms -------------------------------------------------------------- */
-fieldset { margin-bottom: 1.5em; border-style: solid; border-width: 0.063em; padding: 1.438em; }
-
-legend { font-size: 1.125em; line-height: 1.333em; font-weight: bold; }
-
-input[type="radio"], input[type="checkbox"] { vertical-align: baseline; }
-
-label, input[type=button], input[type=submit], button { cursor: pointer; }
-
-label { font-weight: bold; }
-
-input, button, textarea, select, optgroup { margin: 0; padding: 0; border: 0; outline: 0; }
-
-.textinput, textarea, input[type=text], input[type=password], input[type=email], input[type=url], input[type=tel], input[type=date], input[type=datetime], input[type=datetime-local], input[type=month], input[type=week], input[type=time], input[type=number], input[type=range], input[type=search], input[type=color] { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 0.875em; line-height: 1.714em; border-style: solid; border-width: 0.071em; padding: 0.357em; margin-bottom: 0.75em; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; width: 100%; border-color: #4c4c4c; height: 2.571em; }
-
-input:invalid, textarea:invalid { -moz-border-radius: 1px; -webkit-border-radius: 1px; -o-border-radius: 1px; -ms-border-radius: 1px; -khtml-border-radius: 1px; border-radius: 1px; -moz-box-shadow: red 0 0 0.25em 0; -webkit-box-shadow: red 0 0 0.25em 0; -o-box-shadow: red 0 0 0.25em 0; box-shadow: red 0 0 0.25em 0; }
-.no-boxshadow input:invalid, .no-boxshadow textarea:invalid { background-color: #f0dddd; }
-
-textarea { height: 11.143em; vertical-align: text-bottom; }
-
-input[type=search] { -webkit-appearance: none; }
-input[type=search]::-webkit-search-decoration { display: none; }
-
-button { width: auto; overflow: visible; }
-
 /* Print Defaults -------------------------------------------------------------- */
 nav { display: none; }
 
 
 a:link, a:visited { color: #444444 !important; text-decoration: underline; }
 a:after { content: " (" attr(href) ") "; font-size: smaller; }
+a:after[href^="#"] { content: ""; display: none; }
 
 abbr:after { content: " (" attr(title) ")"; font-size: smaller; }
 

File static/css/screen.css

View file
 
 .textinput, textarea, input[type=text], input[type=password], input[type=email], input[type=url], input[type=tel], input[type=date], input[type=datetime], input[type=datetime-local], input[type=month], input[type=week], input[type=time], input[type=number], input[type=range], input[type=search], input[type=color] { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 0.875em; line-height: 1.714em; border-style: solid; border-width: 0.071em; padding: 0.357em; margin-bottom: 0.75em; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; width: 100%; border-color: #4c4c4c; height: 2.571em; }
 
-input:invalid, textarea:invalid { -moz-border-radius: 1px; -webkit-border-radius: 1px; -o-border-radius: 1px; -ms-border-radius: 1px; -khtml-border-radius: 1px; border-radius: 1px; -moz-box-shadow: red 0 0 0.25em 0; -webkit-box-shadow: red 0 0 0.25em 0; -o-box-shadow: red 0 0 0.25em 0; box-shadow: red 0 0 0.25em 0; }
+input:invalid, textarea:invalid { -moz-border-radius: 1px; -webkit-border-radius: 1px; -o-border-radius: 1px; -ms-border-radius: 1px; -khtml-border-radius: 1px; border-radius: 1px; -moz-box-shadow: 0 0 0.25em red; -webkit-box-shadow: 0 0 0.25em red; -o-box-shadow: 0 0 0.25em red; box-shadow: 0 0 0.25em red; }
 .no-boxshadow input:invalid, .no-boxshadow textarea:invalid { background-color: #f0dddd; }
 
 textarea { height: 11.143em; vertical-align: text-bottom; }
 
 button { width: auto; overflow: visible; }
 
-/* Mixins are slightly modified from Benjamin Doherty's first implementations: http://gist.github.com/377912 rgba-background mixin can now be passed an option $dir variable
-*/
 /* Helpers ------------------------------------------------------------------- */
 .full, header[role="banner"], div[role="main"], footer[role="contentinfo"] { clear: both; margin-right: 1.639%; margin-left: 1.639%; *zoom: 1; }
 .full:after, header[role="banner"]:after, div[role="main"]:after, footer[role="contentinfo"]:after { content: "\0020"; display: block; height: 0; clear: both; overflow: hidden; visibility: hidden; }