diff --git a/.dir-locals.el b/.dir-locals.el index e45b751..6e5111e 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -1,3 +1,6 @@ ((haskell-mode . ((haskell-indent-spaces . 4) (haskell-process-use-ghci . t))) - (hamlet-mode . ((hamlet/basic-offset . 4)))) + (hamlet-mode . ((hamlet/basic-offset . 4) + (haskell-process-use-ghci . t))) + (html-mode . ((haskell-process-use-ghci . t))) + (css-mode . ((haskell-process-use-ghci . t)))) diff --git a/Foundation.hs b/Foundation.hs index f472812..3255d08 100644 --- a/Foundation.hs +++ b/Foundation.hs @@ -1,24 +1,25 @@ module Foundation where -import ClassyPrelude.Yesod -import Yesod.Auth -import Yesod.Auth.BrowserId -import Yesod.Auth.GoogleEmail -import Yesod.Default.Config -import Yesod.Default.Util (addStaticContentExternal) -import qualified Settings -import Settings.Development (development) +import ClassyPrelude.Yesod +import Data.BlobStore +import Data.Slug (safeMakeSlug, HasGenIO (getGenIO), randomSlug, Slug) +import Data.Text (Text) import qualified Database.Persist -import Settings.StaticFiles -import Settings (widgetFile, Extra (..)) -import Model -import Text.Jasmine (minifym) -import Text.Hamlet (hamletFile) -import Yesod.Core.Types (Logger) -import Data.Slug (safeMakeSlug, HasGenIO (getGenIO), randomSlug, Slug) +import Model +import qualified Settings +import Settings (widgetFile, Extra (..)) +import Settings.Development (development) +import Settings.StaticFiles import qualified System.Random.MWC as MWC -import Data.BlobStore -import Types +import Text.Hamlet (hamletFile) +import Text.Jasmine (minifym) +import Types +import Yesod.Auth +import Yesod.Auth.BrowserId +import Yesod.Auth.GoogleEmail +import Yesod.Core.Types (Logger) +import Yesod.Default.Config +import Yesod.Default.Util (addStaticContentExternal) -- | The site argument for your application. This can be a good place to -- keep settings and values requiring initialization before your application diff --git a/Import.hs b/Import.hs index 89398c5..bd3f557 100644 --- a/Import.hs +++ b/Import.hs @@ -2,11 +2,12 @@ module Import ( module Import ) where -import ClassyPrelude.Yesod as Import -import Foundation as Import -import Model as Import -import Types as Import -import Settings as Import -import Settings.Development as Import -import Settings.StaticFiles as Import -import Yesod.Auth as Import +import ClassyPrelude.Yesod as Import +import Data.Text as Import (Text) +import Foundation as Import +import Model as Import +import Settings as Import +import Settings.Development as Import +import Settings.StaticFiles as Import +import Types as Import +import Yesod.Auth as Import diff --git a/design/favicon.svg b/design/favicon.svg new file mode 100644 index 0000000..ad8fab9 --- /dev/null +++ b/design/favicon.svg @@ -0,0 +1,91 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + S + + + + + diff --git a/static/css/bootstrap.css b/static/css/bootstrap.css index b725064..23194e5 100644 --- a/static/css/bootstrap.css +++ b/static/css/bootstrap.css @@ -36,8 +36,8 @@ width: 100%; min-height: 30px; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } article, @@ -68,7 +68,7 @@ audio:not([controls]) { html { font-size: 100%; -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; } a:focus { @@ -154,8 +154,8 @@ input[type="checkbox"] { input[type="search"] { -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; -webkit-appearance: textfield; } @@ -243,8 +243,8 @@ a:focus { .img-rounded { -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .img-polaroid { @@ -253,14 +253,14 @@ a:focus { border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); } .img-circle { -webkit-border-radius: 500px; - -moz-border-radius: 500px; - border-radius: 500px; + -moz-border-radius: 500px; + border-radius: 500px; } .row { @@ -289,103 +289,79 @@ a:focus { .navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { - width: 940px; + width: 724px; } - .span12 { - width: 940px; + width: 724px; } - .span11 { - width: 860px; + width: 662px; } - .span10 { - width: 780px; + width: 600px; } - .span9 { - width: 700px; + width: 538px; } - .span8 { - width: 620px; + width: 476px; } - .span7 { - width: 540px; + width: 414px; } - .span6 { - width: 460px; + width: 352px; } - .span5 { - width: 380px; + width: 290px; } - .span4 { - width: 300px; + width: 228px; } - .span3 { - width: 220px; + width: 166px; } - .span2 { - width: 140px; + width: 104px; } - .span1 { - width: 60px; + width: 42px; } - .offset12 { - margin-left: 980px; + margin-left: 764px; } - .offset11 { - margin-left: 900px; + margin-left: 702px; } - .offset10 { - margin-left: 820px; + margin-left: 640px; } - .offset9 { - margin-left: 740px; + margin-left: 578px; } - .offset8 { - margin-left: 660px; + margin-left: 516px; } - .offset7 { - margin-left: 580px; + margin-left: 454px; } - .offset6 { - margin-left: 500px; + margin-left: 392px; } - .offset5 { - margin-left: 420px; + margin-left: 330px; } - .offset4 { - margin-left: 340px; + margin-left: 268px; } - .offset3 { - margin-left: 260px; + margin-left: 206px; } - .offset2 { - margin-left: 180px; + margin-left: 144px; } - .offset1 { - margin-left: 100px; + margin-left: 82px; } .row-fluid { @@ -412,8 +388,8 @@ a:focus { margin-left: 2.127659574468085%; *margin-left: 2.074468085106383%; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .row-fluid [class*="span"]:first-child { @@ -976,8 +952,8 @@ pre { font-size: 12px; color: #333333; -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } code { @@ -1002,8 +978,8 @@ pre { border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } pre.prettyprint { @@ -1099,8 +1075,8 @@ input[type="color"], color: #555555; vertical-align: middle; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } input, @@ -1132,12 +1108,12 @@ input[type="color"], background-color: #ffffff; border: 1px solid #cccccc; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; } textarea:focus, @@ -1162,8 +1138,8 @@ input[type="color"]:focus, /* IE6-9 */ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); } input[type="radio"], @@ -1222,8 +1198,8 @@ input[type="checkbox"]:focus { background-color: #fcfcfc; border-color: #cccccc; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); } .uneditable-input { @@ -1473,8 +1449,8 @@ input[type="checkbox"][readonly] { .control-group.warning textarea { border-color: #c09853; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.warning input:focus, @@ -1482,8 +1458,8 @@ input[type="checkbox"][readonly] { .control-group.warning textarea:focus { border-color: #a47e3c; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, @@ -1512,8 +1488,8 @@ input[type="checkbox"][readonly] { .control-group.error textarea { border-color: #b94a48; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.error input:focus, @@ -1521,8 +1497,8 @@ input[type="checkbox"][readonly] { .control-group.error textarea:focus { border-color: #953b39; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; } .control-group.error .input-prepend .add-on, @@ -1551,8 +1527,8 @@ input[type="checkbox"][readonly] { .control-group.success textarea { border-color: #468847; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.success input:focus, @@ -1560,8 +1536,8 @@ input[type="checkbox"][readonly] { .control-group.success textarea:focus { border-color: #356635; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, @@ -1590,8 +1566,8 @@ input[type="checkbox"][readonly] { .control-group.info textarea { border-color: #3a87ad; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .control-group.info input:focus, @@ -1599,8 +1575,8 @@ input[type="checkbox"][readonly] { .control-group.info textarea:focus { border-color: #2d6987; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; } .control-group.info .input-prepend .add-on, @@ -1622,8 +1598,8 @@ textarea:focus:invalid:focus, select:focus:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; + -moz-box-shadow: 0 0 6px #f8b9b7; + box-shadow: 0 0 6px #f8b9b7; } .form-actions { @@ -1697,8 +1673,8 @@ select:focus:invalid:focus { *margin-left: 0; vertical-align: top; -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-append input:focus, @@ -1734,8 +1710,8 @@ select:focus:invalid:focus { .input-prepend .btn-group > .dropdown-toggle { vertical-align: top; -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .input-append .active, @@ -1752,24 +1728,24 @@ select:focus:invalid:focus { .input-prepend .add-on:first-child, .input-prepend .btn:first-child { -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .input-append input, .input-append select, .input-append .uneditable-input { -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .input-append input + .btn-group .btn:last-child, .input-append select + .btn-group .btn:last-child, .input-append .uneditable-input + .btn-group .btn:last-child { -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-append .add-on, @@ -1782,40 +1758,40 @@ select:focus:invalid:focus { .input-append .btn:last-child, .input-append .btn-group:last-child > .dropdown-toggle { -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-prepend.input-append input, .input-prepend.input-append select, .input-prepend.input-append .uneditable-input { -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .input-prepend.input-append input + .btn-group .btn, .input-prepend.input-append select + .btn-group .btn, .input-prepend.input-append .uneditable-input + .btn-group .btn { -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child { margin-right: -1px; -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .input-prepend.input-append .add-on:last-child, .input-prepend.input-append .btn:last-child { margin-left: -1px; -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-prepend.input-append .btn-group:first-child { @@ -1831,8 +1807,8 @@ input.search-query { margin-bottom: 0; -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } /* Allow for input prepend/append in search forms */ @@ -1840,32 +1816,32 @@ input.search-query { .form-search .input-append .search-query, .form-search .input-prepend .search-query { -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .form-search .input-append .search-query { -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; } .form-search .input-append .btn { -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; } .form-search .input-prepend .search-query { -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; + -moz-border-radius: 0 14px 14px 0; + border-radius: 0 14px 14px 0; } .form-search .input-prepend .btn { -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; + -moz-border-radius: 14px 0 0 14px; + border-radius: 14px 0 0 14px; } .form-search input, @@ -2051,8 +2027,8 @@ table { *border-collapse: collapse; border-left: 0; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .table-bordered th, @@ -2076,7 +2052,7 @@ table { .table-bordered tbody:first-child tr:first-child > td:first-child, .table-bordered tbody:first-child tr:first-child > th:first-child { -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; + border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; } @@ -2084,7 +2060,7 @@ table { .table-bordered tbody:first-child tr:first-child > td:last-child, .table-bordered tbody:first-child tr:first-child > th:last-child { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; + border-top-right-radius: 4px; -moz-border-radius-topright: 4px; } @@ -2094,7 +2070,7 @@ table { .table-bordered tfoot:last-child tr:last-child > td:first-child, .table-bordered tfoot:last-child tr:last-child > th:first-child { -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; } @@ -2104,19 +2080,19 @@ table { .table-bordered tfoot:last-child tr:last-child > td:last-child, .table-bordered tfoot:last-child tr:last-child > th:last-child { -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; } .table-bordered tfoot + tbody:last-child tr:last-child td:first-child { -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; + border-bottom-left-radius: 0; -moz-border-radius-bottomleft: 0; } .table-bordered tfoot + tbody:last-child tr:last-child td:last-child { -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; + border-bottom-right-radius: 0; -moz-border-radius-bottomright: 0; } @@ -2125,7 +2101,7 @@ table { .table-bordered colgroup + thead tr:first-child th:first-child, .table-bordered colgroup + tbody tr:first-child td:first-child { -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; + border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; } @@ -2134,7 +2110,7 @@ table { .table-bordered colgroup + thead tr:first-child th:last-child, .table-bordered colgroup + tbody tr:first-child td:last-child { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; + border-top-right-radius: 4px; -moz-border-radius-topright: 4px; } @@ -2919,14 +2895,14 @@ table th[class*="span"], *border-right-width: 2px; *border-bottom-width: 2px; -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .dropdown-menu.pull-right { @@ -3047,8 +3023,8 @@ table th[class*="span"], margin-top: -6px; margin-left: -1px; -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; } .dropdown-submenu:hover > .dropdown-menu { @@ -3061,8 +3037,8 @@ table th[class*="span"], margin-top: 0; margin-bottom: -2px; -webkit-border-radius: 5px 5px 5px 0; - -moz-border-radius: 5px 5px 5px 0; - border-radius: 5px 5px 5px 0; + -moz-border-radius: 5px 5px 5px 0; + border-radius: 5px 5px 5px 0; } .dropdown-submenu > a:after { @@ -3091,8 +3067,8 @@ table th[class*="span"], left: -100%; margin-left: 10px; -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; } .dropdown .dropdown-menu .nav-header { @@ -3104,8 +3080,8 @@ table th[class*="span"], z-index: 1051; margin-top: 2px; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .well { @@ -3115,11 +3091,11 @@ table th[class*="span"], background-color: #f5f5f5; border: 1px solid #e3e3e3; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); } .well blockquote { @@ -3130,23 +3106,23 @@ table th[class*="span"], .well-large { padding: 24px; -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .well-small { padding: 9px; -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .fade { opacity: 0; -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; + -moz-transition: opacity 0.15s linear; + -o-transition: opacity 0.15s linear; + transition: opacity 0.15s linear; } .fade.in { @@ -3158,9 +3134,9 @@ table th[class*="span"], height: 0; overflow: hidden; -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; + -moz-transition: height 0.35s ease; + -o-transition: height 0.35s ease; + transition: height 0.35s ease; } .collapse.in { @@ -3222,14 +3198,14 @@ button.close { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-bottom-color: #b3b3b3; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); *zoom: 1; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn:hover, @@ -3258,9 +3234,9 @@ button.close { text-decoration: none; background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; + -moz-transition: background-position 0.1s linear; + -o-transition: background-position 0.1s linear; + transition: background-position 0.1s linear; } .btn:focus { @@ -3274,8 +3250,8 @@ button.close { background-image: none; outline: 0; -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn.disabled, @@ -3285,16 +3261,16 @@ button.close { opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } .btn-large { padding: 11px 19px; font-size: 17.5px; -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .btn-large [class^="icon-"], @@ -3306,8 +3282,8 @@ button.close { padding: 2px 10px; font-size: 11.9px; -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .btn-small [class^="icon-"], @@ -3324,8 +3300,8 @@ button.close { padding: 0 6px; font-size: 10.5px; -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .btn-block { @@ -3334,8 +3310,8 @@ button.close { padding-right: 0; padding-left: 0; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .btn-block + .btn-block { @@ -3591,8 +3567,8 @@ input[type="submit"].btn.btn-mini { background-color: transparent; background-image: none; -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } .btn-link { @@ -3600,8 +3576,8 @@ input[type="submit"].btn.btn-mini { cursor: pointer; border-color: transparent; -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .btn-link:hover, @@ -3651,8 +3627,8 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn { position: relative; -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .btn-group > .btn + .btn { @@ -3680,9 +3656,9 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn:first-child { margin-left: 0; -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; + border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -moz-border-radius-topleft: 4px; } @@ -3690,9 +3666,9 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn:last-child, .btn-group > .dropdown-toggle { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; + border-top-right-radius: 4px; -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; -moz-border-radius-topright: 4px; -moz-border-radius-bottomright: 4px; } @@ -3700,9 +3676,9 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn.large:first-child { margin-left: 0; -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; + border-bottom-left-radius: 6px; -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; + border-top-left-radius: 6px; -moz-border-radius-bottomleft: 6px; -moz-border-radius-topleft: 6px; } @@ -3710,9 +3686,9 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn.large:last-child, .btn-group > .large.dropdown-toggle { -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; + border-top-right-radius: 6px; -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; + border-bottom-right-radius: 6px; -moz-border-radius-topright: 6px; -moz-border-radius-bottomright: 6px; } @@ -3735,8 +3711,8 @@ input[type="submit"].btn.btn-mini { *padding-bottom: 5px; padding-left: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-group > .btn-mini + .dropdown-toggle { @@ -3761,8 +3737,8 @@ input[type="submit"].btn.btn-mini { .btn-group.open .dropdown-toggle { background-image: none; -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-group.open .btn.dropdown-toggle { @@ -3840,8 +3816,8 @@ input[type="submit"].btn.btn-mini { float: none; max-width: 100%; -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .btn-group-vertical > .btn + .btn { @@ -3851,26 +3827,26 @@ input[type="submit"].btn.btn-mini { .btn-group-vertical > .btn:first-child { -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; } .btn-group-vertical > .btn:last-child { -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; } .btn-group-vertical > .btn-large:first-child { -webkit-border-radius: 6px 6px 0 0; - -moz-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; + -moz-border-radius: 6px 6px 0 0; + border-radius: 6px 6px 0 0; } .btn-group-vertical > .btn-large:last-child { -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .alert { @@ -3880,8 +3856,8 @@ input[type="submit"].btn.btn-mini { background-color: #fcf8e3; border: 1px solid #fbeed5; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .alert, @@ -4071,8 +4047,8 @@ input[type="submit"].btn.btn-mini { line-height: 20px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; } .nav-tabs > li > a:hover, @@ -4096,8 +4072,8 @@ input[type="submit"].btn.btn-mini { margin-top: 2px; margin-bottom: 2px; -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } .nav-pills > .active > a, @@ -4122,24 +4098,24 @@ input[type="submit"].btn.btn-mini { .nav-tabs.nav-stacked > li > a { border: 1px solid #ddd; -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .nav-tabs.nav-stacked > li:first-child > a { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; + border-top-right-radius: 4px; -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; + border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -moz-border-radius-topleft: 4px; } .nav-tabs.nav-stacked > li:last-child > a { -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -moz-border-radius-bottomleft: 4px; } @@ -4160,14 +4136,14 @@ input[type="submit"].btn.btn-mini { .nav-tabs .dropdown-menu { -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; } .nav-pills .dropdown-menu { -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .nav .dropdown-toggle .caret { @@ -4273,8 +4249,8 @@ input[type="submit"].btn.btn-mini { .tabs-below > .nav-tabs > li > a { -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; } .tabs-below > .nav-tabs > li > a:hover, @@ -4310,8 +4286,8 @@ input[type="submit"].btn.btn-mini { .tabs-left > .nav-tabs > li > a { margin-right: -1px; -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .tabs-left > .nav-tabs > li > a:hover, @@ -4335,8 +4311,8 @@ input[type="submit"].btn.btn-mini { .tabs-right > .nav-tabs > li > a { margin-left: -1px; -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .tabs-right > .nav-tabs > li > a:hover, @@ -4382,13 +4358,13 @@ input[type="submit"].btn.btn-mini { background-repeat: repeat-x; border: 1px solid #d4d4d4; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); *zoom: 1; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); } .navbar-inner:before, @@ -4524,8 +4500,8 @@ input[type="submit"].btn.btn-mini { font-weight: normal; line-height: 1; -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } .navbar-static-top { @@ -4535,8 +4511,8 @@ input[type="submit"].btn.btn-mini { .navbar-static-top .navbar-inner { -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-fixed-top, @@ -4562,8 +4538,8 @@ input[type="submit"].btn.btn-mini { padding-right: 0; padding-left: 0; -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .navbar-static-top .container, @@ -4579,8 +4555,8 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-top .navbar-inner, .navbar-static-top .navbar-inner { -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); } .navbar-fixed-bottom { @@ -4589,8 +4565,8 @@ input[type="submit"].btn.btn-mini { .navbar-fixed-bottom .navbar-inner { -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); } .navbar .nav { @@ -4636,8 +4612,8 @@ input[type="submit"].btn.btn-mini { text-decoration: none; background-color: #e5e5e5; -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); } .navbar .btn-navbar { @@ -4661,8 +4637,8 @@ input[type="submit"].btn.btn-mini { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); } .navbar .btn-navbar:hover, @@ -4687,11 +4663,11 @@ input[type="submit"].btn.btn-mini { height: 2px; background-color: #f5f5f5; -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); } .btn-navbar .icon-bar + .icon-bar { @@ -4786,8 +4762,8 @@ input[type="submit"].btn.btn-mini { margin-right: -1px; margin-left: 0; -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; } .navbar-inverse .navbar-inner { @@ -4880,12 +4856,12 @@ input[type="submit"].btn.btn-mini { background-color: #515151; border-color: #111111; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; } .navbar-inverse .navbar-search .search-query:-moz-placeholder { @@ -4909,8 +4885,8 @@ input[type="submit"].btn.btn-mini { border: 0; outline: 0; -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); } .navbar-inverse .btn-navbar { @@ -4952,8 +4928,8 @@ input[type="submit"].btn.btn-mini { list-style: none; background-color: #f5f5f5; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .breadcrumb > li { @@ -4982,12 +4958,12 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; margin-left: 0; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; *zoom: 1; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } .pagination ul > li { @@ -5031,9 +5007,9 @@ input[type="submit"].btn.btn-mini { .pagination ul > li:first-child > span { border-left-width: 1px; -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; + border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -moz-border-radius-topleft: 4px; } @@ -5041,9 +5017,9 @@ input[type="submit"].btn.btn-mini { .pagination ul > li:last-child > a, .pagination ul > li:last-child > span { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; + border-top-right-radius: 4px; -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; -moz-border-radius-topright: 4px; -moz-border-radius-bottomright: 4px; } @@ -5065,9 +5041,9 @@ input[type="submit"].btn.btn-mini { .pagination-large ul > li:first-child > a, .pagination-large ul > li:first-child > span { -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; + border-bottom-left-radius: 6px; -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; + border-top-left-radius: 6px; -moz-border-radius-bottomleft: 6px; -moz-border-radius-topleft: 6px; } @@ -5075,9 +5051,9 @@ input[type="submit"].btn.btn-mini { .pagination-large ul > li:last-child > a, .pagination-large ul > li:last-child > span { -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; + border-top-right-radius: 6px; -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; + border-bottom-right-radius: 6px; -moz-border-radius-topright: 6px; -moz-border-radius-bottomright: 6px; } @@ -5087,9 +5063,9 @@ input[type="submit"].btn.btn-mini { .pagination-mini ul > li:first-child > span, .pagination-small ul > li:first-child > span { -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; + border-bottom-left-radius: 3px; -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; + border-top-left-radius: 3px; -moz-border-radius-bottomleft: 3px; -moz-border-radius-topleft: 3px; } @@ -5099,9 +5075,9 @@ input[type="submit"].btn.btn-mini { .pagination-mini ul > li:last-child > span, .pagination-small ul > li:last-child > span { -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; + border-top-right-radius: 3px; -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; + border-bottom-right-radius: 3px; -moz-border-radius-topright: 3px; -moz-border-radius-bottomright: 3px; } @@ -5147,8 +5123,8 @@ input[type="submit"].btn.btn-mini { background-color: #fff; border: 1px solid #ddd; -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; } .pager li > a:hover, @@ -5208,23 +5184,23 @@ input[type="submit"].btn.btn-mini { border: 1px solid rgba(0, 0, 0, 0.3); *border: 1px solid #999; -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; outline: none; -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; } .modal.fade { top: -25%; -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; - -moz-transition: opacity 0.3s linear, top 0.3s ease-out; - -o-transition: opacity 0.3s linear, top 0.3s ease-out; - transition: opacity 0.3s linear, top 0.3s ease-out; + -moz-transition: opacity 0.3s linear, top 0.3s ease-out; + -o-transition: opacity 0.3s linear, top 0.3s ease-out; + transition: opacity 0.3s linear, top 0.3s ease-out; } .modal.fade.in { @@ -5263,12 +5239,12 @@ input[type="submit"].btn.btn-mini { background-color: #f5f5f5; border-top: 1px solid #ddd; -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; *zoom: 1; -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; + -moz-box-shadow: inset 0 1px 0 #ffffff; + box-shadow: inset 0 1px 0 #ffffff; } .modal-footer:before, @@ -5339,8 +5315,8 @@ input[type="submit"].btn.btn-mini { text-decoration: none; background-color: #000000; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .tooltip-arrow { @@ -5397,14 +5373,14 @@ input[type="submit"].btn.btn-mini { border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; } .popover.top { @@ -5432,8 +5408,8 @@ input[type="submit"].btn.btn-mini { background-color: #f7f7f7; border-bottom: 1px solid #ebebeb; -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; } .popover-title:empty { @@ -5560,23 +5536,23 @@ input[type="submit"].btn.btn-mini { line-height: 20px; border: 1px solid #ddd; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; } a.thumbnail:hover, a.thumbnail:focus { border-color: #0088cc; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); + -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); + box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); } .thumbnail > img { @@ -5644,16 +5620,16 @@ a.thumbnail:focus { .label { -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .badge { padding-right: 9px; padding-left: 9px; -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; + -moz-border-radius: 9px; + border-radius: 9px; } .label:empty, @@ -5788,12 +5764,12 @@ a.badge:focus { background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); } .progress .bar { @@ -5813,21 +5789,21 @@ a.badge:focus { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; + -moz-transition: width 0.6s ease; + -o-transition: width 0.6s ease; + transition: width 0.6s ease; } .progress .bar + .bar { -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); } .progress-striped .bar { @@ -5838,17 +5814,17 @@ a.badge:focus { background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; + -moz-background-size: 40px 40px; + -o-background-size: 40px 40px; + background-size: 40px 40px; } .progress.active .bar { -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + -ms-animation: progress-bar-stripes 2s linear infinite; + -o-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; } .progress-danger .bar, @@ -5947,8 +5923,8 @@ a.badge:focus { margin-bottom: 2px; border: 1px solid #e5e5e5; -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .accordion-heading { @@ -5985,9 +5961,9 @@ a.badge:focus { position: relative; display: none; -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; + -moz-transition: 0.6s ease-in-out left; + -o-transition: 0.6s ease-in-out left; + transition: 0.6s ease-in-out left; } .carousel-inner > .item > img, @@ -6049,8 +6025,8 @@ a.badge:focus { background: #222222; border: 3px solid #ffffff; -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; + -moz-border-radius: 23px; + border-radius: 23px; opacity: 0.5; filter: alpha(opacity=50); } @@ -6126,8 +6102,8 @@ a.badge:focus { color: inherit; background-color: #eeeeee; -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .hero-unit h1 { diff --git a/static/css/bootstrap.responsive.css b/static/css/bootstrap.responsive.css index 09e88ce..1984977 100644 --- a/static/css/bootstrap.responsive.css +++ b/static/css/bootstrap.responsive.css @@ -110,7 +110,7 @@ @media (min-width: 1200px) { .row { - margin-left: -30px; + margin-left: -20px; *zoom: 1; } .row:before, @@ -125,85 +125,85 @@ [class*="span"] { float: left; min-height: 1px; - margin-left: 30px; + margin-left: 20px; } .container, .navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { - width: 1170px; + width: 724px; } .span12 { - width: 1170px; + width: 724px; } .span11 { - width: 1070px; + width: 662px; } .span10 { - width: 970px; + width: 600px; } .span9 { - width: 870px; + width: 538px; } .span8 { - width: 770px; + width: 476px; } .span7 { - width: 670px; + width: 414px; } .span6 { - width: 570px; + width: 352px; } .span5 { - width: 470px; + width: 290px; } .span4 { - width: 370px; + width: 228px; } .span3 { - width: 270px; + width: 166px; } .span2 { - width: 170px; + width: 104px; } .span1 { - width: 70px; + width: 42px; } .offset12 { - margin-left: 1230px; + margin-left: 764px; } .offset11 { - margin-left: 1130px; + margin-left: 702px; } .offset10 { - margin-left: 1030px; + margin-left: 640px; } .offset9 { - margin-left: 930px; + margin-left: 578px; } .offset8 { - margin-left: 830px; + margin-left: 516px; } .offset7 { - margin-left: 730px; + margin-left: 454px; } .offset6 { - margin-left: 630px; + margin-left: 392px; } .offset5 { - margin-left: 530px; - } - .offset4 { - margin-left: 430px; - } - .offset3 { margin-left: 330px; } + .offset4 { + margin-left: 268px; + } + .offset3 { + margin-left: 206px; + } .offset2 { - margin-left: 230px; + margin-left: 144px; } .offset1 { - margin-left: 130px; + margin-left: 82px; } .row-fluid { width: 100%; @@ -223,8 +223,8 @@ float: left; width: 100%; min-height: 30px; - margin-left: 2.564102564102564%; - *margin-left: 2.5109110747408616%; + margin-left: 2.7624309392265194%; + *margin-left: 2.709239449864817%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -233,151 +233,151 @@ margin-left: 0; } .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.564102564102564%; + margin-left: 2.7624309392265194%; } .row-fluid .span12 { width: 100%; *width: 99.94680851063829%; } .row-fluid .span11 { - width: 91.45299145299145%; - *width: 91.39979996362975%; + width: 91.43646408839778%; + *width: 91.38327259903608%; } .row-fluid .span10 { - width: 82.90598290598291%; - *width: 82.8527914166212%; + width: 82.87292817679558%; + *width: 82.81973668743387%; } .row-fluid .span9 { - width: 74.35897435897436%; - *width: 74.30578286961266%; + width: 74.30939226519337%; + *width: 74.25620077583166%; } .row-fluid .span8 { - width: 65.81196581196582%; - *width: 65.75877432260411%; + width: 65.74585635359117%; + *width: 65.69266486422946%; } .row-fluid .span7 { - width: 57.26495726495726%; - *width: 57.21176577559556%; + width: 57.18232044198895%; + *width: 57.12912895262725%; } .row-fluid .span6 { - width: 48.717948717948715%; - *width: 48.664757228587014%; + width: 48.61878453038674%; + *width: 48.56559304102504%; } .row-fluid .span5 { - width: 40.17094017094017%; - *width: 40.11774868157847%; + width: 40.05524861878453%; + *width: 40.00205712942283%; } .row-fluid .span4 { - width: 31.623931623931625%; - *width: 31.570740134569924%; + width: 31.491712707182323%; + *width: 31.43852121782062%; } .row-fluid .span3 { - width: 23.076923076923077%; - *width: 23.023731587561375%; + width: 22.92817679558011%; + *width: 22.87498530621841%; } .row-fluid .span2 { - width: 14.52991452991453%; - *width: 14.476723040552828%; + width: 14.3646408839779%; + *width: 14.311449394616199%; } .row-fluid .span1 { - width: 5.982905982905983%; - *width: 5.929714493544281%; + width: 5.801104972375691%; + *width: 5.747913483013988%; } .row-fluid .offset12 { - margin-left: 105.12820512820512%; - *margin-left: 105.02182214948171%; + margin-left: 105.52486187845304%; + *margin-left: 105.41847889972962%; } .row-fluid .offset12:first-child { - margin-left: 102.56410256410257%; - *margin-left: 102.45771958537915%; + margin-left: 102.76243093922652%; + *margin-left: 102.6560479605031%; } .row-fluid .offset11 { - margin-left: 96.58119658119658%; - *margin-left: 96.47481360247316%; + margin-left: 96.96132596685082%; + *margin-left: 96.8549429881274%; } .row-fluid .offset11:first-child { - margin-left: 94.01709401709402%; - *margin-left: 93.91071103837061%; + margin-left: 94.1988950276243%; + *margin-left: 94.09251204890089%; } .row-fluid .offset10 { - margin-left: 88.03418803418803%; - *margin-left: 87.92780505546462%; + margin-left: 88.39779005524862%; + *margin-left: 88.2914070765252%; } .row-fluid .offset10:first-child { - margin-left: 85.47008547008548%; - *margin-left: 85.36370249136206%; + margin-left: 85.6353591160221%; + *margin-left: 85.52897613729868%; } .row-fluid .offset9 { - margin-left: 79.48717948717949%; - *margin-left: 79.38079650845607%; + margin-left: 79.8342541436464%; + *margin-left: 79.72787116492299%; } .row-fluid .offset9:first-child { - margin-left: 76.92307692307693%; - *margin-left: 76.81669394435352%; + margin-left: 77.07182320441989%; + *margin-left: 76.96544022569647%; } .row-fluid .offset8 { - margin-left: 70.94017094017094%; - *margin-left: 70.83378796144753%; + margin-left: 71.2707182320442%; + *margin-left: 71.16433525332079%; } .row-fluid .offset8:first-child { - margin-left: 68.37606837606839%; - *margin-left: 68.26968539734497%; + margin-left: 68.50828729281768%; + *margin-left: 68.40190431409427%; } .row-fluid .offset7 { - margin-left: 62.393162393162385%; - *margin-left: 62.28677941443899%; + margin-left: 62.70718232044199%; + *margin-left: 62.600799341718584%; } .row-fluid .offset7:first-child { - margin-left: 59.82905982905982%; - *margin-left: 59.72267685033642%; + margin-left: 59.94475138121547%; + *margin-left: 59.838368402492065%; } .row-fluid .offset6 { - margin-left: 53.84615384615384%; - *margin-left: 53.739770867430444%; + margin-left: 54.14364640883978%; + *margin-left: 54.037263430116376%; } .row-fluid .offset6:first-child { - margin-left: 51.28205128205128%; - *margin-left: 51.175668303327875%; + margin-left: 51.38121546961326%; + *margin-left: 51.27483249088986%; } .row-fluid .offset5 { - margin-left: 45.299145299145295%; - *margin-left: 45.1927623204219%; + margin-left: 45.58011049723757%; + *margin-left: 45.47372751851417%; } .row-fluid .offset5:first-child { - margin-left: 42.73504273504273%; - *margin-left: 42.62865975631933%; + margin-left: 42.81767955801105%; + *margin-left: 42.71129657928765%; } .row-fluid .offset4 { - margin-left: 36.75213675213675%; - *margin-left: 36.645753773413354%; + margin-left: 37.01657458563536%; + *margin-left: 36.91019160691196%; } .row-fluid .offset4:first-child { - margin-left: 34.18803418803419%; - *margin-left: 34.081651209310785%; + margin-left: 34.25414364640884%; + *margin-left: 34.14776066768544%; } .row-fluid .offset3 { - margin-left: 28.205128205128204%; - *margin-left: 28.0987452264048%; + margin-left: 28.45303867403315%; + *margin-left: 28.346655695309746%; } .row-fluid .offset3:first-child { - margin-left: 25.641025641025642%; - *margin-left: 25.53464266230224%; + margin-left: 25.69060773480663%; + *margin-left: 25.584224756083227%; } .row-fluid .offset2 { - margin-left: 19.65811965811966%; - *margin-left: 19.551736679396257%; + margin-left: 19.88950276243094%; + *margin-left: 19.783119783707537%; } .row-fluid .offset2:first-child { - margin-left: 17.094017094017094%; - *margin-left: 16.98763411529369%; + margin-left: 17.12707182320442%; + *margin-left: 17.02068884448102%; } .row-fluid .offset1 { - margin-left: 11.11111111111111%; - *margin-left: 11.004728132387708%; + margin-left: 11.32596685082873%; + *margin-left: 11.219583872105325%; } .row-fluid .offset1:first-child { - margin-left: 8.547008547008547%; - *margin-left: 8.440625568285142%; + margin-left: 8.56353591160221%; + *margin-left: 8.457152932878806%; } input, textarea, @@ -385,76 +385,67 @@ margin-left: 0; } .controls-row [class*="span"] + [class*="span"] { - margin-left: 30px; + margin-left: 20px; } input.span12, textarea.span12, .uneditable-input.span12 { - width: 1156px; + width: 710px; } input.span11, textarea.span11, .uneditable-input.span11 { - width: 1056px; + width: 648px; } input.span10, textarea.span10, .uneditable-input.span10 { - width: 956px; + width: 586px; } input.span9, textarea.span9, .uneditable-input.span9 { - width: 856px; + width: 524px; } input.span8, textarea.span8, .uneditable-input.span8 { - width: 756px; + width: 462px; } input.span7, textarea.span7, .uneditable-input.span7 { - width: 656px; + width: 400px; } input.span6, textarea.span6, .uneditable-input.span6 { - width: 556px; + width: 338px; } input.span5, textarea.span5, .uneditable-input.span5 { - width: 456px; + width: 276px; } input.span4, textarea.span4, .uneditable-input.span4 { - width: 356px; + width: 214px; } input.span3, textarea.span3, .uneditable-input.span3 { - width: 256px; + width: 152px; } input.span2, textarea.span2, .uneditable-input.span2 { - width: 156px; + width: 90px; } input.span1, textarea.span1, .uneditable-input.span1 { - width: 56px; - } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } - .row-fluid .thumbnails { - margin-left: 0; + width: 28px; } } diff --git a/static/img/favicon.ico b/static/img/favicon.ico new file mode 100644 index 0000000..c770e2d Binary files /dev/null and b/static/img/favicon.ico differ diff --git a/static/img/favicon.png b/static/img/favicon.png new file mode 100644 index 0000000..22c8233 Binary files /dev/null and b/static/img/favicon.png differ diff --git a/static/img/github.png b/static/img/github.png new file mode 100644 index 0000000..8710e0d Binary files /dev/null and b/static/img/github.png differ diff --git a/static/img/haskell.png b/static/img/haskell.png new file mode 100644 index 0000000..a9d1e5a Binary files /dev/null and b/static/img/haskell.png differ diff --git a/static/img/jenkins.png b/static/img/jenkins.png index bb82e3d..548f19c 100644 Binary files a/static/img/jenkins.png and b/static/img/jenkins.png differ diff --git a/static/img/logo.png b/static/img/logo.png new file mode 100644 index 0000000..c710cd2 Binary files /dev/null and b/static/img/logo.png differ diff --git a/static/img/ping.png b/static/img/ping.png new file mode 100644 index 0000000..12b8d09 Binary files /dev/null and b/static/img/ping.png differ diff --git a/static/img/screenie.png b/static/img/screenie.png new file mode 100644 index 0000000..695372e Binary files /dev/null and b/static/img/screenie.png differ diff --git a/static/img/stackage.png b/static/img/stackage.png index 57fa12c..1ad3870 100644 Binary files a/static/img/stackage.png and b/static/img/stackage.png differ diff --git a/templates/default-layout-wrapper.hamlet b/templates/default-layout-wrapper.hamlet index 9d4b4a0..e3c40b7 100644 --- a/templates/default-layout-wrapper.hamlet +++ b/templates/default-layout-wrapper.hamlet @@ -7,6 +7,7 @@ $newline never + #{pageTitle pc} @@ -16,7 +17,7 @@ $newline never <meta name="author" content=""> <meta name="viewport" content="width=device-width,initial-scale=1"> - <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css"> + ^{pageHead pc} diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet index 54c1afe..39b0d69 100644 --- a/templates/default-layout.hamlet +++ b/templates/default-layout.hamlet @@ -1,27 +1,26 @@ <div .wrap> <div .container> - <div .navbar role=navigation> - <div .navbar-inner> - <a .brand href=@{HomeR}> - Stackage - <ul .nav> - <li> - <a href=@{AllSnapshotsR}> - All Snapshots - <li> - <a href=@{UploadStackageR}> - Upload - <ul .nav .pull-right> - $maybe Entity _ user <- muser - <li> - <a href=@{ProfileR}> - <span .user-handle> - #{userHandle user} - <li> - <a href=@{AuthR LogoutR}>Logout - $nothing - <li> - <a href=@{AuthR LoginR}>Login + <a .logo href=@{HomeR}> + <img src=@{StaticR img_logo_png}> + + <div .navbar .navbar-default role=navigation> + <ul .nav> + <li> + <a href=@{AllSnapshotsR}> + All Snapshots + <li> + <a href=@{UploadStackageR}> + Upload + $maybe Entity _ user <- muser + <li> + <a href=@{ProfileR}> + <span .user-handle> + #{userHandle user} + <li> + <a href=@{AuthR LogoutR}>Logout + $nothing + <li> + <a href=@{AuthR LoginR}>Login $maybe msg <- mmsg <div .container> diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius index 4479948..584a594 100644 --- a/templates/default-layout.lucius +++ b/templates/default-layout.lucius @@ -8,132 +8,101 @@ html { } body { - background: #fff; + background: #f0f0f0; margin:0 0 4em; padding:0; - font-family: 'Open Sans'; + /* font-family: 'Open Sans'; */ + font-family: Sawasdee; + text-shadow: 1px 1px 1px #ffffff; + font-size: 20px; + line-height: 24px; } -.wrap { - background:#fff; - padding-bottom:2em; - padding-left: 15px; - padding-right: 15px; -} - -h1 { - font-size: 30px; - line-height: 40px; - font-weight: normal; -} - -h2 { - font-size: 25px; - margin-top: 15px; -} - -.media-top { +p { margin-top: 20px; } -h3 { - font-size: 15px; +.wrap { + padding-top: 2em; + padding-left: 15px; + padding-right: 15px; + padding-bottom: 2em; } -code { - color: #9f1ec0; +h1 { + font-weight: normal; + font-size: 50px; + line-height: 55px; + margin-bottom: 30px; } -a code { - color: inherit; - background: 0; - padding: 0; +h2 { + font-weight: normal; + color: #06537d; + font-size: 45px; + margin-top: 50px; + margin-bottom: 40px; +} + +li + li { + margin-top: 0.5em; +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + Logo + */ + +.logo { + display: block; + width: 300px; border: 0; } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - Navigation + Navbar */ +.navbar .nav > li > a { + padding-left: 0; + color: #0981c3 !important; +} + .navbar { - margin-top: 10px; - margin-bottom: 0; - .brand { - color: #0088cc; - padding-left: 0; + margin-top: 20px; + font-size: 25px; + .nav { + margin: auto; } - .nav > li > a { - color: #0088cc; - } - .navbar-inner { - box-shadow: none; - border: 0; - background: inherit; - border-top-left-radius: 0; - border-top-right-radius: 0; - } - .user-handle { - max-width: 15em; - overflow: hidden; - white-space: nowrap; - display: inline-block; - text-overflow: ellipsis; + li { + margin-top: 0; } } + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Footer */ .footer { + text-shadow: none; + background: #0981c3; border-top: 1px solid #ddd; - background-color: #eee; - color: #777; + color: #fff; position: absolute; bottom: 0; width: 100%; height: 4em; line-height: 2em; + text-align: center; + + a { + color: #fff; + font-weight: bold; + } .span12 { padding: 0px 15px 0 0; line-height: 4em; } } - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - Responsiveness - */ - -.container { - max-width: 724px; -} - -.span12 { - width: auto; -} - -@media (max-width: 979px) { - .navbar-inner { - padding-left: 0; - } -} - -@media (max-width: 767px) { - .navbar .nav.pull-right { - float: none; - display: block; - clear: left; - margin-left: -15px; - } -} - -@media (max-width: 480px) { - .navbar .brand + .nav { - float: none; - display: block; - clear: left; - margin-left: -15px; - } -} diff --git a/templates/homepage.hamlet b/templates/homepage.hamlet index d9d3916..1dc615c 100644 --- a/templates/homepage.hamlet +++ b/templates/homepage.hamlet @@ -1,87 +1,67 @@ <div .container> + <h2 .recommended-snapshots>Recommended Snapshots + <ul .snapshots> + $forall (E.Value ident, E.Value title, E.Value uploaded, E.Value display, E.Value handle) <- stackages + <li> + <a href=@{StackageHomeR ident}> + #{title} + <h1> - Stackage is an infrastructure to create stable builds of complete package sets. Think “stable Hackage”. - <div .recommended-snapshots> - <h2>Recommended Snapshots - <ul .snapshots> - $forall (E.Value ident, E.Value title, E.Value uploaded, E.Value display, E.Value handle) <- stackages - <li> - <a href=@{StackageHomeR ident}> - #{title} - <div .how-it-works> - <h2>How Stackage Works - <div .row .media-top> - <div .span12> - <div .media> - <a .pull-left> - <img .media-object src=@{StaticR img_open_pr_png}> - <div .media-body> - <h4 .media-heading> - Submission - <div .media> - A contributor (either an author of a package, or a kind - soul) submits a patch to the Github repository. The pack - will be checked and then be merged in. - <div .media> - <a .pull-left> - <img .media-object src=@{StaticR img_jenkins_png}> - <div .media-body> - <h4 .media-heading> - Testing - <div .media> - The update is sent to a Jenkins build system at - <a href="http://jenkins.stackage.org/"> - jenkins.stackage.org - in the cloud. There is a daily build which takes - about 8 hours. - <div .media> - <a .pull-left> - <img .media-object src=@{StaticR img_bump_png}> - <div .media-body> - <h4 .media-heading> - Notification - <div .media> - If a build failure occurs, the submitter is notified - via a Github issue and pinged via their - <code>@name</code>. Also, any authors of packages - which now fail to build will be notified. - <div .media> - <a .pull-left> - <img .media-object src=@{StaticR img_stackage_png}> - <div .media-body> - <h4 .media-heading> - Snapshot - <div .media> - If the build succeeds, a new snapshot is created. The new - snapshot is used by the community. - <div .contributing> - <h2>Contributing - <p>The steps are simple: - <ul> - <li> - Open the - <a href="https://github.com/fpco/stackage"> - Stackage project on Github. - <li>Fork it. - <li> - <a href="https://github.com/fpco/stackage#get-your-package-included"> - Add a line to the - <code> - Stackage.Config - module. - <li>Push to your fork. - <li>Open a pull request. - <p> Once you have submitted the pull request, a build will be - started. There is a dedicated jenkins server at this location: - <a href="http://jenkins.stackage.org/"> - jenkins.stackage.org. - From here you can track the progress, status and results - of Stackage builds. - <div .businesses> - <h2>Stackage for businesses - <p> We're offering custom installations for businesses who want to - build their development platform upon Stackage. If you're - considering this for your business and want to find out more, - please email us at: - <a href="mailto:sales@fpcomplete.com"> - sales@fpcomplete.com + Stackage is an infrastructure to create stable builds + of complete package sets. Think “stable Hackage”. + + <h2 .how-stackage-works>How Stackage Works + <div .row .stackage-process> + <div .span3> + <img src=@{StaticR img_github_png} .github> + <div .span9> + <p> + Open a pull request on the Github repository. + <div .row .stackage-process> + <div .span9> + <p> + Once checked, it's merged and run through Jenkins. + <div .span3> + <img src=@{StaticR img_jenkins_png} .jenkins> + <div .row .stackage-process> + <div .span3> + <img src=@{StaticR img_ping_png} .ping> + <div .span9> + <p> + Authors are notified on Github if any problems arise with their package. + <div .row .stackage-process> + <div .span9> + <p> + If the build succeeds, a new Stackage snapshot is created. + <div .span3> + <img src=@{StaticR img_stackage_png} .stackage> + <div .row .stackage-process> + <div .span3> + <img src=@{StaticR img_haskell_png} .haskell> + <div .span9> + <p> + The community can start using the new snapshot immediately! + + <div .row .steps-to-contribute> + <div .span12> + <h2>Steps to Contribute + <ul> + <li>Open the Stackage project on Github. + <li>Fork it. + <li>Add a line to the Stackage.Config module. + <li>Push to your fork. + <li>Open a pull request. + <p> + Once you have submitted the pull request, a build will be started. + There is a dedicated jenkins server at this location: jenkins.stackage.org + From there you can track the progress, status and + results of Stackage builds. + + <div .row .businesses> + <div .span12> + <h2>Stackage for businesses + <p> + We're offering custom installations for businesses who want to + build their development platform upon Stackage. If you're + considering this for your business and want to find out more, + please email us at: sales@fpcomplete.com diff --git a/templates/homepage.lucius b/templates/homepage.lucius index 5a9ed96..d7da20a 100644 --- a/templates/homepage.lucius +++ b/templates/homepage.lucius @@ -1,19 +1,62 @@ +h1 { + margin-top: 50px; +} + +.recommended-snapshots { + margin-top: 30px; +} + +.how-stackage-works { + margin-bottom: 50px; +} + .snapshots { margin-left: 0; padding-left: 0; li { list-style-type: none; - } - li + li { - margin-top: 0.5em; + margin-left: 0; + padding-left: 0; + font-weight: bold; } } -.how-it-works { - .media .pull-left { +.stackage-process { + p { + font-size: 30px; + line-height: 35px; + } + .github { + width: 150px; + } + .jenkins { width: 100px; - height: 100px; - background: #eee; - border: 2px solid #eee; + } + .ping { + width: 100px; + } + .stackage { + width: 100px; + } + .haskell { + width: 120px; } } + +.stackage-process + .stackage-process { + margin-top: 50px; +} + +/* .steps-to-contribute { */ +/* ul { */ +/* margin-top: 30px; */ +/* text-align: left; */ +/* } */ +/* ul, li, p { */ +/* font-size: 20px; */ +/* line-height: 25px; */ +/* } */ +/* li { */ +/* margin-bottom: 0.5em */ +/* } */ +/* } */