Download as
Browse Code »

Commit b9cd7663e9dcc6e98994eceb8b1b761fdfa7616e

Authored by Daniela Feitosa
1 parent 8cb871b2
Exists in master

Fixes for event theme 

* Added better images for backgrounds
* Style of blocks on home
* Style of blog page
Showing 19 changed files with 244 additions and 139 deletions   Show diff stats
_article.sass
  Diff comments   View file @b9cd766
1 1 #article
2 2 color: #69677A
3   - #article-parent
  3 + #article-parent, &.blog #article-header
4 4 font-family: 'Ubuntu'
5 5 background: url("images/dots.png") repeat-x left center
6 6 border-left: 10px solid #575959
7 7 text-align: left
  8 + #article-parent
8 9 a
9 10 background: #FFF
10 11 border: none
... ... @@ -14,10 +15,9 @@
14 15 padding-left: 10px
15 16 &:hover
16 17 color: #69677A
17   - font-weight: bold
18 18 #article-header
19 19 .publishing-info
20   - .author, .comments
  20 + .author, .comments, .followers-count
21 21 display: none
22 22 .title
23 23 font-family: 'Ubuntu'
... ... @@ -25,7 +25,50 @@
25 25 font-size: 20px
26 26 font-variant: normal
27 27 border-bottom: none
  28 + background: none
28 29 .article-body
29   - border-bottom: 1px dotted #69677A
30 30 line-height: 1.5
31 31 font-size: 14px
  32 + &.blog
  33 + #article-header
  34 + h1.title
  35 + background: #FFF
  36 + display: inline
  37 + padding: 0px 15px
  38 + .publishing-info, .blog-feed-link
  39 + display: none
  40 + .blog-posts
  41 + font-family: 'Ubuntu'
  42 + margin-top: 0px
  43 + .blog-post
  44 + margin: 0px
  45 + padding: 15px 0px
  46 + background: none
  47 + border-bottom: 1px solid #999
  48 + .publishing-info
  49 + display: none
  50 + .title
  51 + margin-left: 30%
  52 + border-bottom: none
  53 + background: none
  54 + padding: 2px 0px
  55 + a
  56 + text-decoration: none
  57 + color: #6E6E6E
  58 + font-size: 16px
  59 + font-variant: normal
  60 + font-weight: bold
  61 + .article-compact-image
  62 + margin-top: -45px
  63 + .article-compact-abstract-with-image
  64 + display: none
  65 + .read-more-link
  66 + margin: 20px 0px 0px 20px
  67 + display: inline-block
  68 + background: url('images/icone-pb-leia-mais.png') no-repeat left center
  69 + padding: 8px 0px
  70 + text-decoration: none
  71 + span
  72 + padding-left: 50px
  73 + font-size: 14px
  74 + font-weight: bold
... ...
_blocks.sass
  Diff comments   View file @b9cd766
1 1 #content
2   - .link-list-block
3   - background-color: #696778
4   - border-radius: 5px
5   - padding: 0px
6   - li
7   - border-bottom: 1px dotted #9A9996
8   - margin: 0px
9   - padding: 20px
10   - background-color: transparent
11   - a
12   - background: url('images/arrow.png') left center no-repeat
13   - color: #FFF
14   - font-size: 15px
15   - padding-left: 40px
16   - &:hover
  2 + .box-2
  3 + font-family: 'Ubuntu'
  4 + .block-outer
  5 + .link-list-block
  6 + border-radius: 5px
  7 + padding: 0px
  8 + li
  9 + margin: 0px
  10 + padding: 20px
17 11 background-color: transparent
18   - font-weight: bold
19   - .block-outer:last-child .link-list-block
20   - color: #69677A
21   - border: 1px solid #69677A
22   - .block-title
23   - background-image: url('images/centralconteudos.png')
24   - background-size: auto
25   - color: #E4E5CC
26   - margin: 0px
27   - margin-left: 10px
28   - padding: 20px 0px 20px 35px
29   - text-transform: none
30   - ul
31   - background-color: #FFF
32   - li
33   - border-bottom: none
34   - a
35   - background: none
36   - color: #69677A
37   - font-weight: bold
38   - padding-left: 15px
39   - .highlights-block
40   - font-family: 'Ubuntu Mediun'
41   - height: auto
42   - .block-title
  12 + a
  13 + font-size: 16px
  14 + &:nth-child(1) .link-list-block
  15 + background-color: #696778
  16 + li
  17 + border-bottom: 1px dotted #9A9996
  18 + &:last-child
  19 + border: none
  20 + a
  21 + background: url('images/icone-seta.png') left center no-repeat
  22 + color: #FFF
  23 + padding-left: 40px
  24 + &.link-this-page
  25 + background-color: transparent
  26 + border: medium none
  27 + &:hover
  28 + border-right: none
  29 + &:nth-child(3) .link-list-block
  30 + color: #696778
  31 + border: 1px solid #696778
  32 + .block-title
  33 + background: #696778 url('images/icone-central-conteudo.png') no-repeat 10px
  34 + color: #E4E5C9
  35 + font-size: 16px
  36 + margin: 0px
  37 + padding: 25px 0px
  38 + text-transform: none
  39 + span
  40 + margin-left: 50px
  41 + ul
  42 + li
  43 + list-style: inside
  44 + padding: 8px 15px
  45 + a
  46 + background: none
  47 + color: #69677A
  48 + padding-left: 5px
  49 + display: inline
  50 + .box-1
  51 + .highlights-block
43 52 font-family: 'Ubuntu Mediun'
44   - color: #FFF
45   - position: absolute
46   - margin: 20px 0px 0px 15px
47   - z-index: 10
48   - .highlights-container
49   - height: 350px !important
50   - border: transparent
51   - .highlights-image-link
52   - background-color: #3F3D49
  53 + font-size: 18px
  54 + height: auto
  55 + width: 700px
  56 + text-align: left
  57 + .block-title
  58 + color: #FFF
  59 + position: absolute
  60 + margin: 20px 0px 0px 15px
  61 + z-index: 10
  62 + text-transform: none
  63 + span
  64 + padding-left: 10px
  65 + .highlights-container
53 66 height: 350px !important
54   - .highlights-label
55   - background: transparent url('images/more.png') 98% center no-repeat
56   - font-size: 16px
57   - color: #E4E5C9
58   - div
59   - margin: 0px 40px 0px 15px
60   - .highlights-block-pager
61   - width: 99%
62   - padding: 0px
63   - background: #3F3D49 url('images/slide-bg.png') center repeat-x
64   - a
65   - display: inline-block
66   - color: transparent
67   - width: 100px
68   - font-size: 1px
69   - margin: 0px
70   - padding: 10px 0px
71   - &.activeSlide
72   - background: url('images/activeslide-bg.png') center repeat-x
73   - .highlights-block-footer
74   - display: none
  67 + border: transparent
  68 + .highlights-image-link
  69 + background-color: #3F3D49
  70 + height: 350px !important
  71 + .highlights-label
  72 + background: transparent url('images/icone-normal-leia-mais.png') 98% center no-repeat
  73 + color: #E4E5C9
  74 + div
  75 + margin: -5px 40px 0px 15px
  76 + .highlights-block-pager
  77 + width: 99%
  78 + padding: 0px
  79 + background: #3F3D49 url('images/slide-bg.png') center repeat-x
  80 + a
  81 + display: inline-block
  82 + color: transparent
  83 + width: 100px
  84 + font-size: 1px
  85 + margin: 0px
  86 + padding: 10px 0px
  87 + &.activeSlide
  88 + background: url('images/activeslide-bg.png') center repeat-x
  89 + .highlights-block-footer
  90 + display: none
... ...
_home.sass
  Diff comments   View file @b9cd766
1 1 #content
2   - #article.blog #article-header h1.title
3   - background: url('images/arrow.png') no-repeat left center
4   - font-family: 'Ubuntu'
5   - color: #686679
6   - font-variant: normal
7   - font-size: 18px
8   - padding: 2px 0px 2px 35px
9   - border: none
10   - #article
11   - .blog-posts
12   - .blog-post
13   - background: none
14   - .publishing-info
15   - display: none
16   - .title
  2 + .main-block
  3 + display: none
  4 + .blocks > .block-outer > .display-content-block
  5 + width: 695px
  6 + padding-top: 30px
  7 + h3.block-title
  8 + font-family: 'Ubuntu Mediun'
  9 + font-size: 18px
  10 + font-variant: normal
  11 + text-transform: none
  12 + color: #686679
  13 + padding: 2px 0px 2px 35px
  14 + margin-left: 30px
  15 + border: none
  16 + background: url('images/icone-seta.png') no-repeat left center
  17 + ul
  18 + li
  19 + margin: 5px 0px
  20 + padding: 15px
  21 + overflow: hidden
  22 + border-bottom: 1px solid #999
  23 + > div
  24 + float: left
17 25 font-family: 'Ubuntu'
18   - margin-left: 30%
19   - border-bottom: none
  26 + font-size: 14px
  27 + .image
  28 + width: 160px
  29 + height: 130px
  30 + margin-right: 10px
  31 + overflow: hidden
  32 + a
  33 + display: block
  34 + img
  35 + max-width: 160px
  36 + .title
  37 + color: #3F3F3F
  38 + width: 480px
  39 + margin: 5px 0px 30px 0px
20 40 a
21 41 text-decoration: none
22   - color: #6E6E6E
23   - font-size: 16px
  42 + color: #3F3F3F
  43 + font-size: 14px
24 44 font-variant: normal
25   - font-weight: bold
26   - .article-compact-image
27   - margin-top: -35px
28   - .article-compact-abstract-with-image
  45 + .lead
29 46 display: none
30   - .read-more-link
31   - margin: 20px 0px 0px 20px
32   - display: inline-block
33   - background: url('images/dark-more.png') no-repeat left center
  47 + .read_more
  48 + background: url('images/icone-pb-leia-mais.png') no-repeat left center
  49 + width: 480px
34 50 padding: 8px 0px
35   - text-decoration: none
36   - span
37   - padding-left: 50px
38   - font-family: 'Ubuntu'
39   - font-size: 16px
40   - font-weight: bold
41   - hr.sep-posts
42   - display: block
43   - margin-top: 15px
44   - .pagination
45   - display: none
  51 + a
  52 + color: #3F3F3F
  53 + padding-left: 40px
  54 + text-decoration: none
  55 + text-transform: lowercase
  56 + #read-all-link
  57 + font-family: 'Ubuntu'
  58 + font-size: 14px
  59 + display: block
  60 + text-transform: lowercase
  61 + text-align: right
  62 + a
  63 + color: #3F3F3F
  64 + border: 1px solid #3F3F3F
  65 + border-radius: 20px
  66 + padding: 5px 15px
  67 + text-decoration: none
46 68 .container-block-plugin_container-block
47 69 .block-outer
48   - width: 49%
49   - height: 270px
50   - border: 1px solid #69677A
51   - border-radius: 5px
  70 + width: 345px
  71 + height: 260px
52 72 .block-title
53 73 margin: 0px
54 74 padding: 20px 50px
55   - color: #E4E5CC
56   - background: #69677A url('images/video-bg.png') no-repeat 10px center
57 75 text-transform: capitalize
58   - &:first-child
  76 + &:nth-child(1)
  77 + margin-right: 5px
  78 + &:nth-child(1) .display-content-block
59 79 color: #696776
60   - margin-right: 10px
61   - border-color: #DAE1C4
  80 + border: 1px solid #DAE1C4
  81 + border-radius: 5px
62 82 .block-title
63   - background-image: url('images/oquee.png')
64   - background-color: #DAE1C4
65   - color: #696776
66   - .display-content-block
  83 + background: #DAE1C4 url('images/icone-o-que-e.png') no-repeat 10px center
  84 + color: #69677A
67 85 ul
68 86 margin: 0px
69 87 .lead
70 88 font-family: 'Ubuntu'
71 89 font-size: 14px
  90 + color: #444
72 91 line-height: 1.5
73   - height: 125px
  92 + height: 110px
74 93 overflow: hidden
75 94 padding: 10px
76 95 .read_more
77 96 padding: 5px 0px
78   - margin-left: 10px
79   - margin-top: 20px
80   - background: url('images/more.png') no-repeat left center
  97 + margin: 20px 10px
  98 + background: url('images/icone-pb-leia-mais.png') no-repeat left center
81 99 a
82 100 font-family: 'Ubuntu'
83 101 font-weight: bold
... ... @@ -85,12 +103,17 @@
85 103 padding-left: 40px
86 104 text-transform: lowercase
87 105 text-decoration: none
88   - .video-block
  106 + &:nth-child(2) .video-block, &:nth-child(2) .video-plugin_video-block
  107 + border: 1px solid #69677A
  108 + border-radius: 5px
  109 + .block-title
  110 + background: #69677A url('images/icone-video.png') no-repeat 10px center
  111 + color: #E4E5C9
89 112 margin: 0px
90 113 .video-block-data
91 114 padding: 10px 5px
92 115 iframe
93   - height: 188px !important
  116 + height: 180px !important
94 117 width: 335px !important
95 118 border-radius: 5px
96 119  
... ...
header.html.erb
  Diff comments   View file @b9cd766
... ... @@ -99,3 +99,7 @@
99 99 <a href="?lang=en" class="flag-en" title="English"><span>English</span></a>
100 100 </div>
101 101 </div>
  102 +
  103 +<div id='read-all-link'>
  104 + <%= link_to _('Leia todos'), profile.blog.url %>
  105 +</div>
... ...
images/arrow.png
View file @8cb871b

981 Bytes
images/centralconteudos.png
View file @8cb871b

1.07 KB
images/dark-more.png
View file @8cb871b

562 Bytes
images/icone-central-conteudo.png 0 → 100755
View file @b9cd766

846 Bytes
images/icone-final-consulta.png 0 → 100755
View file @b9cd766

921 Bytes
images/icone-normal-leia-mais.png 0 → 100755
View file @b9cd766

577 Bytes
images/icone-o-que-e.png 0 → 100755
View file @b9cd766

893 Bytes
images/icone-pb-leia-mais.png 0 → 100755
View file @b9cd766

537 Bytes
images/icone-seta.png 0 → 100755
View file @b9cd766

587 Bytes
images/icone-video.png 0 → 100755
View file @b9cd766

1009 Bytes
images/more.png
View file @8cb871b

672 Bytes
images/oquee.png
View file @8cb871b

1.04 KB
images/video-bg.png
View file @8cb871b

1.26 KB
style.sass
  Diff comments   View file @b9cd766
... ... @@ -13,7 +13,7 @@
13 13 src: url('fonts/Ubuntu-M.ttf')
14 14  
15 15 @font-face
16   - font-family: 'Ubuntu'
  16 + font-family: 'Ubuntu Italic'
17 17 font-weight: 300
18 18 font-style: italic
19 19 src: url('fonts/Ubuntu-RI.ttf')
... ... @@ -32,6 +32,9 @@ body
32 32 #theme-header, #site-title
33 33 display: none
34 34  
  35 +#theme-header #read-all-link
  36 + display: none
  37 +
35 38 #wrap-2
36 39 border: none
37 40 margin: 0
... ... @@ -52,13 +55,20 @@ body
52 55  
53 56 @import blocks
54 57  
55   -@import home
56   -
57   -.main-content
58   - border: none
59   - box-shadow: none
60   -
  58 +.profile-homepage
  59 + @import home
  60 +
61 61 #content
  62 + .main-content
  63 + border: none
  64 + box-shadow: none
  65 + h1
  66 + font-family: 'Ubuntu'
  67 + font-variant: normal
  68 + color: #69677A
  69 + background: url('images/icone-seta.png') no-repeat left center
  70 + border: none
  71 + padding: 2px 0px 2px 30px
62 72 .block-title
63 73 border: none
64 74 color: #000
... ... @@ -67,7 +77,7 @@ body
67 77 font-weight: normal
68 78 margin-bottom: 30px
69 79 text-transform: uppercase
70   - background: url('images/arrow.png') no-repeat left center
  80 + background: url('images/icone-seta.png') no-repeat left center
71 81 background-size: contain
72 82 padding: 2px 0px 2px 25px
73 83 span
... ...
theme.js
  Diff comments   View file @b9cd766
... ... @@ -24,9 +24,18 @@
24 24 });
25 25 }
26 26  
  27 + function addReadAllLink() {
  28 + if ($('body').hasClass('profile-homepage')) {
  29 + var block = $('.box-1 .blocks > .block-outer > .display-content-block ');
  30 + var link = $('#theme-header #read-all-link');
  31 + $(link).appendTo(block);
  32 + };
  33 + }
  34 +
27 35 $(document).ready(function(){
28 36 setBreadcrumbs();
29 37 changeHighlighsBlock();
30 38 addReadMoreLink();
  39 + addReadAllLink();
31 40 });
32 41 })(jQuery);
... ...