Download as
Browse Code »

Commit cfd619303c2c432408c89e8c08baf219e181a028

Authored by Melissa Wen
1 parent c12c2fd9
Exists in master

Add color, icons and style based on proposed layout

Showing 34 changed files with 146 additions and 64 deletions   Show diff stats
_homeblocks.sass
  Diff comments   View file @cfd6193
1 #content 1 #content
2 .article-block 2 .article-block
3 - padding: 20px  
4 - margin: 0px  
5 - border-bottom: 2px solid #000 3 + h3.block-title
  4 + background: url('icons/line.png') repeat-x left center
  5 + border-bottom: none
  6 + border-left: 10px solid #575959
  7 + font-family: 'Ubuntu'
  8 + font-size: 22px
  9 + font-variant: normal
  10 + font-weight: 300
  11 + line-height: 22px
  12 + margin: 25px 0
  13 + span
  14 + background: #FFF
  15 + padding: 0 15px
6 .short-post 16 .short-post
7 - p  
8 - font-family: 'Open Sans'  
9 - font-size: 12px  
10 - margin: 0 0 20px 17 + font-family: 'Ubuntu'
  18 + font-size: 13px
11 .read-more 19 .read-more
12 a 20 a
13 - background: url('images/home/09.png') no-repeat left center 21 + background: url('icons/more.png') no-repeat left center
14 background-size: contain 22 background-size: contain
15 color: #000 23 color: #000
16 display: block 24 display: block
17 - font-family: 'Open Sans'  
18 - font-size: 12px  
19 - height: 25px  
20 - line-height: 25px 25 + float: right
  26 + font-family: 'Ubuntu'
  27 + font-size: 13px
  28 + height: 24px
  29 + line-height: 24px
  30 + margin: 25px 0
21 padding-left: 30px 31 padding-left: 30px
22 text-decoration: none 32 text-decoration: none
  33 +
  34 +#content
23 .container-block-plugin_container-block 35 .container-block-plugin_container-block
24 margin-top: 20px 36 margin-top: 20px
25 .block-outer 37 .block-outer
26 .display-content-block 38 .display-content-block
27 - background: #ECECEF  
28 - border-bottom: 2px solid #000  
29 - margin-right: 10px  
30 - padding: 25px  
31 - width: 425px !important 39 + background: #999999
  40 + border-top: 5px solid #E5E5E5
  41 + margin-right: 0px
  42 + padding: 25px 0 0 0
  43 + width: 480px !important
  44 + .block-title
  45 + color: #E4E5CC
  46 + margin-bottom: 20px
  47 + padding-left: 15px
  48 + span
  49 + background: url('icons/more.png') no-repeat left center
  50 + background-size: contain
32 ul 51 ul
33 margin: 0 52 margin: 0
34 li 53 li
35 - margin: 0 0 25px 0 54 + border-bottom: 1px solid #E4E5CC
  55 + margin: 0
36 overflow: hidden 56 overflow: hidden
  57 + padding: 15px
37 > div 58 > div
38 float: left 59 float: left
  60 + &:last-child
  61 + margin: 0
  62 + border: none
39 .image 63 .image
40 - height: 75px 64 + border: 2px solid #F3F3F3
  65 + height: 95px
41 margin-right: 15px 66 margin-right: 15px
42 overflow: hidden 67 overflow: hidden
43 - width: 85px 68 + width: 100px
44 a 69 a
  70 + color: #F3F3F3
45 display: block 71 display: block
46 overflow: hidden 72 overflow: hidden
47 img 73 img
48 - max-width: 135px 74 + max-width: 150px
49 .title 75 .title
50 - height: 18px  
51 - margin: 0 0 15px 0 76 + height: 34px
  77 + margin: 10px 0 30px 0
52 overflow: hidden 78 overflow: hidden
53 width: 300px 79 width: 300px
54 a 80 a
55 - color: #000  
56 - font-family: 'Open Sans' 81 + color: #F3F3F3
  82 + font-family: 'Ubuntu'
57 font-size: 14px 83 font-size: 14px
58 - font-weight: 700 84 + font-weight: 300
59 text-decoration: none 85 text-decoration: none
60 .lead 86 .lead
61 - max-height: 34px  
62 - margin-left: 0  
63 - overflow: hidden  
64 - width: 300px  
65 - p  
66 - font-family: 'Open Sans'  
67 - font-size: 12px  
68 - font-weight: 300  
69 - margin: 0  
70 - .read_more  
71 display: none 87 display: none
72 - &:last-child .display-content-block  
73 - background: #575C67  
74 - border: none  
75 - margin: 0 88 + .read_more
  89 + width: 300px
  90 + a
  91 + background: url('icons/more_two.png') no-repeat left center
  92 + background-size: 20px 20px
  93 + color: #F3F3F3
  94 + display: block
  95 + float: left
  96 + font-family: 'Ubuntu'
  97 + height: 20px
  98 + line-height: 20px
  99 + text-decoration: none
  100 + text-indent: 25px
  101 + text-transform: lowercase
  102 + &:first-child .display-content-block
  103 + background: #F3F3F3
  104 + border-bottom: none
  105 + border-top: 5px solid #999999
  106 + margin-right: 5px
  107 + padding: 25px 15px 15px
  108 + width: 450px !important
76 .block-title 109 .block-title
77 - color: #ECECEF  
78 - margin-bottom: 20px  
79 - li 110 + color: #409EA8
  111 + margin-bottom: 25px
  112 + padding: 0
  113 + li
80 margin: 0 114 margin: 0
  115 + padding: 0
81 & > div 116 & > div
82 float: none 117 float: none
83 .title 118 .title
84 height: auto 119 height: auto
  120 + margin-bottom: 13px
85 max-height: 38px 121 max-height: 38px
86 width: 100% 122 width: 100%
87 a 123 a
88 - color: #ECECEF 124 + color: #575959
  125 + font-weight: 300
89 .image 126 .image
  127 + border-color: #999999
90 height: auto 128 height: auto
91 max-height: 290px 129 max-height: 290px
92 - width: 100% 130 + width: 446px
93 img 131 img
94 max-width: 100% 132 max-width: 100%
  133 + .read_more
  134 + float: right
  135 + margin: 15px 0 0 0
  136 + width: auto
  137 + a
  138 + background: url('icons/more.png') no-repeat left center
  139 + background-size: 25px 24px
  140 + color: #575959
  141 + height: 25px
  142 + line-height: 25px
  143 + text-indent: 30px
  144 +
  145 +#content
  146 + .block-outer:last-child
  147 + .link-list-block
  148 + background: none
  149 + padding: 0
  150 + .block-title
  151 + background: #E5E5E5
  152 + padding: 20px
  153 + li
  154 + background: none
  155 + margin: 0 25px 0 0
  156 + padding: 0
  157 + a
  158 + background: #FFF2DD url('icons/13.png') no-repeat 25px 40px
  159 + background-size: 169px
  160 + border: 1px solid #FF9C39
  161 + color: #FF9C39
  162 + font-family: 'Ubuntu'
  163 + font-size: 16px
  164 + font-weight: 700
  165 + display: block
  166 + height: 20px
  167 + padding: 230px 25px 40px
  168 + text-align: center
  169 + width: 169px
  170 + &:last-child
  171 + margin: 0
1 #content .box-1 .link-list-block 1 #content .box-1 .link-list-block
2 - background: #ccc 2 + background: #69677C
  3 + border-radius: 0 0 3px 3px
  4 + margin-bottom: 30px
3 padding: 20px 5 padding: 20px
4 ul 6 ul
5 - text-align: center 7 + text-align: left
6 li 8 li
7 - margin: 0 25px 9 + display: inline-block
  10 + margin: 0 0 0 50px
8 padding: 0 11 padding: 0
  12 + &:first-child
  13 + background: url('icons/home.png') no-repeat left center
  14 + background-size: 24px
  15 + margin-left: 0
  16 + padding-left: 40px
9 a 17 a
10 - background: #ccc  
11 - border-bottom: 2px solid #ccc 18 + background: #69677C
12 border-radius: 0 19 border-radius: 0
13 - font-family: 'Open Sans'  
14 - font-size: 15px 20 + color: #FFF
  21 + font-family: 'Ubuntu Mediun'
  22 + font-size: 16px
15 margin: 0 23 margin: 0
16 padding: 0 24 padding: 0
17 text-transform: capitalize 25 text-transform: capitalize
18 - &:hover  
19 - color: #000  
20 - border-bottom: 2px solid #000  
icons/13.png 0 → 100644
View file @cfd6193

4.26 KB
icons/agenda-contagem.png 0 → 100644
View file @cfd6193

921 Bytes
icons/balao.png 0 → 100644
View file @cfd6193

528 Bytes
icons/balao_claro.png 0 → 100644
View file @cfd6193

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

1.14 KB
icons/home.png 0 → 100644
View file @cfd6193

777 Bytes
icons/indicadores.png 0 → 100644
View file @cfd6193

1004 Bytes
icons/line.png 0 → 100644
View file @cfd6193

142 Bytes
icons/login.png 0 → 100644
View file @cfd6193

1.06 KB
icons/more.png 0 → 100644
View file @cfd6193

528 Bytes
icons/more_two.png 0 → 100644
View file @cfd6193

488 Bytes
icons/pessoas.png 0 → 100644
View file @cfd6193

1.27 KB
icons/trilhas.png 0 → 100644
View file @cfd6193

1.79 KB
icons/user.png 0 → 100644
View file @cfd6193

512 Bytes
icons/visualizacao.png 0 → 100644
View file @cfd6193

502 Bytes
icons/visualizacao_claro.png 0 → 100644
View file @cfd6193

425 Bytes
images/home/01.png
View file @c12c2fd

1.74 KB
images/home/02.png
View file @c12c2fd

1.33 KB
images/home/03.png
View file @c12c2fd

2.4 KB
images/home/05.png
View file @c12c2fd

517 Bytes
images/home/06.png
View file @c12c2fd

425 Bytes
images/home/09.png
View file @c12c2fd

562 Bytes
images/home/10.png
View file @c12c2fd

2.13 KB
images/home/11.png
View file @c12c2fd

2.06 KB
images/home/12.png
View file @c12c2fd

1.57 KB
images/home/13.png
View file @c12c2fd

4.26 KB
images/home/14.png
View file @c12c2fd

5.71 KB
images/home/15.png
View file @c12c2fd

5.89 KB
images/home/read-more-cult.png
View file @c12c2fd

455 Bytes
images/home/read-more-env.png
View file @c12c2fd

465 Bytes
images/home/read-more-tec.png
View file @c12c2fd

468 Bytes
@@ -42,26 +42,26 @@ body @@ -42,26 +42,26 @@ body
42 @import profileheader 42 @import profileheader
43 43
44 #boxes 44 #boxes
45 - margin-top: 5px 45 + margin-top: 0px
46 46
47 @import topmenu 47 @import topmenu
48 48
49 -@import homeblocks 49 +.action-profile-index, #box-organizer
  50 + @import homeblocks
50 51
51 #content 52 #content
52 .block-title 53 .block-title
53 border: none 54 border: none
54 - color: #000  
55 - font-family: 'Open Sans'  
56 - font-size: 18px 55 + color: #575959
  56 + font-family: 'Ubuntu Mediun'
  57 + font-size: 20px
57 font-variant: normal 58 font-variant: normal
58 font-weight: normal 59 font-weight: normal
59 margin-bottom: 30px 60 margin-bottom: 30px
60 - text-transform: uppercase  
61 span 61 span
62 - background: url('images/home/09.png') no-repeat left center 62 + background: url('icons/more.png') no-repeat left center
63 background-size: contain 63 background-size: contain
64 - height: 30px  
65 - padding-left: 35px 64 + height: 25px
  65 + padding-left: 30px
66 66
67 @import internalpage 67 @import internalpage