Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added some more style changes

  • Loading branch information...
commit a749e1e431bcae7b27571dcab0a1dbbdca7bfacb 1 parent 3a3d9ba
@chrisfleming authored Chris Fleming committed
View
47 app/assets/stylesheets/pages.css.scss
@@ -142,8 +142,9 @@ html>body #centercontent {
#fixedcontent h1 {
margin-left: 5px;
- font-size: 200%;
- font-weight: normal;
+ font-size: 225%;
+ font-weight: 700;
+ font-family: "brioso-pro",sans-serif;
}
#fixedcontent p,h1,h2,h3,h4 { margin-left: 5px; }
@@ -295,7 +296,8 @@ Please tweak this and make it your own. :)
a {
- color: #115bf8;
+ color: #bbb;
+ text-decoration: none;
}
a img {
@@ -303,10 +305,11 @@ a img {
}
a:visited {
- color: #115bf8;
+ color: #ddd;
}
a:hover {
+ color: #888;
text-decoration: none;
}
@@ -337,26 +340,26 @@ cite {
font-style: normal;
}
-.blog h2 {
- border-bottom: 1px dotted #ccc;
- font-size: 95%;
- letter-spacing: 0.2em;
- margin: 15px 0 2px 0;
- padding-bottom: 2px;
-}
+//.blog h2 {
+// border-bottom: 1px dotted #ccc;
+// font-size: 95%;
+// letter-spacing: 0.2em;
+// margin: 15px 0 2px 0;
+// padding-bottom: 2px;
+//}
-.blog h3 {
- border-bottom: 1px dotted #eee;
- margin-top: 0;
-}
+//.blog h3 {
+// border-bottom: 1px dotted #eee;
+// margin-top: 0;
+//}
ol#comments li p {
font-size: 100%;
}
.blog p,.blog li, .feedback {
- font: 90%/175% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
- letter-spacing: -1px;
+// font: 90%/175% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
+// letter-spacing: -1px;
}
/* classes used by the_meta() */
@@ -670,6 +673,16 @@ div.aligncenter {
text-align: center;
}
+.shashinThumbnailDiv img{
+ margin: 0px !important;
+ padding: 0px !important;
+}
+
+.wp-caption img{
+ margin: 0px !important;
+ padding: 0px !important;
+}
+
.shashinThumbnailCaption {
color: #000;
font-size: 12px;
View
2  app/models/feed_entry.rb
@@ -17,7 +17,7 @@ def self.update_from_feed(feed_url)
create!(
:name => item.title,
:summary => item.summary,
- :url => item.url,
+ :url => item.link,
:content => item.content_encoded,
:published_at => item.pubDate,
:guid => item.id
View
67 app/views/pages/show.html.erb
@@ -1,27 +1,27 @@
<div id="centercontent">
<div id="fixedcontent">
<p id="notice"><%= notice %></p>
-
- <%= raw(@page.content) %>
- </div>
-
-<% if @page.name == "index"%>
-
-<div id="blog">
-<div>
-
-<script language="JavaScript">
-$.ajax({
- url: "<%= pages_show_blogfeed_path() %>",
- format: "html",
- cache: false,
- success: function(html){
- $("#blog").append(html);
- }
-});
-</script>
-<% end %>
-</div>
+ <%= raw(@page.content) %>
+
+ <% if @page.name == "index"%>
+
+ <div id="blog">
+ </div>
+
+ <script language="JavaScript">
+ $.ajax({
+ url: "<%= pages_show_blogfeed_path() %>",
+ format: "html",
+ cache: false,
+ success: function(html){
+ $("#blog").append(html);
+ }
+ });
+ </script>
+ <% end %>
+
+ </div><!-- FixedContent -->
+</div><!-- CenterContent -->
<div id="headerright"></div>
@@ -31,30 +31,7 @@ $.ajax({
</div>
-
-
-
-
-
-<!--
-<p>
- <b>Name:</b>
- <%= @page.name %>
-</p>
-
-<p>
- <b>Title:</b>
- <%= @page.title %>
-</p>
-
-<p>
- <b>Keywords:</b>
- <%= @page.keywords %>
-</p>
-
-
-
-
+12
<%= link_to 'Edit', edit_page_path(@page) %> |
<%= link_to 'Back', pages_path %>
-->
View
5 app/views/pages/show_blogfeed.html.erb
@@ -1,10 +1,9 @@
-<h1 style=" font-family: penna,sans-serif; font-size: 200%; font-weight: normal;">Latest News</h1>
+<h1>Latest News</h1>
<% @feed_entries.each do |feed_entry| %>
<div id="<%= feed_entry.guid %>" class="blog post class-post">
<h2 class="">
- <%= feed_entry.published_at.strftime("%d-%m-%Y") %>
+ <a href="<%= feed_entry.url %>"><%= feed_entry.published_at.strftime("%d %B") %>: <%= feed_entry.name %></a>
</h2>
- <h3 class="storytitle"><a href="<%= feed_entry.url %>"><%= feed_entry.name %></a></h3>
<div class="storycontent">
<%= raw(feed_entry.content) %>
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.