Merge Request #68
← To merge requests
From
colab_vcard
into
spb-release/3.0
Commits (2)
-
Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
-
Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
2 participants
Showing
4 changed files
Show diff stats
colab/accounts/templates/accounts/user_detail.html
| ... | ... | @@ -15,7 +15,7 @@ |
| 15 | 15 | {% block main-content %} |
| 16 | 16 | |
| 17 | 17 | <div id="user-profile" class="row"> |
| 18 | - <div class="vcard col-lg-4 col-md-4 col-sm-5"> | |
| 18 | + <div class="colab-vcard col-lg-4 col-md-4 col-sm-5"> | |
| 19 | 19 | <div class="thumbnail"> |
| 20 | 20 | {% gravatar user_.email 200 %} |
| 21 | 21 | </div> | ... | ... |
colab/static/css/footer.css
| ... | ... | @@ -59,13 +59,13 @@ |
| 59 | 59 | display: none; |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | -.footer-gov .logo-sgpr img, .logo-acesso img{ | |
| 62 | +.footer-gov .colab-logo-sgpr img, .logo-acesso img{ | |
| 63 | 63 | padding-top: 10px; |
| 64 | 64 | padding-right: 15%; |
| 65 | 65 | padding-bottom: 10px; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | -.logo-sgpr img, .spb-definitions { | |
| 68 | +.colab-logo-sgpr img, .spb-definitions { | |
| 69 | 69 | display: none; |
| 70 | 70 | } |
| 71 | 71 | ... | ... |
colab/static/css/screen.css
| ... | ... | @@ -138,16 +138,16 @@ div.submit { |
| 138 | 138 | |
| 139 | 139 | /* User profile */ |
| 140 | 140 | |
| 141 | -.vcard { | |
| 141 | +.colab-vcard { | |
| 142 | 142 | min-height: 400px; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | -.vcard .thumbnail { | |
| 145 | +.colab-vcard .thumbnail { | |
| 146 | 146 | width: 200px; |
| 147 | 147 | height: 200px; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | -.vcard h1 { | |
| 150 | +.colab-vcard h1 { | |
| 151 | 151 | margin: 0; |
| 152 | 152 | padding: 0; |
| 153 | 153 | font-size: 26px; |
| ... | ... | @@ -155,8 +155,8 @@ div.submit { |
| 155 | 155 | letter-spacing: -1px; |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | -.vcard h1 span, | |
| 159 | -.vcard h1 em { | |
| 158 | +.colab-vcard h1 span, | |
| 159 | +.colab-vcard h1 em { | |
| 160 | 160 | display: inline-block; |
| 161 | 161 | overflow-x: hidden; |
| 162 | 162 | text-overflow: ellipsis; |
| ... | ... | @@ -165,14 +165,14 @@ div.submit { |
| 165 | 165 | vertical-align: bottom; |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | -.vcard h1 em { | |
| 168 | +.colab-vcard h1 em { | |
| 169 | 169 | font-weight: 300; |
| 170 | 170 | font-size: 20px; |
| 171 | 171 | font-size: 20px; |
| 172 | 172 | letter-spacing: 1px; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | -.vcard .divider { | |
| 175 | +.colab-vcard .divider { | |
| 176 | 176 | border-bottom: 1px solid #EEE; |
| 177 | 177 | margin-top: 10px; |
| 178 | 178 | } |
| ... | ... | @@ -417,7 +417,7 @@ span.highlighted { |
| 417 | 417 | } |
| 418 | 418 | |
| 419 | 419 | /* Subscribe list */ |
| 420 | -.vcard .label { | |
| 420 | +.colab-vcard .label { | |
| 421 | 421 | line-height: 2; |
| 422 | 422 | } |
| 423 | 423 | ... | ... |
colab/templates/footer.html
| ... | ... | @@ -64,7 +64,7 @@ |
| 64 | 64 | </div> |
| 65 | 65 | <div class="col-md-5 institucionais"> |
| 66 | 66 | <a class="logo-brasil" href="http://www.brasil.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/brasil.png' %}" ><span>Brasil - Governo Federal</span></a> |
| 67 | - <a class="logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/sgpr.png' %}" ><span>Secretaria-geral da Presidência da República</span></a> | |
| 67 | + <a class="colab-logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/sgpr.png' %}" ><span>Secretaria-geral da Presidência da República</span></a> | |
| 68 | 68 | </div> |
| 69 | 69 | </div> |
| 70 | 70 | </div><!-- end footer-gov --> | ... | ... |
-
Status changed to closed
-
Status changed to reopened
-
mentioned in commit 63efbfc377b9173ee268954ac7e9edb2e2dbefd5
