Merge branch 'master' of gitlab.com:softwarepublico/noosfero-spb-theme

Melissa Wen
2 parents 63a10153 bd5f4120
Showing 3 changed files with 149 additions and 10 deletions Show diff stats
cadastro.css
style.css
theme.js
@@ -687,16 +687,21 @@ body #content .main-block h1 {
 }
  
 body #content .main-block form .button-bar input,
-body #content .main-block form .button-bar a.button{
+body #content .main-block form .button-bar a.button,
+body #content .main-content form .button-bar input,
+body #content .main-content form .button-bar a.button {
   background-image: none;
   border: 0;
   margin-right: 10px;
   display: inline-block;
-  width: 100px;
+  min-width: 100px;
+  padding-right: 5px;
+  padding-left: 5px;
   text-align: center;
 }
  
-body #content .main-block form .icon-add{
+body #content .main-block form .icon-add,
+body #content .main-content form .icon-add {
   background-image: none;
   border: 0;
   padding: 0 10px 0 20px;
@@ -706,7 +711,8 @@ body #content .main-block form .icon-add{
   position: relative;
 }
  
-body #content .main-block form .icon-add:before {
+body #content .main-block form .icon-add:before,
+body #content .main-content form .icon-add:before {
   left: 6px;
   vertical-align: middle;
   font-size: 12px;
@@ -717,6 +723,10 @@ body #content .main-block form .icon-add:before {
   text-align: center;
 }
  
+body #content form .button-bar .icon-delete {
+  float: none;
+}
+
 .dynamic-table{
   border: none;
   font-family: 'Open Sans', Arial, Helvetica, sans-serif;
@@ -788,11 +798,13 @@ body #content .main-block form .icon-add:before {
 }
  
  
-body #content .main-block form .button-bar .icon-back {
+body #content .main-block form .button-bar .icon-back,
+body #content .main-content form .button-bar .icon-back {
   width: 150px !important;
 }
  
-#content .main-block form .button-bar input {
+#content .main-block form .button-bar input,
+#content .main-content form .button-bar input {
   padding: 2px 0;
   color: #FFF;
   font-size: 15px;
@@ -804,7 +816,8 @@ body #content .main-block form .button-bar input:hover {
   background: #5E82C6;
 }
  
-body #content .main-block form .button-bar a.button {
+body #content .main-block form .button-bar a.button,
+body #content .main-content form .button-bar a.button {
   padding: 1px 0 0 0;
   height: 0;
   line-height: auto; 
@@ -814,13 +827,15 @@ body #content .main-block form .button-bar a.button {
   height: 29px;
 }
  
-body #content .main-block form .button-bar a.button:hover {
+body #content .main-block form .button-bar a.button:hover,
+body #content .main-content form .button-bar a.button:hover {
   background: none;
   border-color: #5E82C6;
   color: #5E82C6;
 }
  
-body #content .main-block #delete-profile a {
+body #content .main-block #delete-profile a,
+body #content .main-content #delete-profile a {
   border-color: #C0392B;
   color: #C0392B;
 }
@@ -2988,7 +2988,7 @@ div.software-step-info div.current-step h3 {
   font-family: Arial;
   font-weight: 700;
   color: #172938;
-  letter-spacing: -0.1px;
+  /* letter-spacing: -0.1px; */
 }
  
 #content .main-block #article .folder-content .item-description {
@@ -3018,3 +3018,105 @@ div.software-step-info div.current-step h3 {
 li.folder-item:first-child {
   border-top: 1px solid #ccc;
 }
+
+/***** Estilização do aviso de campos obrigatórios na página de edição da página de ajuda *****/
+
+.text-editor-sidebar {
+  top: 0px;
+  margin-top: 30px;
+  margin-left: 650px;
+  max-height: 45px;
+  overflow: hidden;
+}
+
+#content .main-content form p .required-field .pseudoformlabel {
+  color: #FF0366;
+  font-weight: 500;
+}
+
+#content .main-content form p .required-field {
+  max-width: 520px;
+  padding: 15px 20px;
+  margin: 20px 0 30px 0;
+  border: 1px dotted #ccc;
+  border-left: 5px solid #FF0366;
+  border-radius: 3px;
+  display: block;
+  background: #fff;
+  line-height: 20px;
+  font-size: 13px;
+}
+
+.main-block form {
+  font-family: 'Open Sans', Arial, Helvetica, sans-serif;
+  font-size: 14px;
+}
+
+#content .main-content form label.formlabel,
+#content .main-content form .article-translation-field {
+  font-size: 14px;
+  margin-bottom: 5px;
+  color: #231f20; 
+}
+
+#content .main-content form .article-translation-field {
+  margin-top: 25px;
+  margin-bottom: 15px;
+}
+
+#content .main-content form .required-field .formlabel:after {
+  color: #FF0366;
+  font-weight: 500;
+}
+
+#content .article-translation-field #article_language {
+  margin-top: 10px;
+}
+
+#content #article_image_builder_uploaded_data {
+  text-indent: 2px;
+}
+
+#content #edit-article-options div div {
+  margin-top: 13px;
+  margin-bottom: 13px;
+}
+
+#content .formfield input,
+#content #edit-article-options .token-input-list li {
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  height: 19px;
+  padding: 6px;
+}
+
+#content #edit-article-options .token-input-list {
+  border: none;
+  margin-top: 10px;
+}
+
+#content #edit-article-options .token-input-list li input:first-child {
+  height: 10px;
+  padding-right: 0px;
+}
+
+#content #content-inner #boxes #fetch-external-feed > input {
+  height: 13px;
+  margin: 8px;
+  vertical-align: middle;
+  width: 13px;
+}
+
+#boxes #fetch-external-feed #external-feed-options #external-feed-options-only-once input {
+  margin-right: 3px;
+  width: 13px;
+  vertical-align: middle;
+}
+
+#boxes #fetch-external-feed #external-feed-options #external-feed-options-only-once label {
+  margin-right: 250px;
+}
+
+#content #article-formitem #article_slug {
+  width: 20%;
+}
 \ No newline at end of file
@@ -134,10 +134,32 @@ $(&#39;#link-buscar&#39;).click(function(e) {
  
   }
  
+  /* Finds all uploaded files from manuals page and sets its names on the right format */
+  function set_uploaded_files_names() {
+    var article = document.getElementById('article');
+    var folderList = article.getElementsByClassName('folder-content')[0];
+    var folderItens = folderList.getElementsByClassName('item-description');
+
+    for(var i = 0; i < folderItens.length; i++) {
+      split_file_extension(folderItens[i].getElementsByTagName('a')[0]);
+    }
+  }
+
+  /* Splits a file name from its extension. Example: example.pdf becomes example - PDF */
+  function split_file_extension(element) {
+    var tokens = element.innerHTML.split('.');
+    if(tokens.length == 2) {
+      var fileName = tokens[0];
+      var fileExtension = tokens[1].toUpperCase();
+      element.innerHTML = fileName + " - " + fileExtension;
+    }
+  }
+
   $(document).ready(function(){
     set_events();
     move_article_buttons();
     add_link_to_article_div();
     insert_notice_div();
+    set_uploaded_files_names();
     });
 })(jQuery);
...	...	@@ -687,16 +687,21 @@ body #content .main-block h1 {
687	687	}
688	688
689	689	body #content .main-block form .button-bar input,
690		-body #content .main-block form .button-bar a.button{
	690	+body #content .main-block form .button-bar a.button,
	691	+body #content .main-content form .button-bar input,
	692	+body #content .main-content form .button-bar a.button {
691	693	background-image: none;
692	694	border: 0;
693	695	margin-right: 10px;
694	696	display: inline-block;
695		- width: 100px;
	697	+ min-width: 100px;
	698	+ padding-right: 5px;
	699	+ padding-left: 5px;
696	700	text-align: center;
697	701	}
698	702
699		-body #content .main-block form .icon-add{
	703	+body #content .main-block form .icon-add,
	704	+body #content .main-content form .icon-add {
700	705	background-image: none;
701	706	border: 0;
702	707	padding: 0 10px 0 20px;
...	...	@@ -706,7 +711,8 @@ body #content .main-block form .icon-add{
706	711	position: relative;
707	712	}
708	713
709		-body #content .main-block form .icon-add:before {
	714	+body #content .main-block form .icon-add:before,
	715	+body #content .main-content form .icon-add:before {
710	716	left: 6px;
711	717	vertical-align: middle;
712	718	font-size: 12px;
...	...	@@ -717,6 +723,10 @@ body #content .main-block form .icon-add:before {
717	723	text-align: center;
718	724	}
719	725
	726	+body #content form .button-bar .icon-delete {
	727	+ float: none;
	728	+}
	729	+
720	730	.dynamic-table{
721	731	border: none;
722	732	font-family: 'Open Sans', Arial, Helvetica, sans-serif;
...	...	@@ -788,11 +798,13 @@ body #content .main-block form .icon-add:before {
788	798	}
789	799
790	800
791		-body #content .main-block form .button-bar .icon-back {
	801	+body #content .main-block form .button-bar .icon-back,
	802	+body #content .main-content form .button-bar .icon-back {
792	803	width: 150px !important;
793	804	}
794	805
795		-#content .main-block form .button-bar input {
	806	+#content .main-block form .button-bar input,
	807	+#content .main-content form .button-bar input {
796	808	padding: 2px 0;
797	809	color: #FFF;
798	810	font-size: 15px;
...	...	@@ -804,7 +816,8 @@ body #content .main-block form .button-bar input:hover {
804	816	background: #5E82C6;
805	817	}
806	818
807		-body #content .main-block form .button-bar a.button {
	819	+body #content .main-block form .button-bar a.button,
	820	+body #content .main-content form .button-bar a.button {
808	821	padding: 1px 0 0 0;
809	822	height: 0;
810	823	line-height: auto;
...	...	@@ -814,13 +827,15 @@ body #content .main-block form .button-bar a.button {
814	827	height: 29px;
815	828	}
816	829
817		-body #content .main-block form .button-bar a.button:hover {
	830	+body #content .main-block form .button-bar a.button:hover,
	831	+body #content .main-content form .button-bar a.button:hover {
818	832	background: none;
819	833	border-color: #5E82C6;
820	834	color: #5E82C6;
821	835	}
822	836
823		-body #content .main-block #delete-profile a {
	837	+body #content .main-block #delete-profile a,
	838	+body #content .main-content #delete-profile a {
824	839	border-color: #C0392B;
825	840	color: #C0392B;
826	841	}
...	...
...	...	@@ -2988,7 +2988,7 @@ div.software-step-info div.current-step h3 {
2988	2988	font-family: Arial;
2989	2989	font-weight: 700;
2990	2990	color: #172938;
2991		- letter-spacing: -0.1px;
	2991	+ /* letter-spacing: -0.1px; */
2992	2992	}
2993	2993
2994	2994	#content .main-block #article .folder-content .item-description {
...	...	@@ -3018,3 +3018,105 @@ div.software-step-info div.current-step h3 {
3018	3018	li.folder-item:first-child {
3019	3019	border-top: 1px solid #ccc;
3020	3020	}
	3021	+
	3022	+/*** Estilização do aviso de campos obrigatórios na página de edição da página de ajuda ***/
	3023	+
	3024	+.text-editor-sidebar {
	3025	+ top: 0px;
	3026	+ margin-top: 30px;
	3027	+ margin-left: 650px;
	3028	+ max-height: 45px;
	3029	+ overflow: hidden;
	3030	+}
	3031	+
	3032	+#content .main-content form p .required-field .pseudoformlabel {
	3033	+ color: #FF0366;
	3034	+ font-weight: 500;
	3035	+}
	3036	+
	3037	+#content .main-content form p .required-field {
	3038	+ max-width: 520px;
	3039	+ padding: 15px 20px;
	3040	+ margin: 20px 0 30px 0;
	3041	+ border: 1px dotted #ccc;
	3042	+ border-left: 5px solid #FF0366;
	3043	+ border-radius: 3px;
	3044	+ display: block;
	3045	+ background: #fff;
	3046	+ line-height: 20px;
	3047	+ font-size: 13px;
	3048	+}
	3049	+
	3050	+.main-block form {
	3051	+ font-family: 'Open Sans', Arial, Helvetica, sans-serif;
	3052	+ font-size: 14px;
	3053	+}
	3054	+
	3055	+#content .main-content form label.formlabel,
	3056	+#content .main-content form .article-translation-field {
	3057	+ font-size: 14px;
	3058	+ margin-bottom: 5px;
	3059	+ color: #231f20;
	3060	+}
	3061	+
	3062	+#content .main-content form .article-translation-field {
	3063	+ margin-top: 25px;
	3064	+ margin-bottom: 15px;
	3065	+}
	3066	+
	3067	+#content .main-content form .required-field .formlabel:after {
	3068	+ color: #FF0366;
	3069	+ font-weight: 500;
	3070	+}
	3071	+
	3072	+#content .article-translation-field #article_language {
	3073	+ margin-top: 10px;
	3074	+}
	3075	+
	3076	+#content #article_image_builder_uploaded_data {
	3077	+ text-indent: 2px;
	3078	+}
	3079	+
	3080	+#content #edit-article-options div div {
	3081	+ margin-top: 13px;
	3082	+ margin-bottom: 13px;
	3083	+}
	3084	+
	3085	+#content .formfield input,
	3086	+#content #edit-article-options .token-input-list li {
	3087	+ border: 1px solid #ccc;
	3088	+ border-radius: 4px;
	3089	+ height: 19px;
	3090	+ padding: 6px;
	3091	+}
	3092	+
	3093	+#content #edit-article-options .token-input-list {
	3094	+ border: none;
	3095	+ margin-top: 10px;
	3096	+}
	3097	+
	3098	+#content #edit-article-options .token-input-list li input:first-child {
	3099	+ height: 10px;
	3100	+ padding-right: 0px;
	3101	+}
	3102	+
	3103	+#content #content-inner #boxes #fetch-external-feed > input {
	3104	+ height: 13px;
	3105	+ margin: 8px;
	3106	+ vertical-align: middle;
	3107	+ width: 13px;
	3108	+}
	3109	+
	3110	+#boxes #fetch-external-feed #external-feed-options #external-feed-options-only-once input {
	3111	+ margin-right: 3px;
	3112	+ width: 13px;
	3113	+ vertical-align: middle;
	3114	+}
	3115	+
	3116	+#boxes #fetch-external-feed #external-feed-options #external-feed-options-only-once label {
	3117	+ margin-right: 250px;
	3118	+}
	3119	+
	3120	+#content #article-formitem #article_slug {
	3121	+ width: 20%;
	3122	+}
3021	3123	\ No newline at end of file
...	...
...	...	@@ -134,10 +134,32 @@ $('#link-buscar').click(function(e) {
134	134
135	135	}
136	136
	137	+ /* Finds all uploaded files from manuals page and sets its names on the right format */
	138	+ function set_uploaded_files_names() {
	139	+ var article = document.getElementById('article');
	140	+ var folderList = article.getElementsByClassName('folder-content')[0];
	141	+ var folderItens = folderList.getElementsByClassName('item-description');
	142	+
	143	+ for(var i = 0; i < folderItens.length; i++) {
	144	+ split_file_extension(folderItens[i].getElementsByTagName('a')[0]);
	145	+ }
	146	+ }
	147	+
	148	+ /* Splits a file name from its extension. Example: example.pdf becomes example - PDF */
	149	+ function split_file_extension(element) {
	150	+ var tokens = element.innerHTML.split('.');
	151	+ if(tokens.length == 2) {
	152	+ var fileName = tokens[0];
	153	+ var fileExtension = tokens[1].toUpperCase();
	154	+ element.innerHTML = fileName + " - " + fileExtension;
	155	+ }
	156	+ }
	157	+
137	158	$(document).ready(function(){
138	159	set_events();
139	160	move_article_buttons();
140	161	add_link_to_article_div();
141	162	insert_notice_div();
	163	+ set_uploaded_files_names();
142	164	});
143	165	})(jQuery);
...	...