From 98d81981aa307d961e3896dae98b734acf306d44 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Mon, 30 Jun 2014 15:25:04 -0300 Subject: [PATCH] updating theme --- cabecalho.css | 26 ++++++++++++++++++++++---- header.rhtml | 16 +++++++++------- style.css | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- theme.js | 23 +++++++++++++++++++---- 4 files changed, 134 insertions(+), 22 deletions(-) diff --git a/cabecalho.css b/cabecalho.css index 0e8f450..70d9f38 100644 --- a/cabecalho.css +++ b/cabecalho.css @@ -385,14 +385,15 @@ background: url(images/icone-verde-flickr.png) 0 20px; /********ABA Lateral - Espaço do Usuário**********/ /*escondendo e revelando a aba lateral*/ -div#wrap-1,div#wrap-0{transition-duration: 0.6s;-webkit-transition-duration:0.6s;} +div#wrap-1,div#wrap-0,div#theme-footer {transition-duration: 0.6s;-webkit-transition-duration:0.6s;} div#wrap-1,div#theme-footer {float: right;width:100%;} div#wrap-1.menu,div#theme-footer.menu {width: 80%;} div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/} /*Propriedades da aba lateral e elementos internos*/ #navigation-control { - width: 20%; + width: 0%; + transition: 0.6s; /*position: absolute;*/ position: fixed; left: 0px; @@ -400,8 +401,11 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/} background-color: transparent; color: black; z-index: -1; + font-size:80%; } +.menu #navigation-control {width: 20%;} + #navigation-control a{} #navigation-control ul li { @@ -757,6 +761,7 @@ display: inline-block; #barra-psocial .layout_user #user .not-logged-in {padding-left: 35px;} +#barra-psocial .layout_user #user a i.icon-chat {display: none;} /*info do usuário no espaço do usuário*/ #navigation-control{ height: 100%; @@ -883,6 +888,12 @@ text-decoration: none; /****************** Painel de Controle ******************/ +.btn_home a{ + display: inline-block; + text-decoration: none; + margin-left: 5px; +} + /*Botão Painel de controle*/ #btn_open_control_panel { @@ -917,7 +928,6 @@ text-decoration: none; text-align: center; display: inline-block; padding-top: 0px; - background-color: #ccc; overflow: hidden; height: 0px; transition: 0.6s; @@ -925,12 +935,20 @@ text-decoration: none; width: 100%; } - #control_panel_bar.show { padding-top: 0px; background-color: #ccc; height: 80px; +} +#control_panel_bar.menu_content{ + background-color: Tomato; +} +#control_panel_bar.menu_aparence{ + background-color: seagreen; +} +#control_panel_bar.menu_settings{ + background-color: lightSteelBlue; } .btn_control_panel_bar{ diff --git a/header.rhtml b/header.rhtml index 7699cc1..7651d14 100644 --- a/header.rhtml +++ b/header.rhtml @@ -7,7 +7,6 @@ @@ -43,8 +42,8 @@
+
-
<%= render :partial => 'layouts/user' %>
@@ -70,8 +69,9 @@
  • English
    • - +
  • Logo do Portal
    • +
    @@ -326,13 +326,15 @@   -
    +
    + + diff --git a/style.css b/style.css index 671edf1..4a2781c 100644 --- a/style.css +++ b/style.css @@ -90,6 +90,12 @@ min-width: 20%; padding: 0 1em; } +#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;} + +.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;} + +.common-profile-list-block .vcard a, .comment-actions .vcard a{} + /*estilo dos blocos*/ #main-content-wrapper-1, @@ -105,6 +111,8 @@ min-width: 20%; #content .block {background-color:#fff;box-shadow: 5px 5px 5px -2px #ddd;padding-bottom: 1em;} +#content .block .block-inner-2 h3~div {padding:1em;} + #content .box-1 .block, #content .no-boxes .block{padding: 1em;} @@ -134,20 +142,22 @@ min-width: 20%; #content .link-list-block li a:hover { background-color: #7293cf; border-left: 3px solid #fff; + border-right: 0px solid #fff; } #profile-header {margin-bottom: 20px;} #content .block-title { font-variant: inherit; margin-bottom: 0px;} /*cabeçalho dos blocos laterais*/ -#content .block h3.block-title { - color: #AAA; +#content .block h3.block-title, +#content #content-inner .login-block .logged-user-info h2{ font-size: 16px; text-align: left; border-bottom: 1px solid #AAA; padding: 0.5em; background-color: #7293cf; color: white; + font-variant: inherit; } /*cabeçalho do blocos principal*/ @@ -227,12 +237,79 @@ min-width: 20%; } #public-profile-search, #profile-search-results form, .profile-search-block form { -padding: 10px; -margin-bottom: 15px; -background-color: transparent; --moz-border-radius: 5px; --webkit-border-radius: 0px; + padding: 10px; + margin-bottom: 15px; + background-color: transparent; + -moz-border-radius: 5px; + -webkit-border-radius: 0px; +} + +/*telas de edição*/ + +/*Estilo dos campos - input*/ +.formfield input, .formfield textarea { + background: none; + border: 2px solid #B0C4DE; + color: #333; + font-size: 16px; + border-radius: 5px; +} + +#content form input.button.submit {margin-left:0px; margin-right: 16px;} + +/*Campo inserir arquivo*/ +input[type~="file"] {border: none;} + +/*formulário de criação de artigos - lado esquerdo*/ +.controller-cms div.with_media_panel { + float: left; + width: 70%; + display: inline-block; + background-color: #FFF; + padding: 1em; + vertical-align: top; } +/*caixas de formulário da direita - Inserir imagem e buscar imagem*/ +.text-editor-sidebar{ + float: left; + position: relative; + width: 20%; + display: inline-block; + vertical-align: top; + margin-left: 3%; + right: 0; + top: 0; +} + +/*Campo inserir arquivo - lado direito*/ +.text-editor-sidebar .text-editor-sidebar-box #media-upload-form form input[type~="file"]{font-size: x-small;} + +/*campo de busca de mídia*/ +.text-editor-sidebar #media-search-box .formfield input { + display: inline-block; + width: 85% !important; +} + +/*botão de busca de mídia*/ +#content .text-editor-sidebar #media-search-box form input.button.submit { + max-height: 24px; + cursor: pointer; + height: 34px; + vertical-align: top; + margin-top: 2px; + margin-left: 0; + margin-right: 0; + width: 0px; + color: #EEE; + display: inline-block; +} + +/*botão cancelar*/ +#content a.button.with-text { +line-height: 32px; +height: 32px; +margin-top: 2px; +} diff --git a/theme.js b/theme.js index da1949a..aed6b33 100644 --- a/theme.js +++ b/theme.js @@ -32,12 +32,27 @@ //abrir e fechar Painel de controle da comunidade// $("#btn_open_control_panel span").click(function(){ $("#control_panel_bar").toggleClass("show"); - $("#btn_open_control_panel").toggleClass("show"); + $("#btn_open_control_panel").toggleClass("show"); }); - $("#btn_open_control_panel ul li").click(function(){ - $("#control_panel_bar").toggleClass("show"); - $("#btn_open_control_panel").toggleClass("show"); +//abrir e fechar Painel de controle da comunidade// +//aba conteúdo// + $("#btn_open_control_panel ul li#btn_content").click(function(){ + $("#control_panel_bar.menu_aparence").removeClass("show"); + $("#control_panel_bar.menu_settings").removeClass("show"); + $("#control_panel_bar.menu_content").toggleClass("show"); + }); +//aba aparência// + $("#btn_open_control_panel ul li#btn_aparence").click(function(){ + $("#control_panel_bar.menu_settings").removeClass("show"); + $("#control_panel_bar.menu_content").removeClass("show"); + $("#control_panel_bar.menu_aparence").toggleClass("show"); + }); +//aba Configurações// + $("#btn_open_control_panel ul li#btn_settings").click(function(){ + $("#control_panel_bar.menu_content").removeClass("show"); + $("#control_panel_bar.menu_aparence").removeClass("show"); + $("#control_panel_bar.menu_settings").toggleClass("show"); }); -- libgit2 0.21.2