Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use standard bootstrap css instead of less mixins.

  • Loading branch information...
commit c7fe18c3bcf63e7fcc07ddc3d4b1134a32ca0cf1 1 parent c1409fe
@jgm jgm authored
View
7 Makefile
@@ -15,10 +15,3 @@ clean:
veryclean: clean
rm -rf cabal-dev
-css: static/css/screen.css static/css/bootstrap.min.css
-
-static/css/bootstrap.min.css: bootstrap/less/bootstrap.less
- lessc --compress $@ > $@
-
-static/css/screen.css: data/screen.less
- lessc --compress --include-path=bootstrap/less $< > $@
View
119 Network/Gitit2.hs
@@ -283,65 +283,66 @@ makeDefaultPage layout content = do
atomLink (toMaster AtomSiteR) "Atom feed for the wiki"
toWidget $ [lucius|input.hidden { display: none; } |]
[whamlet|
- <div #container>
- <div #sidebar>
- <div #logo>
- <a href=@{toMaster HomeR}><img src=@{logoRoute} alt=logo></a>
- $if pgSiteNav layout
- <div .sitenav>
- <fieldset>
- <legend>Site
- <ul>
- <li><a href=@{toMaster HomeR}>_{MsgFrontPage}</a>
- <li><a href=@{toMaster IndexBaseR}>_{MsgDirectory}</a>
- <li><a href=@{toMaster CategoriesR}>_{MsgCategories}</a>
- <li><a href=@{toMaster RandomR}>_{MsgRandomPage}</a>
- <li><a href=@{toMaster $ ActivityR 1}>_{MsgRecentActivity}</a>
- <li><a href=@{toMaster UploadR}>_{MsgUploadFile}</a></li>
- <li><a href=@{toMaster AtomSiteR} type="application/atom+xml" rel="alternate" title="ATOM Feed">_{MsgAtomFeed}</a> <img alt="feed icon" src=@{feedRoute}>
- <li><a href=@{toMaster HelpR}>_{MsgHelp}</a></li>
- <form method="post" action=@{searchRoute} id="searchform">
- <input type="text" name="patterns" id="patterns">
- <input type="submit" name="search" id="search" value="_{MsgSearch}">
- <form method="post" action=@{goRoute} id="goform">
- <input type="text" name="gotopage" id="gotopage">
- <input type="submit" name="go" id="go" value="_{MsgGo}">
- $if pgPageTools layout
- <div .pagetools>
- $maybe page <- pgName layout
- <fieldset>
- <legend>This page</legend>
- <ul>
- <li><a href=@{toMaster $ RawR page}>_{MsgRawPageSource}</a>
- <li><a href="@{toMaster $ ViewR page}?print">_{MsgPrintableVersion}</a>
- <li><a href=@{toMaster $ DeleteR page}>_{MsgDeleteThisPage}</a>
- <li><a href=@{toMaster $ AtomPageR page} type="application/atom+xml" rel="alternate" title="This page's ATOM Feed">_{MsgAtomFeed}</a> <img alt="feed icon" src=@{feedRoute}>
- <form method="post" #exportbox action=@{toMaster $ ExportR page}>
- <select name="format">
- $forall (f,_) <- exportFormats
- <option value=#{f}>#{f}
- <input type="submit" id="export" name="export" value=_{MsgExport}>
- <div #maincol>
- <div #userbox>
- $maybe page <- pgName layout
- <ul .tabs>
- $if showTab ViewTab
- $if isDiscussPage page
- <li class=#{tabClass ViewTab}>
- <a href=@{toMaster $ ViewR $ discussedPage page}>_{MsgPage}</a>
- $else
- <li class=#{tabClass ViewTab}>
- <a href=@{toMaster $ ViewR page}>_{MsgView}</a>
- $if showTab EditTab
- <li class=#{tabClass EditTab}>
- <a href=@{toMaster $ EditR page}>_{MsgEdit}</a>
- $if showTab HistoryTab
- <li class=#{tabClass HistoryTab}>
- <a href=@{toMaster $ HistoryR 1 page}>_{MsgHistory}</a>
- $if showTab DiscussTab
- <li class=#{tabClass DiscussTab}><a href=@{toMaster $ ViewR $ discussPageFor page}>_{MsgDiscuss}</a>
- <div #content>
- ^{content}
+ <div .container>
+ <div .row>
+ <div #sidebar .span2>
+ <div #logo>
+ <a href=@{toMaster HomeR}><img src=@{logoRoute} alt=logo></a>
+ $if pgSiteNav layout
+ <div .sitenav>
+ <fieldset>
+ <legend>Site
+ <ul>
+ <li><a href=@{toMaster HomeR}>_{MsgFrontPage}</a>
+ <li><a href=@{toMaster IndexBaseR}>_{MsgDirectory}</a>
+ <li><a href=@{toMaster CategoriesR}>_{MsgCategories}</a>
+ <li><a href=@{toMaster RandomR}>_{MsgRandomPage}</a>
+ <li><a href=@{toMaster $ ActivityR 1}>_{MsgRecentActivity}</a>
+ <li><a href=@{toMaster UploadR}>_{MsgUploadFile}</a></li>
+ <li><a href=@{toMaster AtomSiteR} type="application/atom+xml" rel="alternate" title="ATOM Feed">_{MsgAtomFeed}</a> <img alt="feed icon" src=@{feedRoute}>
+ <li><a href=@{toMaster HelpR}>_{MsgHelp}</a></li>
+ <form method="post" action=@{searchRoute} id="searchform">
+ <input type="text" name="patterns" id="patterns">
+ <input type="submit" name="search" id="search" value="_{MsgSearch}">
+ <form method="post" action=@{goRoute} id="goform">
+ <input type="text" name="gotopage" id="gotopage">
+ <input type="submit" name="go" id="go" value="_{MsgGo}">
+ $if pgPageTools layout
+ <div .pagetools>
+ $maybe page <- pgName layout
+ <fieldset>
+ <legend>This page</legend>
+ <ul>
+ <li><a href=@{toMaster $ RawR page}>_{MsgRawPageSource}</a>
+ <li><a href="@{toMaster $ ViewR page}?print">_{MsgPrintableVersion}</a>
+ <li><a href=@{toMaster $ DeleteR page}>_{MsgDeleteThisPage}</a>
+ <li><a href=@{toMaster $ AtomPageR page} type="application/atom+xml" rel="alternate" title="This page's ATOM Feed">_{MsgAtomFeed}</a> <img alt="feed icon" src=@{feedRoute}>
+ <form method="post" #exportbox action=@{toMaster $ ExportR page}>
+ <select name="format">
+ $forall (f,_) <- exportFormats
+ <option value=#{f}>#{f}
+ <input type="submit" id="export" name="export" value=_{MsgExport}>
+ <div #maincol .span8>
+ <div #userbox>
+ $maybe page <- pgName layout
+ <ul .tabs>
+ $if showTab ViewTab
+ $if isDiscussPage page
+ <li class=#{tabClass ViewTab}>
+ <a href=@{toMaster $ ViewR $ discussedPage page}>_{MsgPage}</a>
+ $else
+ <li class=#{tabClass ViewTab}>
+ <a href=@{toMaster $ ViewR page}>_{MsgView}</a>
+ $if showTab EditTab
+ <li class=#{tabClass EditTab}>
+ <a href=@{toMaster $ EditR page}>_{MsgEdit}</a>
+ $if showTab HistoryTab
+ <li class=#{tabClass HistoryTab}>
+ <a href=@{toMaster $ HistoryR 1 page}>_{MsgHistory}</a>
+ $if showTab DiscussTab
+ <li class=#{tabClass DiscussTab}><a href=@{toMaster $ ViewR $ discussPageFor page}>_{MsgDiscuss}</a>
+ <div #content>
+ ^{content}
|]
-- HANDLERS and utility functions, not exported:
View
7 README.markdown
@@ -69,10 +69,3 @@ add to the code.
* The executable, which uses the library, is in `src/gitit.hs`.
* There are no longer any templates. The HTML is produced
by hamlet code in `Network/Gitit.hs`.
-* To change the css, modify `data/screen.less`, then do
- `make css`. This requires that you have `lessc` in your
- path: `npm install -g less`. It also requires bootstrap,
- which is included as a git submodule:
- `git submodule update --init`.
-
-
View
172 data/screen.less
@@ -1,172 +0,0 @@
-@import "bootstrap.less";
-
-#container {
- .makeRow();
- #userbox { .makeColumn(2,8); }
- .makeRow();
- #sidebar { .makeColumn(2); }
- #maincol { .makeColumn(8); }
-}
-
-html { background: #f9f9f9; color: black; }
-body { margin: 10px; }
-
-label { display: block; }
-textarea, input[type='text'], input[type='password'], select { border: 1px solid #ccc; background: #fff; }
-textarea:hover, input[type='text']:hover, input[type='password']:hover, select:hover { border-color: #aaa; }
-textarea:focus, input[type='text']:focus, input[type='password']:focus, select:focus { border-color: #888; outline: 2px solid #ffffaa; }
-input, select { cursor: pointer; }
-input[type='text'] { cursor: text; }
-textarea, input { padding: .3em .4em .15em .4em; }
-select { padding: .1em .2em 0 .2em; }
-option { padding: 0 .4em; }
-table, tr, td, th { border: none; }
-hr { height: 1px; color: #aaa; background-color: #aaa; border: 0; margin: .2em 0 .2em 0; }
-
-h1, h2, h3, h4, h5, h6 { font-weight: normal; border-bottom: 1px solid black; }
-
-h1.pageTitle { font-size: 197%; margin: 0.2em 0 .5em; }
-
-h1 { font-size: 153.9%; margin: 1.07em 0 .535em; }
-h2 { font-size: 138.5%; margin: 1.14em 0 .57em; }
-h3 { font-size: 123.1%; margin: 1.23em 0 .615em; }
-h4 { font-size: 116%; margin: 1.33em 0 .67em; }
-h5 { font-size: 108%; margin: 1.6em 0 .8em; }
-h6 { font-size: 100%; margin: 1.6em 0 .8em; }
-
-strong { font-weight: bold; }
-ul { list-style-type: square; }
-dt { font-weight: bold; margin-bottom: .1em; }
-
-optgroup{ font-weight: normal; }
-abbr, acronym { border-bottom:1px dotted #000; cursor:help; }
-em { font-style: italic; }
-del { text-decoration: line-through; }
-
-blockquote, ul, ol, dl { margin: 1em; }
-ol, ul, dl { margin-left: 2em; }
-dl dd { margin-left: 1em; }
-th, td { padding: .5em; }
-th { font-weight: bold; }
-caption { margin-bottom: .5em; text-align: center; }
-sup { vertical-align: super; }
-sub { vertical-align: sub; }
-sub, sup { line-height: 0.3em; }
-p, fieldset, table, pre { margin-bottom: 1em; }
-button, input[type="checkbox"], input[type="radio"], input[type="reset"], input[type="submit"] { padding: 1px; }
-
-blockquote { padding: 0 1.6em; color: #666; }
-
-a:link { text-decoration: underline; color: #36c; }
-a:visited { text-decoration: underline; color: #99c; }
-a:hover { text-decoration: underline; color: #c33; }
-a:active, a:focus { text-decoration: underline; color: #000; }
-
-input.search_term { width: 95% }
-
-button:hover, a.button:hover { background-color:#dff4ff; border:1px solid #c2e1ef; color:#336699; }
-a.button:active, button:active { background-color:#6299c5; border:1px solid #6299c5; color:#fff; }
-
-h1 > a:link, h1 > a:active, h1 > a:hover, h1 > a:focus, h1 > a:visited,
-h2 > a:link, h2 > a:active, h2 > a:hover, h2 > a:focus, h2 > a:visited,
-h3 > a:link, h3 > a:active, h3 > a:hover, h3 > a:focus, h3 > a:visited,
-h4 > a:link, h4 > a:active, h4 > a:hover, h4 > a:focus, h4 > a:visited,
-h5 > a:link, h5 > a:active, h5 > a:hover, h5 > a:focus, h5 > a:visited,
-h6 > a:link, h6 > a:active, h6 > a:hover, h6 > a:focus, h6 > a:visited {
- color: black; text-decoration: none; }
-
-#content { border: 1px solid #ccc; background-color: #fff; padding: 1em; font-size: 108%; }
-#content p, #content pre, #content li { line-height: 140%; }
-
-#userbox { text-align: right; font-weight: bold; margin: 1em; }
-
-#logo { min-height: 50px; }
-
-#sidebar fieldset { background-color: white; margin-bottom: 1em; padding: 0; font-size: 93%; }
-#sidebar fieldset, #sidebar fieldset legend { font-weight: normal; }
-#sidebar legend { font-size: 120%; }
-#sidebar ul { padding: 0; margin: 0; margin-left: 1.6em; line-height: 1.5em; }
-#sidebar ul li { color: #888; list-style: square; }
-
-div#TOC { background-color: #f9f9f9; border: 10px solid white; margin: 0.8em; margin-right: 0; padding: 0.4em; }
-#TOC ul { padding: 0 0 0 1em; margin: 0; list-style: none; }
-
-#sidebar input, #sidebar select { font-size: 93%; padding: 0.1em; }
-#sidebar input[type='submit'] { border: none; background-color: #ccc; color: white; }
-
-#exportbox select { width: 8.5em; border: 1px solid #ccc; padding: 0; }
-#exportbox { margin: 0.3em 0 0.5em 0.4em; padding: 0; }
-
-#footer { padding: 1em; color: #888; text-align: center; font-size: 93%; }
-
-#searchform { padding: 0; margin: 0.3em 0 0.5em 0.4em; }
-#searchform input[type='text'] { width: 8.5em; border: 1px solid #ccc; }
-
-div#categories { padding: 0em; margin: 1em 0 0 0; border: 1px dashed #ccc; }
-#categories ul > li { display: inline; padding-right: 1em; }
-
-#editform textarea { height: 25em; width: 98%; font-family: monospace; font-size: 93%; }
-#editform input[type='text'] { width: 98%; }
-#editform #logMsg { width: 98%; margin-right: 1em; margin-bottom: 0.3em; }
-
-#uploadform input[type='text'] { width: 98%; }
-#uploadform label { margin-top: 0.6em; }
-#uploadform label { margin-top: 0.6em; }
-#uploadform input[type='submit'] { margin-top: 0.6em; }
-
-#goform { padding: 0; margin: 0.3em 0 0.5em 0.4em; }
-#goform input[type='text'] { width: 8.5em; border: 1px solid #ccc; }
-
-div.errors { color: red; font-weight: bold; }
-p.message { color: red; font-weight: bold; }
-
-.search_result { margin-bottom: 15px; }
-.search_result .match { margin-bottom: 15px; }
-
-code { font-size: 93%; }
-pre.matches { margin: 0; padding: 0; }
-#pattern { background-color: yellow; font-weight: bold; }
-pre.matches span.highlighted { background-color: yellow; }
-
-span.added { background-color: yellow; }
-span.deleted { text-decoration: line-through; color: gray; }
-
-/* .req is used to hide a honeypot in a form */
-.req { display: none; }
-
-ul.tabs { padding: 0; margin: 0 0 1px 0; }
-ul.tabs li { display: inline; border: 1px solid #ccc; border-bottom: none; padding: 0 0.6em 0 0.6em;
- margin: 0 0 0 1.2em; background: white; }
-ul.tabs li.selected { border-bottom: 3px solid white; }
-ul.tabs li a { text-decoration: none; font-size: 93%; font-weight: bold; margin: 0; color: #36c; }
-
-.index ul { list-style: none; margin: 0; padding: 0; }
-.index li { list-style: none; background-position: 0 1px; background-repeat: no-repeat; padding-left: 20px; }
-.index li.page { background-image: url(../img/icons/page.png); }
-.index li.folder { background-image: url(../img/icons/folder.png); }
-.index a { color: #000000; cursor: pointer; text-decoration: none; }
-.index a:hover { text-decoration: underline; }
-
-a.updir { font-weight: bold; }
-
-h2.revision { font-size: 100%; color: #888; font-style: italic; border: none; margin: 0 0 0.5em 0; padding: 0; }
-
-div.markupHelp pre { font-size: 77%; overflow: auto; }
-
-.login { display: none; }
-
-/* Style the footnotes; from gwern.net */
-#footnotediv div {
-background-color: white;
-padding: 3px;
-padding: 12px;
-max-width: 800px;
-border: 1px solid #CDBBB5;
-box-shadow: #555 0 0 10px;
--webkit-box-shadow: #555 0 0 10px;
--moz-box-shadow: 0 0 10px #555;
-}
-/* Deal with multiple footnotes one after another; Charuru */
-sup + sup { margin-left: 2px; }
-
-p.pagination { text-align: center; font-size: 200%; font-weight: bold; }
View
3  gitit2.cabal
@@ -27,8 +27,7 @@ data-files: README.markdown
static/img/glyphicons-halflings.png
static/img/glyphicons-halflings-white.png
static/css/custom.css
- static/css/ie.css
- static/css/reset-fonts-grids.css
+ static/css/bootstrap.min.css
static/css/hk-pyg.css
static/css/print.css
static/css/screen.css
View
9 static/css/bootstrap.min.css
9 additions, 0 deletions not shown
View
1,135 static/css/screen.css
166 additions, 969 deletions not shown
Please sign in to comment.
Something went wrong with that request. Please try again.