[clckwrks-theme-clckwrks-0.1.13: theme updates Jeremy Shaw **20120526215104 Ignore-this: b6b8c7772c4b3659f5719b79d9434c74 ] duplicate hunk ./clckwrks-theme-clckwrks/Theme/Blog.hs 12 -
    +
      : hunk ./clckwrks-theme-clckwrks/Theme/Blog.hs 12 -
        +
          duplicate hunk ./clckwrks-theme-clckwrks/Theme/Blog.hs 19 -

          <% pageTitle %>

          +

          <% pageTitle %>

          : hunk ./clckwrks-theme-clckwrks/Theme/Blog.hs 19 -

          <% pageTitle %>

          +

          <% pageTitle %>

          duplicate hunk ./clckwrks-theme-clckwrks/Theme/Blog.hs 30 -
          +
          : hunk ./clckwrks-theme-clckwrks/Theme/Blog.hs 30 -
          +
          duplicate hunk ./clckwrks-theme-clckwrks/Theme/Home.hs 19 - template "clckwrks.com" () $ + template "Home" () $ : hunk ./clckwrks-theme-clckwrks/Theme/Home.hs 19 - template "Home" () $ + template "clckwrks.com" () $ duplicate hunk ./clckwrks-theme-clckwrks/Theme/Home.hs 26 -
          - <% getPageContent %> -
          - : hunk ./clckwrks-theme-clckwrks/Theme/Home.hs 26 +
          + <% getPageContent %> +
          + duplicate hunk ./clckwrks-theme-clckwrks/Theme/Template.hs 55 - else do pid <- lift getPageId - <%> - - - - + else <%> + + + : hunk ./clckwrks-theme-clckwrks/Theme/Template.hs 55 - else <%> - - - + else do pid <- lift getPageId + <%> + + + + hunk ./clckwrks-theme-clckwrks/clckwrks-theme-clckwrks.cabal 2 -Version: 0.1.12 +Version: 0.1.13 hunk ./clckwrks-theme-clckwrks/clckwrks-theme-clckwrks.cabal 32 - clckwrks == 0.7.*, + clckwrks >= 0.7.1 && < 0.8, duplicate hunk ./clckwrks-theme-clckwrks/data/style.css 9 -/* background: #e0ffe0; */ - : hunk ./clckwrks-theme-clckwrks/data/style.css 9 +/* background: #e0ffe0; */ + duplicate hunk ./clckwrks-theme-clckwrks/data/style.css 18 - background: white; -/* - background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFUlEQVQIHWNgYGAw/v//PwMjiAABADusBi/shrLOAAAAAElFTkSuQmCC) repeat; - background-color: #ef0f; -*/ - -/* background:url('http://ak5.picdn.net/shutterstock/videos/1278652/preview/stock-footage-light-seamless-background.jpg') repeat; */ - - - - -/* background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFUlEQVQIHWNgYGAw/v//PwMjiAABADusBi/shrLOAAAAAElFTkSuQmCC) repeat; */ -/* position: absolute; - width: 100%; - margin-top: 3em; - height: 400px; - border-radius: 10px; - opacity: 0.5; */ - - : hunk ./clckwrks-theme-clckwrks/data/style.css 18 + background: white; +/* + background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFUlEQVQIHWNgYGAw/v//PwMjiAABADusBi/shrLOAAAAAElFTkSuQmCC) repeat; + background-color: #ef0f; +*/ + +/* background:url('http://ak5.picdn.net/shutterstock/videos/1278652/preview/stock-footage-light-seamless-background.jpg') repeat; */ + + + + +/* background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFUlEQVQIHWNgYGAw/v//PwMjiAABADusBi/shrLOAAAAAElFTkSuQmCC) repeat; */ +/* position: absolute; + width: 100%; + margin-top: 3em; + height: 400px; + border-radius: 10px; + opacity: 0.5; */ + + duplicate hunk ./clckwrks-theme-clckwrks/data/style.css 58 - + font-weight: normal; : hunk ./clckwrks-theme-clckwrks/data/style.css 58 - font-weight: normal; + duplicate hunk ./clckwrks-theme-clckwrks/data/style.css 89 + box-shadow: 0px 0px 5px 0px #aaa; +} + +ul.page-menu:hover +{ + background: #444; : hunk ./clckwrks-theme-clckwrks/data/style.css 89 - box-shadow: 0px 0px 5px 0px #aaa; -} - -ul.page-menu:hover -{ - background: #444; duplicate hunk ./clckwrks-theme-clckwrks/data/style.css 115 - margin-right: 1em; - line-height: 1.5em; - box-shadow: 0px 0px 5px 0px #aaa; + margin-right: -1px; + line-height: 2.5em; : hunk ./clckwrks-theme-clckwrks/data/style.css 115 - margin-right: -1px; - line-height: 2.5em; + margin-right: 1em; + line-height: 1.5em; + box-shadow: 0px 0px 5px 0px #aaa; duplicate hunk ./clckwrks-theme-clckwrks/data/style.css 120 -.page-menu li:hover -{ - background: #444; -} - - : hunk ./clckwrks-theme-clckwrks/data/style.css 120 +.page-menu li:hover +{ + background: #444; +} + + duplicate hunk ./clckwrks-theme-clckwrks/data/style.css 179 - background: white; : hunk ./clckwrks-theme-clckwrks/data/style.css 179 + background: white; duplicate hunk ./clckwrks-theme-clckwrks/data/style.css 288 - -#blog-content -{ -/* border: 1px solid #ddd; - box-shadow: 0px 3px 10px 5px #dfdfdf; */ - padding-bottom: 1em; - margin-left: 15em; - margin-right: 15em; - margin-top: 1em; - background: white; - -} - -#blog-content h1 -{ - margin-left: 0.5em; - margin-top: 0em; - margin-bottom: 0em; - font-size: 2em; - font-weight: bold; -} - -#blog-content h2 -{ - margin-top: 0.5em; - margin-left: 0; - margin-bottom: 0; - font-size: 1.75em; - color: #36afdc; - font-weight: bold; -} - -.pub-date -{ - font-size: 0.8em; - font-style: italic; - color: #bbb; -} - -.blog-posts -{ -} - -ol.blog-posts -{ - list-style-type: none; -} - -.blog-posts li -{ - border-bottom: 1px dotted #aaa; -} : hunk ./clckwrks-theme-clckwrks/data/style.css 288 + +#blog-content +{ +/* border: 1px solid #ddd; + box-shadow: 0px 3px 10px 5px #dfdfdf; */ + padding-bottom: 1em; + margin-left: 15em; + margin-right: 15em; + margin-top: 1em; + background: white; + +} + +#blog-content h1 +{ + margin-left: 0.5em; + margin-top: 0em; + margin-bottom: 0em; + font-size: 2em; + font-weight: bold; +} + +#blog-content h2 +{ + margin-top: 0.5em; + margin-left: 0; + margin-bottom: 0; + font-size: 1.75em; + color: #36afdc; + font-weight: bold; +} + +.pub-date +{ + font-size: 0.8em; + font-style: italic; + color: #bbb; +} + +.blog-posts +{ +} + +ol.blog-posts +{ + list-style-type: none; +} + +.blog-posts li +{ + border-bottom: 1px dotted #aaa; +}