Download as
Browse Code »

Commit 98d81981aa307d961e3896dae98b734acf306d44

Authored by Victor Costa
1 parent 8c847dfb
Exists in master and in 2 other branches production, staging

updating theme

Showing 4 changed files with 134 additions and 22 deletions   Show diff stats
cabecalho.css
  Diff comments   View file @98d8198
... ... @@ -385,14 +385,15 @@ background: url(images/icone-verde-flickr.png) 0 20px;
385 385  
386 386 /********ABA Lateral - Espaço do Usuário**********/
387 387 /*escondendo e revelando a aba lateral*/
388   -div#wrap-1,div#wrap-0{transition-duration: 0.6s;-webkit-transition-duration:0.6s;}
  388 +div#wrap-1,div#wrap-0,div#theme-footer {transition-duration: 0.6s;-webkit-transition-duration:0.6s;}
389 389 div#wrap-1,div#theme-footer {float: right;width:100%;}
390 390 div#wrap-1.menu,div#theme-footer.menu {width: 80%;}
391 391 div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/}
392 392  
393 393 /*Propriedades da aba lateral e elementos internos*/
394 394 #navigation-control {
395   - width: 20%;
  395 + width: 0%;
  396 + transition: 0.6s;
396 397 /*position: absolute;*/
397 398 position: fixed;
398 399 left: 0px;
... ... @@ -400,8 +401,11 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/}
400 401 background-color: transparent;
401 402 color: black;
402 403 z-index: -1;
  404 + font-size:80%;
403 405 }
404 406  
  407 +.menu #navigation-control {width: 20%;}
  408 +
405 409 #navigation-control a{}
406 410  
407 411 #navigation-control ul li {
... ... @@ -757,6 +761,7 @@ display: inline-block;
757 761  
758 762 #barra-psocial .layout_user #user .not-logged-in {padding-left: 35px;}
759 763  
  764 +#barra-psocial .layout_user #user a i.icon-chat {display: none;}
760 765 /*info do usuário no espaço do usuário*/
761 766 #navigation-control{
762 767 height: 100%;
... ... @@ -883,6 +888,12 @@ text-decoration: none;
883 888  
884 889 /****************** Painel de Controle ******************/
885 890  
  891 +.btn_home a{
  892 + display: inline-block;
  893 + text-decoration: none;
  894 + margin-left: 5px;
  895 +}
  896 +
886 897 /*Botão Painel de controle*/
887 898  
888 899 #btn_open_control_panel {
... ... @@ -917,7 +928,6 @@ text-decoration: none;
917 928 text-align: center;
918 929 display: inline-block;
919 930 padding-top: 0px;
920   - background-color: #ccc;
921 931 overflow: hidden;
922 932 height: 0px;
923 933 transition: 0.6s;
... ... @@ -925,12 +935,20 @@ text-decoration: none;
925 935 width: 100%;
926 936 }
927 937  
928   -
929 938 #control_panel_bar.show {
930 939 padding-top: 0px;
931 940 background-color: #ccc;
932 941 height: 80px;
  942 +}
933 943  
  944 +#control_panel_bar.menu_content{
  945 + background-color: Tomato;
  946 +}
  947 +#control_panel_bar.menu_aparence{
  948 + background-color: seagreen;
  949 +}
  950 +#control_panel_bar.menu_settings{
  951 + background-color: lightSteelBlue;
934 952 }
935 953  
936 954 .btn_control_panel_bar{
... ...
header.rhtml
  Diff comments   View file @98d8198
... ... @@ -7,7 +7,6 @@
7 7 <ul class="profile_menu">
8 8 <li class="name"><h1 class="title">Nome do usuário</h1></li>
9 9 <li class="picture"><img src="/images/icons-app/person-big.png?1392299707"/></li>
10   - <li class="tasks_inner">Pendências</li>
11 10 <li class="user_status online"><span>&#9679;</span> Disponível</li>
12 11 </ul>
13 12 </div>
... ... @@ -43,8 +42,8 @@
43 42 <!-- Nova Barra de usuário -->
44 43  
45 44 <div id="barra-psocial" class="top" >
  45 +
46 46 <div class="btn_control_panel btn_control" title="Painel de Controle" alt="menu">
47   -
48 47 <div class="layout_user">
49 48 <%= render :partial => 'layouts/user' %>
50 49 </div>
... ... @@ -70,8 +69,9 @@
70 69 <li>
71 70 <a href="?lang=en" class="flag flag-en" title="English"><span>English</span></a>
72 71 </li>
73   -
  72 + <li class="btn_home" title="Página Inicial"><a href="<%=environment.top_url%>">Logo do Portal</a></li>
74 73 </ul>
  74 +
75 75 </div>
76 76 </div>
77 77 <!-- FIM Nova Barra de usuário -->
... ... @@ -326,13 +326,15 @@
326 326 <a href="#" id="btn_open_control_panel" class="btn_open">
327 327 <span>&nbsp;</span><!-- <span>Painel de Controle</span> -->
328 328 <ul>
329   - <li>Conteúdo</li>
330   - <li>Aparência</li>
331   - <li>Configurações</li>
  329 + <li id="btn_content">Conteúdo</li>
  330 + <li id="btn_aparence">Aparência</li>
  331 + <li id="btn_settings">Configurações</li>
332 332 </ul>
333 333 </a>
334 334  
335   -<div id="control_panel_bar" class="controller-profile_editor"> </div>
  335 +<div id="control_panel_bar" class="menu_content controller-profile_editor"> </div>
  336 +<div id="control_panel_bar" class="menu_aparence controller-profile_editor"> </div>
  337 +<div id="control_panel_bar" class="menu_settings controller-profile_editor"> </div>
336 338  
337 339 </div>
338 340  
... ...
style.css
  Diff comments   View file @98d8198
... ... @@ -90,6 +90,12 @@ min-width: 20%;
90 90 padding: 0 1em;
91 91 }
92 92  
  93 +#content .people-block ul, #content .profile-list-block ul, #content .enterprises-block ul, #content .members-block ul, #content .communities-block ul, #content .friends-block ul, #content .fans-block ul {min-width: auto;width: auto;}
  94 +
  95 +.box-2 .common-profile-list-block .vcard a.profile_link, .box-3 .common-profile-list-block .vcard a.profile_link {height: 112px;max-height: 112px;}
  96 +
  97 +.common-profile-list-block .vcard a, .comment-actions .vcard a{}
  98 +
93 99 /*estilo dos blocos*/
94 100  
95 101 #main-content-wrapper-1,
... ... @@ -105,6 +111,8 @@ min-width: 20%;
105 111  
106 112 #content .block {background-color:#fff;box-shadow: 5px 5px 5px -2px #ddd;padding-bottom: 1em;}
107 113  
  114 +#content .block .block-inner-2 h3~div {padding:1em;}
  115 +
108 116 #content .box-1 .block,
109 117 #content .no-boxes .block{padding: 1em;}
110 118  
... ... @@ -134,20 +142,22 @@ min-width: 20%;
134 142 #content .link-list-block li a:hover {
135 143 background-color: #7293cf;
136 144 border-left: 3px solid #fff;
  145 + border-right: 0px solid #fff;
137 146 }
138 147  
139 148 #profile-header {margin-bottom: 20px;}
140 149 #content .block-title { font-variant: inherit; margin-bottom: 0px;}
141 150  
142 151 /*cabeçalho dos blocos laterais*/
143   -#content .block h3.block-title {
144   - color: #AAA;
  152 +#content .block h3.block-title,
  153 +#content #content-inner .login-block .logged-user-info h2{
145 154 font-size: 16px;
146 155 text-align: left;
147 156 border-bottom: 1px solid #AAA;
148 157 padding: 0.5em;
149 158 background-color: #7293cf;
150 159 color: white;
  160 + font-variant: inherit;
151 161 }
152 162  
153 163 /*cabeçalho do blocos principal*/
... ... @@ -227,12 +237,79 @@ min-width: 20%;
227 237 }
228 238  
229 239 #public-profile-search, #profile-search-results form, .profile-search-block form {
230   -padding: 10px;
231   -margin-bottom: 15px;
232   -background-color: transparent;
233   --moz-border-radius: 5px;
234   --webkit-border-radius: 0px;
  240 + padding: 10px;
  241 + margin-bottom: 15px;
  242 + background-color: transparent;
  243 + -moz-border-radius: 5px;
  244 + -webkit-border-radius: 0px;
  245 +}
  246 +
  247 +/*telas de edição*/
  248 +
  249 +/*Estilo dos campos - input*/
  250 +.formfield input, .formfield textarea {
  251 + background: none;
  252 + border: 2px solid #B0C4DE;
  253 + color: #333;
  254 + font-size: 16px;
  255 + border-radius: 5px;
  256 +}
  257 +
  258 +#content form input.button.submit {margin-left:0px; margin-right: 16px;}
  259 +
  260 +/*Campo inserir arquivo*/
  261 +input[type~="file"] {border: none;}
  262 +
  263 +/*formulário de criação de artigos - lado esquerdo*/
  264 +.controller-cms div.with_media_panel {
  265 + float: left;
  266 + width: 70%;
  267 + display: inline-block;
  268 + background-color: #FFF;
  269 + padding: 1em;
  270 + vertical-align: top;
235 271 }
236 272  
  273 +/*caixas de formulário da direita - Inserir imagem e buscar imagem*/
  274 +.text-editor-sidebar{
  275 + float: left;
  276 + position: relative;
  277 + width: 20%;
  278 + display: inline-block;
  279 + vertical-align: top;
  280 + margin-left: 3%;
  281 + right: 0;
  282 + top: 0;
  283 +}
  284 +
  285 +/*Campo inserir arquivo - lado direito*/
  286 +.text-editor-sidebar .text-editor-sidebar-box #media-upload-form form input[type~="file"]{font-size: x-small;}
  287 +
  288 +/*campo de busca de mídia*/
  289 +.text-editor-sidebar #media-search-box .formfield input {
  290 + display: inline-block;
  291 + width: 85% !important;
  292 +}
  293 +
  294 +/*botão de busca de mídia*/
  295 +#content .text-editor-sidebar #media-search-box form input.button.submit {
  296 + max-height: 24px;
  297 + cursor: pointer;
  298 + height: 34px;
  299 + vertical-align: top;
  300 + margin-top: 2px;
  301 + margin-left: 0;
  302 + margin-right: 0;
  303 + width: 0px;
  304 + color: #EEE;
  305 + display: inline-block;
  306 +}
  307 +
  308 +/*botão cancelar*/
  309 +#content a.button.with-text {
  310 +line-height: 32px;
  311 +height: 32px;
  312 +margin-top: 2px;
  313 +}
237 314  
238 315  
... ...
theme.js
  Diff comments   View file @98d8198
... ... @@ -32,12 +32,27 @@
32 32 //abrir e fechar Painel de controle da comunidade//
33 33 $("#btn_open_control_panel span").click(function(){
34 34 $("#control_panel_bar").toggleClass("show");
35   - $("#btn_open_control_panel").toggleClass("show");
  35 + $("#btn_open_control_panel").toggleClass("show");
36 36 });
37 37  
38   - $("#btn_open_control_panel ul li").click(function(){
39   - $("#control_panel_bar").toggleClass("show");
40   - $("#btn_open_control_panel").toggleClass("show");
  38 +//abrir e fechar Painel de controle da comunidade//
  39 +//aba conteúdo//
  40 + $("#btn_open_control_panel ul li#btn_content").click(function(){
  41 + $("#control_panel_bar.menu_aparence").removeClass("show");
  42 + $("#control_panel_bar.menu_settings").removeClass("show");
  43 + $("#control_panel_bar.menu_content").toggleClass("show");
  44 + });
  45 +//aba aparência//
  46 + $("#btn_open_control_panel ul li#btn_aparence").click(function(){
  47 + $("#control_panel_bar.menu_settings").removeClass("show");
  48 + $("#control_panel_bar.menu_content").removeClass("show");
  49 + $("#control_panel_bar.menu_aparence").toggleClass("show");
  50 + });
  51 +//aba Configurações//
  52 + $("#btn_open_control_panel ul li#btn_settings").click(function(){
  53 + $("#control_panel_bar.menu_content").removeClass("show");
  54 + $("#control_panel_bar.menu_aparence").removeClass("show");
  55 + $("#control_panel_bar.menu_settings").toggleClass("show");
41 56 });
42 57  
43 58  
... ...