diff --git a/hledger-web/Foundation.hs b/hledger-web/Foundation.hs index 43c1d715b..b03852ae8 100644 --- a/hledger-web/Foundation.hs +++ b/hledger-web/Foundation.hs @@ -124,7 +124,6 @@ instance Yesod App where -- hamletToRepHtml $(hamletFile "templates/default-layout-wrapper.hamlet") pc <- widgetToPageContent $ do - $(widgetFile "normalize") addStylesheet $ StaticR css_bootstrap_min_css -- load these things early, in HEAD: toWidgetHead [hamlet| diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 5a7a5567b..be2ddc10d 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -92,10 +92,6 @@ extra-source-files: static/js/typeahead.bundle.min.js templates/default-layout-wrapper.hamlet templates/default-layout.hamlet - templates/homepage.hamlet - templates/homepage.julius - templates/homepage.lucius - templates/normalize.lucius source-repository head type: git diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 8ca9172dc..75aee67e1 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -98,10 +98,6 @@ extra-source-files: - static/js/typeahead.bundle.min.js - templates/default-layout-wrapper.hamlet - templates/default-layout.hamlet - - templates/homepage.hamlet - - templates/homepage.julius - - templates/homepage.lucius - - templates/normalize.lucius # XXX not supported # flag threaded diff --git a/hledger-web/templates/homepage.hamlet b/hledger-web/templates/homepage.hamlet deleted file mode 100644 index e4f458032..000000000 --- a/hledger-web/templates/homepage.hamlet +++ /dev/null @@ -1,38 +0,0 @@ -

_{MsgHello} - -
    -
  1. Now that you have a working project you should use the # - \Yesod book to learn more. # - You can also use this scaffolded site to explore some basic concepts. - -
  2. This page was generated by the #{handlerName} handler in # - \Handler/Home.hs. - -
  3. The #{handlerName} handler is set to generate your site's home screen in Routes file # - config/routes - -
  4. The HTML you are seeing now is actually composed by a number of widgets, # - most of them are brought together by the defaultLayout function which # - is defined in the Foundation.hs module, and used by #{handlerName}. # - All the files for templates and wigdets are in templates. - -
  5. - A Widget's Html, Css and Javascript are separated in three files with the # - \.hamlet, .lucius and .julius extensions. - -
  6. If you had javascript enabled then you wouldn't be seeing this. - -
  7. - This is an example trivial Form. Read the # - \Forms chapter # - on the yesod book to learn more about them. - $maybe (info,con) <- submission -
    - Your file's type was #{fileContentType info}. You say it has: #{con} -
    - ^{formWidget} - - -
  8. And last but not least, Testing. In tests/main.hs you will find a # - test suite that performs tests on this page. # - You can run your tests by doing: 
    yesod test
    diff --git a/hledger-web/templates/homepage.julius b/hledger-web/templates/homepage.julius deleted file mode 100644 index efae7990d..000000000 --- a/hledger-web/templates/homepage.julius +++ /dev/null @@ -1 +0,0 @@ -document.getElementById("#{aDomId}").innerHTML = "This text was added by the Javascript part of the homepage widget."; diff --git a/hledger-web/templates/homepage.lucius b/hledger-web/templates/homepage.lucius deleted file mode 100644 index 54986f816..000000000 --- a/hledger-web/templates/homepage.lucius +++ /dev/null @@ -1,6 +0,0 @@ -h1 { - text-align: center -} -h2##{aDomId} { - color: #990 -} diff --git a/hledger-web/templates/normalize.lucius b/hledger-web/templates/normalize.lucius deleted file mode 100644 index 9fc7ae4df..000000000 --- a/hledger-web/templates/normalize.lucius +++ /dev/null @@ -1,439 +0,0 @@ -/*! normalize.css 2011-08-12T17:28 UTC ยท http://github.com/necolas/normalize.css */ - -/* ============================================================================= - HTML5 display definitions - ========================================================================== */ - -/* - * Corrects block display not defined in IE6/7/8/9 & FF3 - */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} - -/* - * Corrects inline-block display not defined in IE6/7/8/9 & FF3 - */ - -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} - -/* - * Prevents modern browsers from displaying 'audio' without controls - */ - -audio:not([controls]) { - display: none; -} - -/* - * Addresses styling for 'hidden' attribute not present in IE7/8/9, FF3, S4 - * Known issue: no IE6 support - */ - -[hidden] { - display: none; -} - - -/* ============================================================================= - Base - ========================================================================== */ - -/* - * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units - * http://clagnut.com/blog/348/#c790 - * 2. Keeps page centred in all browsers regardless of content height - * 3. Prevents iOS text size adjust after orientation change, without disabling user zoom - * www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/ - */ - -html { - font-size: 100%; /* 1 */ - overflow-y: scroll; /* 2 */ - -webkit-text-size-adjust: 100%; /* 3 */ - -ms-text-size-adjust: 100%; /* 3 */ -} - -/* - * Addresses margins handled incorrectly in IE6/7 - */ - -body { - margin: 0; -} - -/* - * Addresses font-family inconsistency between 'textarea' and other form elements. - */ - -body, -button, -input, -select, -textarea { - font-family: sans-serif; -} - - -/* ============================================================================= - Links - ========================================================================== */ - -a { - color: #00e; -} - -a:visited { - color: #551a8b; -} - -/* - * Addresses outline displayed oddly in Chrome - */ - -a:focus { - outline: thin dotted; -} - -/* - * Improves readability when focused and also mouse hovered in all browsers - * people.opera.com/patrickl/experiments/keyboard/test - */ - -a:hover, -a:active { - outline: 0; -} - - -/* ============================================================================= - Typography - ========================================================================== */ - -/* - * Addresses styling not present in IE7/8/9, S5, Chrome - */ - -abbr[title] { - border-bottom: 1px dotted; -} - -/* - * Addresses style set to 'bolder' in FF3/4, S4/5, Chrome -*/ - -b, -strong { - font-weight: bold; -} - -blockquote { - margin: 1em 40px; -} - -/* - * Addresses styling not present in S5, Chrome - */ - -dfn { - font-style: italic; -} - -/* - * Addresses styling not present in IE6/7/8/9 - */ - -mark { - background: #ff0; - color: #000; -} - -/* - * Corrects font family set oddly in IE6, S4/5, Chrome - * en.wikipedia.org/wiki/User:Davidgothberg/Test59 - */ - -pre, -code, -kbd, -samp { - font-family: monospace, serif; - _font-family: 'courier new', monospace; - font-size: 1em; -} - -/* - * Improves readability of pre-formatted text in all browsers - */ - -pre { - white-space: pre; - white-space: pre-wrap; - word-wrap: break-word; -} - -/* - * 1. Addresses CSS quotes not supported in IE6/7 - * 2. Addresses quote property not supported in S4 - */ - -/* 1 */ - -q { - quotes: none; -} - -/* 2 */ - -q:before, -q:after { - content: ''; - content: none; -} - -small { - font-size: 75%; -} - -/* - * Prevents sub and sup affecting line-height in all browsers - * gist.github.com/413930 - */ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - - -/* ============================================================================= - Lists - ========================================================================== */ - -ul, -ol { - margin: 1em 0; - padding: 0 0 0 40px; -} - -dd { - margin: 0 0 0 40px; -} - -nav ul, -nav ol { - list-style: none; - list-style-image: none; -} - - -/* ============================================================================= - Embedded content - ========================================================================== */ - -/* - * 1. Removes border when inside 'a' element in IE6/7/8/9 - * 2. Improves image quality when scaled in IE7 - * code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/ - */ - -img { - border: 0; /* 1 */ - -ms-interpolation-mode: bicubic; /* 2 */ -} - -/* - * Corrects overflow displayed oddly in IE9 - */ - -svg:not(:root) { - overflow: hidden; -} - - -/* ============================================================================= - Figures - ========================================================================== */ - -/* - * Addresses margin not present in IE6/7/8/9, S5, O11 - */ - -figure { - margin: 0; -} - - -/* ============================================================================= - Forms - ========================================================================== */ - -/* - * Corrects margin displayed oddly in IE6/7 - */ - -form { - margin: 0; -} - -/* - * Define consistent margin and padding - */ - -fieldset { - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; -} - -/* - * 1. Corrects color not being inherited in IE6/7/8/9 - * 2. Corrects alignment displayed oddly in IE6/7 - */ - -legend { - border: 0; /* 1 */ - *margin-left: -7px; /* 2 */ -} - -/* - * 1. Corrects font size not being inherited in all browsers - * 2. Addresses margins set differently in IE6/7, F3/4, S5, Chrome - * 3. Improves appearance and consistency in all browsers - */ - -button, -input, -select, -textarea { - font-size: 100%; /* 1 */ - margin: 0; /* 2 */ - vertical-align: baseline; /* 3 */ - *vertical-align: middle; /* 3 */ -} - -/* - * 1. Addresses FF3/4 setting line-height using !important in the UA stylesheet - * 2. Corrects inner spacing displayed oddly in IE6/7 - */ - -button, -input { - line-height: normal; /* 1 */ - *overflow: visible; /* 2 */ -} - -/* - * Corrects overlap and whitespace issue for buttons and inputs in IE6/7 - * Known issue: reintroduces inner spacing - */ - -table button, -table input { - *overflow: auto; -} - -/* - * 1. Improves usability and consistency of cursor style between image-type 'input' and others - * 2. Corrects inability to style clickable 'input' types in iOS - */ - -button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; /* 1 */ - -webkit-appearance: button; /* 2 */ -} - -/* - * 1. Addresses box sizing set to content-box in IE8/9 - * 2. Addresses excess padding in IE8/9 - */ - -input[type="checkbox"], -input[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} - -/* - * 1. Addresses appearance set to searchfield in S5, Chrome - * 2. Addresses box sizing set to border-box in S5, Chrome (include -moz to future-proof) - */ - -input[type="search"] { - -webkit-appearance: textfield; /* 1 */ - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; /* 2 */ - box-sizing: content-box; -} - -/* - * Corrects inner padding displayed oddly in S5, Chrome on OSX - */ - -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/* - * Corrects inner padding and border displayed oddly in FF3/4 - * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/ - */ - -button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; - padding: 0; -} - -/* - * 1. Removes default vertical scrollbar in IE6/7/8/9 - * 2. Improves readability and alignment in all browsers - */ - -textarea { - overflow: auto; /* 1 */ - vertical-align: top; /* 2 */ -} - - -/* ============================================================================= - Tables - ========================================================================== */ - -/* - * Remove most spacing between table cells - */ - -table { - border-collapse: collapse; - border-spacing: 0; -}