Commit 072c3cc17cf791408fe065cd3451abdf3626c147
1 parent
6747beed
Exists in
master
and in
6 other branches
changed select proposal
Showing
3 changed files
with
16 additions
and
11 deletions
Show diff stats
index.html
@@ -164,11 +164,11 @@ | @@ -164,11 +164,11 @@ | ||
164 | <ul class="select"> | 164 | <ul class="select"> |
165 | {{#each categories}} | 165 | {{#each categories}} |
166 | <li class="category proposal-category" data-category="{{slug}}"> | 166 | <li class="category proposal-category" data-category="{{slug}}"> |
167 | - <a href="#/temas/{{slug}}/{{id}}" class="proposal-link" data-target="proposal-item-{{id}}">{{name}}</a> | ||
168 | - <button class="go-back btn btn-default pull-left"> | 167 | + <button class="go-back btn btn-default"> |
169 | <span class="fa fa-reply"></span> | 168 | <span class="fa fa-reply"></span> |
170 | Voltar | 169 | Voltar |
171 | </button> | 170 | </button> |
171 | + <a href="#/temas/{{slug}}/{{id}}" class="proposal-link" data-target="proposal-item-{{id}}">{{name}}</a> | ||
172 | {{#select_proposal ../../article.children slug ../id}}{{/select_proposal}} | 172 | {{#select_proposal ../../article.children slug ../id}}{{/select_proposal}} |
173 | </li> | 173 | </li> |
174 | {{/each}} | 174 | {{/each}} |
sass/_proposal_detail.scss
@@ -7,17 +7,18 @@ | @@ -7,17 +7,18 @@ | ||
7 | li { | 7 | li { |
8 | a { | 8 | a { |
9 | text-decoration: none; | 9 | text-decoration: none; |
10 | - text-transform: uppercase; | ||
11 | - padding: 15px 15px 15px 50px; | 10 | + // text-transform: uppercase; |
11 | + padding: 0 0 0 45px; | ||
12 | margin: 0; | 12 | margin: 0; |
13 | width: 30%; | 13 | width: 30%; |
14 | min-width: 210px; | 14 | min-width: 210px; |
15 | display: inline-block; | 15 | display: inline-block; |
16 | + vertical-align: middle; | ||
16 | span { | 17 | span { |
17 | padding-left: 40px; | 18 | padding-left: 40px; |
18 | } | 19 | } |
19 | font: { | 20 | font: { |
20 | - size: larger; | 21 | + size: 24px; |
21 | weight: bold; | 22 | weight: bold; |
22 | } | 23 | } |
23 | background-size: 32px; | 24 | background-size: 32px; |
@@ -27,13 +28,16 @@ | @@ -27,13 +28,16 @@ | ||
27 | 28 | ||
28 | .categories { | 29 | .categories { |
29 | select { | 30 | select { |
30 | - height: 57px; | 31 | + // height: 57px; |
31 | width: 60%; | 32 | width: 60%; |
32 | margin: 0; | 33 | margin: 0; |
33 | text-transform: uppercase; | 34 | text-transform: uppercase; |
34 | border: 0; | 35 | border: 0; |
35 | - background: #EEEFF1; | 36 | + background: #fff; |
36 | float: right; | 37 | float: right; |
38 | + vertical-align: middle; | ||
39 | + margin: 4px; | ||
40 | + border-radius: 3px; | ||
37 | } | 41 | } |
38 | 42 | ||
39 | .proposal-header { | 43 | .proposal-header { |
@@ -103,7 +107,7 @@ | @@ -103,7 +107,7 @@ | ||
103 | li { | 107 | li { |
104 | background: $color; | 108 | background: $color; |
105 | list-style: none; | 109 | list-style: none; |
106 | - padding: 0; | 110 | + padding: 5px; |
107 | a { | 111 | a { |
108 | min-width: 0; | 112 | min-width: 0; |
109 | width: auto; | 113 | width: auto; |
@@ -604,7 +608,7 @@ | @@ -604,7 +608,7 @@ | ||
604 | background-image: url(./images/icons/#{$category}.png); | 608 | background-image: url(./images/icons/#{$category}.png); |
605 | background: { | 609 | background: { |
606 | color: $color; | 610 | color: $color; |
607 | - position: 10px 50%; | 611 | + position: 5px 50%; |
608 | repeat: no-repeat; | 612 | repeat: no-repeat; |
609 | } | 613 | } |
610 | border-left: 1px solid lighten($color, 10%) | 614 | border-left: 1px solid lighten($color, 10%) |
sass/style.scss
@@ -115,11 +115,11 @@ form { | @@ -115,11 +115,11 @@ form { | ||
115 | // TO_REFACT: | 115 | // TO_REFACT: |
116 | .btn { | 116 | .btn { |
117 | display: inline-block; | 117 | display: inline-block; |
118 | - padding: 6px 12px; | 118 | + padding: 0 12px; |
119 | margin-bottom: 0; | 119 | margin-bottom: 0; |
120 | font-size: 14px; | 120 | font-size: 14px; |
121 | font-weight: 400; | 121 | font-weight: 400; |
122 | - line-height: 3.1; | 122 | + // line-height: 3.1; |
123 | text-align: center; | 123 | text-align: center; |
124 | white-space: nowrap; | 124 | white-space: nowrap; |
125 | vertical-align: middle; | 125 | vertical-align: middle; |
@@ -132,6 +132,7 @@ form { | @@ -132,6 +132,7 @@ form { | ||
132 | user-select: none; | 132 | user-select: none; |
133 | background-image: none; | 133 | background-image: none; |
134 | border: 0; | 134 | border: 0; |
135 | + vertical-align: middle; | ||
135 | /* border-radius: 4px; */ | 136 | /* border-radius: 4px; */ |
136 | } | 137 | } |
137 | 138 |