Merge branch 'master' of https://gitlab.com/participa/proposal-app

Augusto dos Anjos Almeida
2 parents 940490ef 4e48cdb4
Showing 4 changed files with 20 additions and 4 deletions Show diff stats
index.html
sass/_proposal_categories.scss
sass/_proposal_detail.scss
sass/style.scss
-<html lang-"pt-br">
+<html lang="pt-br">
   <head>
     <meta charset="utf-8" />
     <title>Dialoga Brasil</title>
@@ -19,7 +19,7 @@
  
     <script id='proposal-template' type='text/x-handlebars-template'>
       <header>
-        <h1>{{article.title}}</h1>
+        <h1><a href="/">{{article.title}}</a></h1>
         <a id='display-contrast' href='#'>Alto Contraste</a>
       </header>
  
@@ -24,7 +24,6 @@
       background-position: center 5px;
       background-repeat: no-repeat;
       width: 140px;
-      height: 40px;
       display: inline-block;
       font-size: 14px;
       font-family: 'Asap', sans;
@@ -289,7 +289,8 @@
         .make-proposal-button{
           @extend .container-button;
         }
-        .send-proposal-button, .success-proposal-sent {
+        .send-proposal-button,
+        .success-proposal-sent {
           @extend .container-button;
           a {
             position: absolute;
@@ -396,6 +397,18 @@
         .send-experience-button {
           @extend .container-button;
         }
+        .send-experience-button,
+        .success-experience-sent {
+          @extend .container-button;
+          a {
+            position: absolute;
+            left: 50%;
+            margin: 0;
+            margin-left: -30%;
+            bottom: 20px;
+            padding: 20px 0;
+          }
+        }
       }
       .talk-proposal-container{
         width: 50%;
@@ -32,6 +32,10 @@ h1 {
   width: 100%;
   text-transform: uppercase;
   border-bottom: 1px solid #d6dcd7;
+  a {
+    text-decoration: none;
+    color: #03316f;
+  }
 }
  
 #proposal-result {
1		-<html lang-"pt-br">
	1	+<html lang="pt-br">
2	2	<head>
3	3	<meta charset="utf-8" />
4	4	<title>Dialoga Brasil</title>
...	...	@@ -19,7 +19,7 @@
19	19
20	20	<script id='proposal-template' type='text/x-handlebars-template'>
21	21	<header>
22		- <h1>{{article.title}}</h1>
	22	+ <h1><a href="/">{{article.title}}</a></h1>
23	23	<a id='display-contrast' href='#'>Alto Contraste</a>
24	24	</header>
25	25
...	...
...	...	@@ -24,7 +24,6 @@
24	24	background-position: center 5px;
25	25	background-repeat: no-repeat;
26	26	width: 140px;
27		- height: 40px;
28	27	display: inline-block;
29	28	font-size: 14px;
30	29	font-family: 'Asap', sans;
...	...
...	...	@@ -289,7 +289,8 @@
289	289	.make-proposal-button{
290	290	@extend .container-button;
291	291	}
292		- .send-proposal-button, .success-proposal-sent {
	292	+ .send-proposal-button,
	293	+ .success-proposal-sent {
293	294	@extend .container-button;
294	295	a {
295	296	position: absolute;
...	...	@@ -396,6 +397,18 @@
396	397	.send-experience-button {
397	398	@extend .container-button;
398	399	}
	400	+ .send-experience-button,
	401	+ .success-experience-sent {
	402	+ @extend .container-button;
	403	+ a {
	404	+ position: absolute;
	405	+ left: 50%;
	406	+ margin: 0;
	407	+ margin-left: -30%;
	408	+ bottom: 20px;
	409	+ padding: 20px 0;
	410	+ }
	411	+ }
399	412	}
400	413	.talk-proposal-container{
401	414	width: 50%;
...	...
...	...	@@ -32,6 +32,10 @@ h1 {
32	32	width: 100%;
33	33	text-transform: uppercase;
34	34	border-bottom: 1px solid #d6dcd7;
	35	+ a {
	36	+ text-decoration: none;
	37	+ color: #03316f;
	38	+ }
35	39	}
36	40
37	41	#proposal-result {
...	...