Skip to content

Commit

Permalink
Improvements for css
Browse files Browse the repository at this point in the history
  • Loading branch information
juarlex committed Dec 9, 2011
1 parent 9d3c46a commit 1ff2002
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 42 deletions.
17 changes: 7 additions & 10 deletions app/sass/application.sass
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
text-align: left
height: 42px
margin-top: 10px
//border: 1px solid red
ul
@extend .ui-tabs-nav
@extend .ui-helper-reset
Expand Down Expand Up @@ -41,6 +42,7 @@
@extend .ui-tabs-selected
@extend .ui-state-active
border-right: 0px
margin-top: 0px
li:hover
@extend .ui-state-hover

Expand All @@ -50,14 +52,9 @@
width: 930px
background: #fff
font-size: 11px
border: 5px solid #93c355
// border: 5px solid #93c355
margin-top: 10px
margin-left: -3px
-moz-border-radius-topright: 5px
-webkit-border-top-right-radius: 5px
-moz-border-radius-bottomright: 5px
-webkit-border-bottom-right-radius: 5px
-moz-border-radius-bottomleft: 5px
-webkit-border-bottom-left-radius: 5px
margin-bottom: 20px

#left-navigation
Expand Down Expand Up @@ -97,6 +94,7 @@
@extend .ui-tabs-selected
@extend .ui-state-active
border-right: none

li:hover
@extend .ui-state-hover

Expand All @@ -107,8 +105,8 @@
padding-top: 10px
padding-bottom: 10px
font-size: 14px
border-left: 5px solid #93c355
margin-left: -10px
// border-left: 5px solid #93c355
margin-left: 10px
padding-left: 9px
min-height: 950px

Expand All @@ -117,7 +115,6 @@
text-shadow: rgb(143,191,92) 1px 1px 3px
font-size: 160%
font-weight: bold
color: #6EAC2C
letter-spacing: -1px

h4
Expand Down
19 changes: 7 additions & 12 deletions app/sass/base.sass
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,22 @@ body
margin-bottom: 0px

#header
display: block-inline
display: inline-block
background: url("header_bg.png") repeat-x scroll left top
text-align: left
padding-top: 10px
height: 50px
height: 32px
width: 100%
margin-bottom: 30px
text-align: center
margin-bottom: 0px
#title
text-shadow: rgb(108, 165, 187) 1px 1px 3px
color: white
font-size: 230%
font-weight: bold
display: inline-block
position: absolute
font-size: 1.8em
font-weight: normal
position: relative
font-size: 1.4em
letter-spacing: -.05px
line-height: 1
margin-bottom: 10px
padding-left: 30px
float: left0
a, a:link, a:visited
text-decoration: none
color: white
Expand Down Expand Up @@ -87,7 +82,7 @@ body
margin-bottom: 10px

.section-with-border
border: 1px solid silver
border-bottom: 1px solid silver
padding: 5px
//-moz-border-radius: 5px
//-webkit-border-radius: 5px
Expand Down
19 changes: 15 additions & 4 deletions app/sass/collection_list.sass
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,25 @@
.wrapper
@extend .span-5
strong
font: 13px Arial,sans-serif
font: 14px Arial,sans-serif
font-weight: bold
text-align: justify
color: rgb(0, 136, 187)

.new_record
vertical-align: middle
margin-top: 20px
margin-left: 3px
@extend .ui-state-default


.wrapper
strong
font: 14px Arial,sans-serif
font-weight: bold
text-align: justify
color: rgb(0, 136, 187)

.record
padding-top: 8px
padding-bottom: 8px
Expand Down Expand Up @@ -71,8 +80,8 @@
margin-left: 5px

.collection_header_colors
background: #0088BB
color: white
background: rgb(161,216,241)
color: #0088bb
font-weight: normal
padding-left: 3px

Expand Down Expand Up @@ -105,6 +114,7 @@
@extend .span-18
@extend .last
@extend .collection_header_colors
border-top: 0px
.action
@extend .span-2
text-align: center
Expand All @@ -115,7 +125,7 @@
border-left: 1px solid #30a3d7
border-right: 1px solid #30a3d7
border-bottom: 1px solid #30a3d7
text-align: justify
text-align: left
padding-left: 3px
min-height: 60px

Expand All @@ -127,6 +137,7 @@
@extend .span-18
@extend .last
@extend .collection_header_colors
border-top: 0px
text-align: right
padding: 5px 0px 5px 0px
margin-bottom: 10px
Expand Down
3 changes: 2 additions & 1 deletion app/sass/form.sass
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ input[type="submit"]
label
display: block
font-weight: bold
font: 13px Arial, sans-serif
font: 14px Arial, sans-serif
color: rgb(0, 136, 187)

.fieldWithErrors
padding: 0px
Expand Down
2 changes: 1 addition & 1 deletion app/sass/partials/_base.sass
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$blueprint-grid-columns : 24
$blueprint-container-size : 950px
$blueprint-grid-margin : 10px
$blueprint-grid-margin : 15px

// Use this to calculate the width based on the total width.
// Or you can set $blueprint-grid-width to a fixed value and unset $blueprint-container-size -- it will be calculated for you.
Expand Down
4 changes: 1 addition & 3 deletions app/sass/publications.sass
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
#nav_links
@extend .span-18
@extend .last
@extend .prepend-1
text-align: right
text-align: left
margin-bottom: 10px
margin-left: -17px

a
text-decoration: none
Expand Down
7 changes: 4 additions & 3 deletions app/views/addresses/_record.html.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.section-with-border-and-bg
%h3 Domicilio profesional
%h4 Domicilio profesional
= show_for record do |a|
.row
= a.association :addresstype, :using => :name
Expand All @@ -9,6 +9,7 @@
= a.association :country, :using => :name
= a.association :state, :using => :name
= a.association :city, :using => :name
= a.attribute :zipcode, :wrapper_html => {:class => 'span-5'}
.row
= a.attribute :phone, :wrapper_html => {:class => 'span-17'}
= a.attribute :zipcode
= a.attribute :phone
= a.attribute :fax
6 changes: 4 additions & 2 deletions app/views/articles/_collection_header.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#collection_header
.span-1="Id"
.span-1
&nbsp
.span-8=t('.title')
.span-1='*'
.span-1
&nbsp
.span-1='+/-'
.action=t(:show)
.action=t(:edit)
Expand Down
1 change: 1 addition & 0 deletions app/views/articles/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#nav_links
= link_to t('.my_articles'), articles_path

= link_to t('.not_my_articles'), not_my_articles_path

= render :partial => 'search_form'
Expand Down
9 changes: 5 additions & 4 deletions app/views/people/_record.html.haml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
.section-with-border-and-bg

%h3 Datos personales
%h4 Datos personales
= show_for record do |p|
.row
.span-3
= image_for_person(record)
.span-3= p.attribute :firstname
.span-3= p.attribute :lastname1
.span-3= p.attribute :lastname2
.row
= p.attribute :firstname
= p.attribute :lastname1
= p.attribute :lastname2
.span-2.last= p.attribute :title
.row
= p.attribute :gender
Expand Down
5 changes: 3 additions & 2 deletions app/views/user_profiles/show.html.haml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
%h3 Información General
.span-18.last
%h3 Información General

= render :partial => 'people/record', :object => @user.person unless @user.person.nil?
= render :partial => 'addresses/record', :object => @user.address unless @user.address.nil?

.section-with-border-and-bg
%h3= t(".identifications")
%h4= t(".identifications")
= render :partial => 'user_identifications/record', :collection => @user.user_identifications

#submit_buttons
Expand Down

0 comments on commit 1ff2002

Please sign in to comment.