Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

added some elements and styles

  • Loading branch information...
commit efddb77ba534ce156c08727e20947899569b6ea4 1 parent df9c0b4
@phillipkregg authored
View
64 app/assets/javascripts/application.js
@@ -18,6 +18,70 @@
$(document).ready(function() {
+ // Limit scope pollution from any deprecated API
+ (function() {
+
+ var matched, browser;
+
+ // Use of jQuery.browser is frowned upon.
+ // More details: http://api.jquery.com/jQuery.browser
+ // jQuery.uaMatch maintained for back-compat
+ jQuery.uaMatch = function( ua ) {
+ ua = ua.toLowerCase();
+
+ var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
+ /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+ /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
+ /(msie) ([\w.]+)/.exec( ua ) ||
+ ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
+ [];
+
+ return {
+ browser: match[ 1 ] || "",
+ version: match[ 2 ] || "0"
+ };
+ };
+
+ matched = jQuery.uaMatch( navigator.userAgent );
+ browser = {};
+
+ if ( matched.browser ) {
+ browser[ matched.browser ] = true;
+ browser.version = matched.version;
+ }
+
+ // Chrome is Webkit, but Webkit is also Safari.
+ if ( browser.chrome ) {
+ browser.webkit = true;
+ } else if ( browser.webkit ) {
+ browser.safari = true;
+ }
+
+ jQuery.browser = browser;
+
+ jQuery.sub = function() {
+ function jQuerySub( selector, context ) {
+ return new jQuerySub.fn.init( selector, context );
+ }
+ jQuery.extend( true, jQuerySub, this );
+ jQuerySub.superclass = this;
+ jQuerySub.fn = jQuerySub.prototype = this();
+ jQuerySub.fn.constructor = jQuerySub;
+ jQuerySub.sub = this.sub;
+ jQuerySub.fn.init = function init( selector, context ) {
+ if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
+ context = jQuerySub( context );
+ }
+
+ return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+ };
+ jQuerySub.fn.init.prototype = jQuerySub.fn;
+ var rootjQuerySub = jQuerySub(document);
+ return jQuerySub;
+ };
+
+ })();
+
$(function() {
if ($.browser.msie && $.browser.version.substr(0,1)<7)
{
View
1  app/assets/stylesheets/application.css.scss
@@ -25,6 +25,7 @@
@import "sass/navbar/navbar";
@import "sass/post/post";
@import "sass/boxes/two_column_box";
+@import "sass/boxes/single_column_box";
@import "sass/articles/article";
View
24 app/assets/stylesheets/sass/articles/article.scss
@@ -1,12 +1,17 @@
-article {
-
+article {
+ font-size: 15px;
background: white;
@include pad(10px);
+ p:first-child {
+ strong {
+ color: red;
+ }
+ }
+
.article_header {
- h3 {
- font-family: 'Vollkorn', serif;
+ h3 {
color: $medium_blue;
font-size: 30px;
@@ -17,7 +22,18 @@ article {
.author {}
.article_content {
+ line-height: 30px;
+ ul {
+ list-style-type: circle;
+ line-height: 30px;
+ margin-top: 20px;
+ margin-bottom: 20px;
+ margin-left: 30px;
+ ul {
+ list-style-type: disc;
+ }
+ }
}
View
23 app/assets/stylesheets/sass/boxes/_single_column_box.scss
@@ -0,0 +1,23 @@
+
+.single_column_box {
+ margin-top: 10px;
+ @include box-shadow(0 0 5px 2px hsla(0, 0%, 0%, 0.65));
+ .box_header {
+ @include pad(10px);
+ @include linear-gradient($medium_blue, $dark_blue);
+
+ h3 {
+ color: white;
+ text-transform: uppercase;
+ }
+
+ }
+ .box_content {
+ @include pad(10px);
+ text-align: left;
+ h4 {
+ margin: 0;
+ }
+ border-bottom: 1px solid #ccc;
+ }
+}
View
11 app/assets/stylesheets/sass/boxes/two_column_box.scss
@@ -6,14 +6,19 @@
.old_client_header {
@include span-columns(4 of 8);
- text-align: left;
- color: white;
+ text-align: left;
+ h3 {
+ color: white;
+ }
+
}
.new_client_header {
@include span-columns(4 of 8);
text-align: left;
- color: white;
+ h3 {
+ color: white;
+ }
}
} // end box header container
View
15 app/assets/stylesheets/sass/layout/layout.scss
@@ -3,6 +3,15 @@
font-family: 'Open Sans', sans-serif;
}
+h1,h2,h3,h4,h5 {
+ color: #333;
+}
+
+p, li {
+ color: #333;
+}
+
+
body {
background: url('wow_bg.png') $medium_blue no-repeat center top;
@@ -42,8 +51,12 @@ header {
.right_column {
- background: #54FF9F;
@include span-columns(4);
text-align: center;
min-height: 200px;
+
+ img {
+ @include box-shadow(0 0 5px 2px hsla(0, 0%, 0%, 0.65));
+ }
+
}
View
6 app/assets/stylesheets/sass/post/post.scss
@@ -20,7 +20,11 @@
.comment_header {
@include border-top-radius(10px);
@include linear-gradient($medium_blue, $dark_blue);
- color: white;
+
+ h4 {
+ color: white;
+ }
+
}
.comment_body {
@include pad(20px);
View
95 app/views/home/page1.html.erb
@@ -23,9 +23,67 @@
<span>by Stephen King</span> 3/3/2013
</h5>
- <p class="article_content">
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque dignissim suscipit pretium. Aliquam vel est velit, sit amet hendrerit mauris. Vestibulum pharetra ipsum id magna feugiat fermentum. Proin risus eros, congue vel hendrerit commodo, dignissim at lacus. Nulla facilisi. Morbi porta ipsum ut orci sagittis vel gravida odio commodo. Aenean consectetur, eros quis venenatis semper, quam lectus varius erat, ac laoreet tellus metus aliquam ante. Vestibulum neque velit, venenatis quis ornare aliquet, lobortis ut turpis. Sed id augue vitae sapien rutrum fermentum. Sed varius urna sed tortor consectetur iaculis. Praesent ac suscipit erat. Aenean est odio, tristique a feugiat tristique, posuere quis ligula. Morbi a tellus non risus pretium molestie ac ut nulla. Nunc urna ligula, hendrerit non auctor in, mollis in leo. Curabitur et magna eget urna interdum dictum auctor non lorem. Proin faucibus, nisl eget tincidunt mattis, erat erat egestas lectus, nec scelerisque magna mi scelerisque mauris.
- </p>
+ <div class="article_content">
+
+ <p>
+ The following is all changes to the AIR client, the game
+ client had NO CHANGES this patch- Anything you see that has been
+ removed, are changes added to the air client only to catch
+ it up to the game client changes <strong>Everything below seems to
+ be a change back from the previous PBE patches.</strong> (However once again,
+ the game client has not been touched)
+ </p>
+
+ <ul>
+ <li>
+ This is PBE. This is where riot tries out various numbers to test and play with. This does not mean it will go live like this!
+ </li>
+ <li>
+ The following is datamined from the TOOLTIPS, this means any changes, are changes made to the tooltips and may not reflect abilities that have values that don't match their tooltips
+ </li>
+ <li>
+ -Riot may not always fully update a tooltip, PLEASE do not rage about changes, take these as a basic idea of what to go test on the PBE!
+ </li>
+ <li>
+ This compares PBE to PBE (not live)
+ </li>
+ <li>
+ "Remember, PBE are not patch notes!" ~ @RiotMorello!
+ </li>
+ </ul>
+
+
+ Things to note:
+
+ <ul>
+ <li>
+ This is not a Malphite buff, just a change back
+ </li>
+
+
+ <li><strong>The following items have been updated or Moved:</strong></li>
+ <ul>
+ <li>Draven_Gladiator.skl</li>
+ <li>Draven_Gladiator.skn</li>
+ <li>nidalee_headhunter.skl</li>
+ <li>nidalee_headhunter.skn</li>
+ <li>color-Nami_alpha_glow.jpg</li>
+ <li>color-Nami_orbglow.jpg</li>
+ <li>Jackinthebox_Circle.jpg</li>
+ <li>Jackinthebox_Square.jpg</li>
+ <li>Nami_alph_glow.jpg</li>
+ <li>Nami_orbswirl.jpg</li>
+ <li>Nami_orbswirl_02.jpg</li>
+ <li>nidalee_headhunter_TX_CM.jpg <--- Changed from blue to green (here is old version)</li>
+ <li>nidalee_headhunter_TX_RM.jpg</li>
+ <li>Nidalee_Spear_Headhunter_TX_CM.jpg</li>
+ <li>QuarterCircle.jpg</li>
+ <li>QuarterCircle_Dark.jpg</li>
+ </ul>
+ </ul>
+
+
+ </div>
<hr/>
@@ -116,5 +174,36 @@
<div class="right_column">
<img src="assets/thunder_king_ad.png" />
+ <div class="single_column_box">
+ <div class="box_header">
+ <h3>Most Commented Articles</h3>
+ </div>
+ <div class="box_content">
+ <ul>
+ <li>
+ <h4>Pax Skin Giveaway - Riot Graves and...</h4>
+ <span>By Molster 3 days ago</span>
+ </li>
+ </ul>
+ </div>
+ <div class="box_content">
+ <ul>
+ <li>
+ <h4>Pax Skin Giveaway - Riot Graves and...</h4>
+ <span>By Molster 3 days ago</span>
+ </li>
+ </ul>
+ </div>
+ <div class="box_content">
+ <ul>
+ <li>
+ <h4>Pax Skin Giveaway - Riot Graves and...</h4>
+ <span>By Molster 3 days ago</span>
+ </li>
+ </ul>
+ </div>
+ </div>
+
+
</div>
View
22 app/views/layouts/application.html.erb
@@ -20,9 +20,9 @@
<nav>
<ul id="menu">
<li><a href="#">Home</a></li>
- <li><a href="#">Link</a></li>
+ <li><a href="#">News</a></li>
<li>
- <a href="#">Link</a>
+ <a href="#">Tier List</a>
<ul>
<li><a href="#">sublink 1</a></li>
<li><a href="#">sublink 2</a></li>
@@ -30,11 +30,19 @@
<li><a href="#">sublink 4</a></li>
</ul>
</li>
- <li><a href="#">Link</a></li>
- <li><a href="#">Link</a></li>
- <li><a href="#">Link</a></li>
- <li><a href="#">Link</a></li>
- <li><a href="#">Link</a></li>
+ <li><a href="#">Red Tracker</a></li>
+ <li><a href="#">Videos</a></li>
+ <li><a href="#">Streams</a></li>
+ <li>
+ <a href="#">Forums</a>
+ <ul>
+ <li><a href="#">sublink 1</a></li>
+ <li><a href="#">sublink 2</a></li>
+ <li><a href="#">sublink 3</a></li>
+ <li><a href="#">sublink 4</a></li>
+ </ul>
+ </li>
+
<div id="social_icons">
<i class="icon-facebook icon-large icon-white"></i>
<i class="icon-twitter icon-large icon-white"></i>
Please sign in to comment.
Something went wrong with that request. Please try again.