Skip to content

Commit

Permalink
Garima - Adding new styling
Browse files Browse the repository at this point in the history
  • Loading branch information
Garima Singh committed May 25, 2011
1 parent 7bdb9b2 commit 817caa4
Show file tree
Hide file tree
Showing 16 changed files with 58 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ GEM
treetop (~> 1.4.8)
mime-types (1.16)
polyglot (0.3.1)
rack (1.2.1)
rack (1.2.3)
rack-mount (0.6.13)
rack (>= 1.0.0)
rack-test (0.5.7)
Expand Down
2 changes: 1 addition & 1 deletion app/views/blogs/archive.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.blogs.white
.blogs.white.text_bk_layer
%h1 Archives
%hr/
%br/
Expand Down
2 changes: 1 addition & 1 deletion app/views/blogs/show.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.blogs.white
.blogs.white.text_bk_layer
%p#notice= notice
%h2
= @blog.name
Expand Down
4 changes: 2 additions & 2 deletions app/views/homes/blog.html.haml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.blog
.blog.text_bk_layer
%h2.name
= @blog.name
%hr/
%br/
.body.grey
.body
= raw sanitize(simple_format(@blog.body), :tags => %w(br p) )
%hr/
%hr/
Expand Down
2 changes: 1 addition & 1 deletion app/views/images/index.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.images
.images.images_internal.text_bk_layer
%h2 Listing images
%table
%tr
Expand Down
2 changes: 1 addition & 1 deletion app/views/images/new.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.white
.images.images_internal.white.text_bk_layer
%h1 New image
= render :partial => 'images/form'
= link_to 'Back', images_path
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
%meta{'NAME' => "ROBOTS", :content => "all"}/
%body
.header
= link_to image_tag("/images/name_logo/white_shadow_small.png"), root_path
= link_to image_tag("/images/name_logo/brown_shadow_small.png"), root_path
.content
- if params[:controller] == "homes"
.facebook_like_box.left
Expand Down
6 changes: 3 additions & 3 deletions app/views/shared/_about_me.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.about_me
.left.my_pic.border_grey
= image_tag "me.png"
.right.about_info.white
.left.my_pic.border_brown
= image_tag "me_red.jpg"
.right.about_info.white.text_bk_layer
%p
%i.left.large{:style => "margin:1px" } Photography
 
Expand Down
Binary file added public/images/bg_bike.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/me.png
Binary file not shown.
Binary file added public/images/me_red.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/name_logo/brown_shadow_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 7 additions & 2 deletions public/stylesheets/blogs.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
.blogs {
margin: 20px;
padding: 20px;
}

.blogs a {
text-decoration: none;
color: #666;
color: #ddd;
}

.blogs a:hover {
background-color: #666;
background-color: #ddd;
color: #000;
}

Expand All @@ -19,3 +20,7 @@
.blogs li {
margin-left: 10px;
}

.blog {
padding: 30px;
}
8 changes: 8 additions & 0 deletions public/stylesheets/images.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
color: white;
}

.images .gallery_link a {
color: #2D0A04;
}

.images a:hover {
background-color: #666;
color: #000;
Expand Down Expand Up @@ -33,3 +37,7 @@ table, th, tr, td {
height: 130px;
margin: 2px 100px 0 0;
}

.images_internal {
padding: 20px;
}
30 changes: 24 additions & 6 deletions public/stylesheets/styles.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
body {
background-color: #111;
background: url("../images/bg_bike.jpg") repeat scroll 0 0 #111111;
}

.header {
border-bottom: 2px solid #fff;
border-bottom: 2px solid #2D0A04;
height: 82px;
}

.content, .footer {
background-color: #1b1b1b;
margin: 2%;
width: 96%;
}
Expand All @@ -20,13 +20,14 @@ body {

.pagination {
clear: both;
background: #333;
background: #2D0A04;
padding: 20px;
text-align: center;
}

.facebook_like_box {
border: 4px solid #666666;
display: none;
margin: 62px 0 0 50px;
}

Expand Down Expand Up @@ -56,6 +57,10 @@ ul {
color: white;
}

.site_font_colour {
color: #2D0A04;
}

.grey {
color: #666;
}
Expand All @@ -68,6 +73,10 @@ ul {
border: 3px solid #666;
}

.border_brown {
border: 3px solid #2D0A04;
}

.block {
display: block;
}
Expand All @@ -76,11 +85,20 @@ ul {
color: #c8c132;
}

.text_bk_layer {
background: none repeat scroll 0 0 #170A04;
opacity: 0.7;
}

/* About Me */
.about_me_content {
height: 500px;
}

.about_info {
padding: 12px;
}

.about_info, .about_info ul {
width: 500px;
}
Expand All @@ -91,15 +109,15 @@ ul {

/* gallery */
.gallery .photo_container {
background-color: #555;
background-color: #AEAE82;
float: left;
height: 270px;
margin: 20px 42px;
width: 200px;
}

.gallery .photo_frame {
background-color: #222;
background-color: #100A04;
height: 160px;
margin: 10px 10px 10px;
width: 180px;
Expand All @@ -112,7 +130,7 @@ ul {
}

.gallery .photo_container .photo_info {
color: #aaa;
color: #2D0A04;
margin: 2px 8px;
}

Expand Down
17 changes: 8 additions & 9 deletions public/stylesheets/third_party/tabbedContent.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,31 @@
}

.tabs .moving_bg {
background-color: #2D0A04;
padding: 15px;
background-color:#666;
background-image:url(../../images/arrow_down_grey.png);
position: absolute;
width: 125px;
width: 135px;
z-index: 190;
left: 0;
padding-bottom: 29px;
background-position: bottom left;
background-repeat: no-repeat;
}

.tabs .tab_item {
color: #6F3F11;
cursor: pointer;
display: block;
float: left;
font-size: 16px;
padding: 15px;
width: 125px;
color: #ffffff;
position: relative;
width: 135px;
text-align: center;
z-index: 200;
position: relative;
cursor: pointer;
}

.tabbed_content .slide_content {
border: 4px solid #666;
border: 4px solid #2D0A04;
margin-left: -200px;
overflow: hidden;
padding: 20px 0 20px 20px;
Expand Down

0 comments on commit 817caa4

Please sign in to comment.