Download as
Browse Code »

Commit ff6dd419db0d13f49a29ab6073f51049d0796d61

Authored by Melissa Wen
1 parent cfd61930
Exists in master

change color and font style, include icons and adjust breadcrumbs

Showing 19 changed files with 82 additions and 35 deletions   Show diff stats
_homeblocks.sass
  Diff comments   View file @ff6dd41
... ... @@ -16,11 +16,14 @@
16 16 .short-post
17 17 font-family: 'Ubuntu'
18 18 font-size: 13px
  19 + a
  20 + color: #3B9AAD
  21 + text-decoration: none
19 22 .read-more
20 23 a
21   - background: url('icons/more.png') no-repeat left center
  24 + background: url('icons/ico-orange.png') no-repeat left center
22 25 background-size: contain
23   - color: #000
  26 + color: #F9A100
24 27 display: block
25 28 float: right
26 29 font-family: 'Ubuntu'
... ... @@ -30,6 +33,7 @@
30 33 margin: 25px 0
31 34 padding-left: 30px
32 35 text-decoration: none
  36 + text-transform: lowercase
33 37  
34 38 #content
35 39 .container-block-plugin_container-block
... ... @@ -42,16 +46,16 @@
42 46 padding: 25px 0 0 0
43 47 width: 480px !important
44 48 .block-title
45   - color: #E4E5CC
  49 + color: #EAE6C6
46 50 margin-bottom: 20px
47 51 padding-left: 15px
48 52 span
49   - background: url('icons/more.png') no-repeat left center
  53 + background: url('icons/ico-light.png') no-repeat left center
50 54 background-size: contain
51 55 ul
52 56 margin: 0
53 57 li
54   - border-bottom: 1px solid #E4E5CC
  58 + border-bottom: 1px solid #EAE6C6
55 59 margin: 0
56 60 overflow: hidden
57 61 padding: 15px
... ... @@ -107,9 +111,12 @@
107 111 padding: 25px 15px 15px
108 112 width: 450px !important
109 113 .block-title
110   - color: #409EA8
  114 + color: #3B9AAD
111 115 margin-bottom: 25px
112 116 padding: 0
  117 + span
  118 + background: url('icons/ico-blue.png') no-repeat left center
  119 + background-size: contain
113 120 li
114 121 margin: 0
115 122 padding: 0
... ... @@ -135,9 +142,9 @@
135 142 margin: 15px 0 0 0
136 143 width: auto
137 144 a
138   - background: url('icons/more.png') no-repeat left center
  145 + background: url('icons/ico-orange.png') no-repeat left center
139 146 background-size: 25px 24px
140   - color: #575959
  147 + color: #F9A100
141 148 height: 25px
142 149 line-height: 25px
143 150 text-indent: 30px
... ... @@ -149,7 +156,11 @@
149 156 padding: 0
150 157 .block-title
151 158 background: #E5E5E5
  159 + color: #64677C
152 160 padding: 20px
  161 + span
  162 + background: url('icons/ico-purple.png') no-repeat left center
  163 + background-size: contain
153 164 li
154 165 background: none
155 166 margin: 0 25px 0 0
... ... @@ -157,15 +168,33 @@
157 168 a
158 169 background: #FFF2DD url('icons/13.png') no-repeat 25px 40px
159 170 background-size: 169px
160   - border: 1px solid #FF9C39
161   - color: #FF9C39
  171 + border: 1px solid #F9A100
  172 + color: #F9A100
162 173 font-family: 'Ubuntu'
163   - font-size: 16px
  174 + font-size: 20px
164 175 font-weight: 700
165 176 display: block
166 177 height: 20px
167 178 padding: 230px 25px 40px
168 179 text-align: center
169 180 width: 169px
  181 + &:nth-child(2)
  182 + a
  183 + background: #F9F9F1 url('icons/13.png') no-repeat 25px 40px
  184 + background-size: 169px
  185 + border: 1px solid #B5B88E
  186 + color: #B5B88E
  187 + &:nth-child(3)
  188 + a
  189 + background: #DEF4FA url('icons/13.png') no-repeat 25px 40px
  190 + background-size: 169px
  191 + border: 1px solid #3B9AAD
  192 + color: #3B9AAD
170 193 &:last-child
171 194 margin: 0
  195 + a
  196 + background: #E7E6F1 url('icons/13.png') no-repeat 25px 40px
  197 + background-size: 169px
  198 + border: 1px solid #6A677C
  199 + color: #6A677C
  200 +
... ...
_internalpage.sass
  Diff comments   View file @ff6dd41
1 1 #content
2 2 .breadcrumbs-plugin_content-breadcrumbs-block
3   - border-bottom: 2px solid #000
4   - margin: 0
5   - padding: 25px 10px 15px 10px
  3 + margin: 0 0 30px 0
  4 + padding: 0
6 5 a.item, span.separator, #breadcrumbs-you-are-here
7   - color: #E51419
8   - font-family: 'Open Sans'
  6 + color: #4F9CAC
  7 + font-family: 'Ubuntu'
9 8 font-size: 14px
10   - text-transform: uppercase
  9 + margin-right: 10px
  10 + a.item
  11 + color: #575959
  12 + text-transform: capitalize
11 13 #breadcrumbs-you-are-here
12 14 font-weight: 700
  15 + text-transform: uppercase
13 16 .main-content
14 17 border: none
15   - border-bottom: 2px solid #000
  18 + border-bottom: 1px dotted #575959
16 19 border-radius: 0
17 20 box-shadow: none
18   - padding: 20px
  21 + padding: 0px
  22 + #article-header
  23 + background: url('icons/line.png') repeat-x left 8px
  24 + display: block
  25 + height: 75px
  26 + margin: 25px 0 0 0
  27 + width: 100%
19 28 h1.title
20   - border: none
21   - color: #000
22   - font-family: 'Open Sans'
23   - font-size: 18px
  29 + background: #FFF
  30 + border-bottom: none
  31 + border-left: 10px solid #575959
  32 + color: #575959
  33 + display: block
  34 + float: left
  35 + font-family: 'Ubuntu'
  36 + font-size: 22px
24 37 font-variant: normal
25   - font-weight: normal
26   - background: url('images/home/09.png') no-repeat left center
27   - background-size: contain
28   - height: 25px
29   - margin-bottom: 40px
30   - padding-left: 35px
31   - text-transform: uppercase
  38 + font-weight: 300
  39 + margin: 0 0 25px 0
  40 + padding: 0 15px
  41 + position: relative
  42 + width: auto
32 43 .publishing-info
33   - display: none
  44 + display: block
  45 + float: left
  46 + width: 100%
  47 + #article
  48 + font-family: 'Ubuntu'
  49 + font-size: 13px
  50 + .article-body a
  51 + color: #3B9AAD
  52 + text-decoration: none
... ...
icons/agenda-contagem.png
View file @cfd6193

921 Bytes
icons/balao.png
View file @cfd6193

528 Bytes
icons/balao_claro.png
View file @cfd6193

517 Bytes
icons/como-participar.png
View file @cfd6193

1.14 KB
icons/ico-blue.png 0 → 100644
View file @ff6dd41

583 Bytes
icons/ico-light.png 0 → 100644
View file @ff6dd41

582 Bytes
icons/ico-orange.png 0 → 100644
View file @ff6dd41

501 Bytes
icons/ico-purple.png 0 → 100644
View file @ff6dd41

628 Bytes
icons/indicadores.png
View file @cfd6193

1004 Bytes
icons/login.png
View file @cfd6193

1.06 KB
icons/pessoas.png
View file @cfd6193

1.27 KB
icons/trilhas.png
View file @cfd6193

1.79 KB
icons/user.png
View file @cfd6193

512 Bytes
icons/visualizacao.png
View file @cfd6193

502 Bytes
icons/visualizacao_claro.png
View file @cfd6193

425 Bytes
style.sass
  Diff comments   View file @ff6dd41
... ... @@ -46,7 +46,7 @@ body
46 46  
47 47 @import topmenu
48 48  
49   -.action-profile-index, #box-organizer
  49 +.action-profile-index, .controller-profile_design
50 50 @import homeblocks
51 51  
52 52 #content
... ... @@ -62,6 +62,6 @@ body
62 62 background: url('icons/more.png') no-repeat left center
63 63 background-size: contain
64 64 height: 25px
65   - padding-left: 30px
  65 + padding-left: 35px
66 66  
67 67 @import internalpage
... ...
theme.js
  Diff comments   View file @ff6dd41
1 1 (function($){
2 2 function setBreadcrumbs(){
3   - $('div.breadcrumbs-plugin_content-breadcrumbs-block .separator').text(' / ');
4   - $('<span id="breadcrumbs-you-are-here">Você está aqui / </span>').insertBefore($('.breadcrumbs-plugin_content-breadcrumbs-block .block-inner-2').children().first());
  3 + $('<span id="breadcrumbs-you-are-here">Você está aqui: </span>').insertBefore($('.breadcrumbs-plugin_content-breadcrumbs-block .block-inner-2').children().first());
5 4 }
6 5  
7 6 $(document).ready(function(){
... ...