Download as
Browse Code »

Commit 8ca9b16978430df21f341d5c8b57fc043c98b097

Authored by Augusto dos Anjos Almeida
1 parent 47fca336
Exists in refactory-sass

bugfix in proposal group

Showing 5 changed files with 138 additions and 24 deletions   Show diff stats
index.html
  Diff comments   View file @8ca9b16
... ... @@ -6,6 +6,13 @@
6 6 <meta http-equiv="X-UA-Compatible" content="IE=edge">
7 7 <meta name="viewport" content="width=device-width, initial-scale=1">
8 8  
  9 +<link rel="stylesheet" href="css/bootstrap.min.css">
  10 +<link rel="stylesheet" href="css/hover.custom.css">
  11 +<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
  12 +<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,700">
  13 +<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Asap:400,700">
  14 +<link rel="stylesheet" href="style.css">
  15 +
9 16 <script type='text/javascript'>
10 17 function removeUrlParameters(full_url){
11 18 var url_base = full_url.split('#').shift();
... ... @@ -329,9 +336,15 @@
329 336 </form>
330 337 </script>
331 338  
332   - <script type='text/javascript'>
333   - loadJSFiles();
334   - </script>
  339 + <script src='js/jquery-2.1.3.min.js'></script>
  340 + <script src='js/jquery-ui-1.11.4.custom/jquery-ui.min.js'></script>
  341 + <script src='js/jquery.cookie.js'></script>
  342 + <script src='js/handlebars-v3.0.1.js'></script>
  343 + <script src='js/handlebars-helpers.js'></script>
  344 + <script src='js/jquery.dotdotdot.min.js'></script>
  345 + <script src='js/jquery.maxlength.min.js'></script>
  346 + <script src='js/layout.js'></script>
  347 + <script src='js/main.js'></script>
335 348  
336 349 </body>
337 350  
... ...
novo.css
  Diff comments   View file @8ca9b16
... ... @@ -149,7 +149,6 @@ nav ul {
149 149 background-color: #eeeff1; }
150 150  
151 151 .category {
152   - border-top: 1px dotted #172938;
153 152 list-style: none;
154 153 padding-left: 0;
155 154 padding-top: 10px; }
... ... @@ -171,6 +170,12 @@ nav ul {
171 170 margin-bottom: 0;
172 171 margin-top: 20px;
173 172 padding-left: 0; }
  173 + #proposal-group .item {
  174 + border: 0; }
  175 + #proposal-group .category {
  176 + background: transparent;
  177 + border-top: 1px dotted #172938;
  178 + padding-top: 10px; }
174 179  
175 180 #search-input-container {
176 181 margin-top: 10px; }
... ...
novo.html
  Diff comments   View file @8ca9b16
... ... @@ -6,11 +6,100 @@
6 6 <meta http-equiv="X-UA-Compatible" content="IE=edge">
7 7 <meta name="viewport" content="width=device-width, initial-scale=1">
8 8  
9   - <link rel="stylesheet" href="css/bootstrap.min.css" />
10   - <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
11   - <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,700' rel='stylesheet' type='text/css'>
12   - <link href='http://fonts.googleapis.com/css?family=Asap:400,700' rel='stylesheet' type='text/css'>
13   - <link rel="stylesheet" href="novo.css" />
  9 + <link rel="stylesheet" href="css/bootstrap.min.css">
  10 + <link rel="stylesheet" href="css/hover.custom.css">
  11 + <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
  12 + <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,700">
  13 + <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Asap:400,700">
  14 + <link rel="stylesheet" href="novo.css">
  15 +
  16 + <script type='text/javascript'>
  17 + function removeUrlParameters(full_url){
  18 + var url_base = full_url.split('#').shift();
  19 + return url_base;
  20 + }
  21 + function addBaseUrl(filename){
  22 + var base = window.location.href;
  23 + if(base.match(/file:/) || filename.match(/http:/)){
  24 + base = '';
  25 + }else{
  26 + base = removeUrlParameters(base) + '/';
  27 + }
  28 + return base + filename;
  29 + }
  30 + function makeCSSLink(filename){
  31 + var fileref=document.createElement("link");
  32 + fileref.setAttribute("rel", "stylesheet");
  33 + fileref.setAttribute("type", "text/css");
  34 + fileref.setAttribute("href", addBaseUrl(filename));
  35 + return fileref;
  36 + }
  37 + function loadCSSFiles(){
  38 + var css_files = [
  39 + 'css/bootstrap.min.css',
  40 + 'css/hover.custom.css',
  41 + 'http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css',
  42 + 'http://fonts.googleapis.com/css?family=Open+Sans:400,300,700',
  43 + 'http://fonts.googleapis.com/css?family=Asap:400,700',
  44 + 'style.css'
  45 + ];
  46 + head = document.getElementsByTagName("head")[0]
  47 + for(i = 0; i < css_files.length; i++){
  48 + head.appendChild(makeCSSLink(css_files[i]));
  49 + }
  50 + }
  51 + function makeJSURL(filename){
  52 + var url = addBaseUrl(filename);
  53 +
  54 + return url;
  55 + }
  56 +
  57 + function loadJavaScriptSync(file_path){
  58 + var head = document.getElementsByTagName("head")[0];
  59 + var script_element = document.createElement("script");
  60 + script_element.type = "text/javascript";
  61 + var req = new XMLHttpRequest();
  62 + req.open("GET", file_path, false); // 'false': synchronous.
  63 + req.send(null);
  64 + script_element.text = req.responseText;
  65 + head.appendChild(script_element);
  66 + }
  67 +
  68 + function loadJavaScriptAsync(file_path){
  69 + var head = document.getElementsByTagName("head")[0];
  70 + var script_element = document.createElement("script");
  71 + script_element.type = "text/javascript";
  72 + script_element.src = file_path;
  73 + head.appendChild(script_element);
  74 + }
  75 +
  76 + function loadJSFiles(){
  77 + var js_files = [
  78 + 'js/jquery-2.1.3.min.js',
  79 + 'js/jquery-ui-1.11.4.custom/jquery-ui.min.js',
  80 + 'js/jquery.cookie.js',
  81 + 'js/handlebars-v3.0.1.js',
  82 + 'js/handlebars-helpers.js',
  83 + 'js/jquery.dotdotdot.min.js',
  84 + 'js/jquery.maxlength.min.js',
  85 + 'js/layout.js',
  86 + 'js/main.js'
  87 + ];
  88 +
  89 + var file_path = '';
  90 + for(i = 0; i < js_files.length; i++){
  91 + file_path = makeJSURL(js_files[i]);
  92 + if(file_path.match('layout.js') || file_path.match('main.js')){
  93 + loadJavaScriptAsync(file_path);
  94 + }else{
  95 + loadJavaScriptSync(file_path);
  96 + }
  97 + }
  98 + }
  99 +
  100 + loadCSSFiles();
  101 +
  102 + </script>
14 103  
15 104 </head>
16 105 <body>
... ... @@ -19,7 +108,7 @@
19 108  
20 109 <script id='proposal-template' type='text/x-handlebars-template'>
21 110 <header>
22   - <h1><a href="/">{{article.title}}</a></h1>
  111 + <h1><a href="#">{{article.title}}</a></h1>
23 112 <a id='display-contrast' href='#'>Alto Contraste</a>
24 113 </header>
25 114  
... ... @@ -42,7 +131,7 @@
42 131 <div id="proposal-categories-container">
43 132 {{#each article.categories}}
44 133 <li id='proposal-category-{{slug}}' class="proposal-category" data-category="{{slug}}">
45   - <a href="#/temas/{{slug}}/{{id}}" class="proposal-link" data-target="proposal-item-{{id}}">{{name}}</a>
  134 + <a href="#/temas/{{slug}}/{{id}}" class="proposal-link hvr-float-shadow" data-target="proposal-item-{{id}}">{{name}}</a>
46 135 <div class="arrow-box" style="display: none"></div>
47 136 </li>
48 137 {{/each}}
... ... @@ -112,15 +201,15 @@
112 201 </div>
113 202  
114 203 </div>
115   - <div class='make-proposal-container proposal-container'>
116   - <div class='make-proposal proposal-content'>
  204 + <div class='make-proposal-container'>
  205 + <div class='make-proposal'>
117 206 <div class='container-title'>Faça Uma Proposta</div>
118 207 <div class='subtitle'>Qual a sua sugestão para melhorar este programa?</div>
119 208 <div class='info'>Ela se tornará pública em até 24 horas após o envio e poderá ser apoiada por outros participantes.</div>
120 209 <div class='send-proposal-button send-button'><a href='#'><span>Envie Sua Proposta</span></a></div>
121 210 <div class="login-container hide">Login</div>
122 211 <form class='make-proposal-form save-article-form hide' id='make-proposal-form-{{id}}'>
123   - <div class="message"></div>
  212 + <div class="message hide"></div>
124 213 <div>
125 214 <div><label for="article_abstract">Descrição</label></div>
126 215 <textarea id="article_abstract" class="countdown" name="article[abstract]" placeholder="Descrição" maxlength="200"></textarea>
... ... @@ -135,8 +224,8 @@
135 224 <br style="clear: both;" />
136 225 </div>
137 226 </div>
138   - <div class='support-proposal-container proposal-container'>
139   - <div class='support-proposal proposal-content'>
  227 + <div class='support-proposal-container'>
  228 + <div class='support-proposal'>
140 229 <div class='container-title'> Apoie outras propostas</div>
141 230 <div class='subtitle'> Propostas da sociedade</div>
142 231 <div class="random-proposal"></div>
... ... @@ -145,15 +234,15 @@
145 234 </div>
146 235 </div>
147 236 <div class='results-container hide'></div>
148   - <div class='experience-proposal-container proposal-container'>
149   - <div class='experience-proposal proposal-content'>
  237 + <div class='experience-proposal-container'>
  238 + <div class='experience-proposal'>
150 239 <div class='container-title'>Conte sua experiência</div>
151 240 <p>Adoraríamos que você nos contasse a sua experiência com este programa ou a de alguém que você conhece.</p>
152 241 <p>Esta história pode nos ajudar a melhorar a nossa ação e não será divulgada.</p>
153 242 <div class='send-experience-button send-button'><a href='#'><span>Envie Sua Experiência</span></a></div>
154 243 <div class="login-container hide">Login</div>
155 244 <form class='make-experience-form save-article-form hide' id='make-experience-form-{{id}}'>
156   - <div class="message"></div>
  245 + <div class="message hide"></div>
157 246 <div>
158 247 <div><label for="article_abstract">Descrição</label></div>
159 248 <textarea id="article_abstract" class="countdown" name="article[abstract]" placeholder="Descrição" maxlength="5000"></textarea>
... ... @@ -167,8 +256,8 @@
167 256 </div>
168 257 </div>
169 258 </div>
170   - <div class='talk-proposal-container proposal-container'>
171   - <div class='talk-proposal proposal-content'>
  259 + <div class='talk-proposal-container'>
  260 + <div class='talk-proposal'>
172 261 <div class='container-title'>Fale com os ministros</div>
173 262 <p>Confira as datas e horários disponíveis:</p>
174 263 <ul class='calendar'>
... ... @@ -225,7 +314,7 @@
225 314  
226 315 <script id='login' type='text/x-handlebars-template'>
227 316 <form id="login-form" class="login">
228   - <div class="message"></div>
  317 + <div class="message hide"></div>
229 318 <div class="username">
230 319 <label for="user_name" class="label">Nome de Usuário / E-mail:</label>
231 320 <input id="user_name" name="login" type="text" placeholder="Nome do usuário / E-mail">
... ... @@ -255,8 +344,8 @@
255 344 <script src='js/jquery.dotdotdot.min.js'></script>
256 345 <script src='js/jquery.maxlength.min.js'></script>
257 346 <script src='js/layout.js'></script>
258   -
259 347 <script src='js/main.js'></script>
  348 +
260 349 </body>
261 350  
262 351 </html>
... ...
sass/novo/_proposal_categories.scss
  Diff comments   View file @8ca9b16
... ... @@ -105,7 +105,6 @@
105 105 }
106 106 }
107 107 .category {
108   - border-top: 1px dotted $default-color;
109 108 list-style: none;
110 109 padding-left: 0;
111 110 padding-top: 10px;
... ...
sass/novo/_proposal_group.scss
  Diff comments   View file @8ca9b16
... ... @@ -9,6 +9,14 @@
9 9 margin-top: $default-spacing-size;
10 10 padding-left: 0;
11 11 }
  12 + .item {
  13 + border: 0;
  14 + }
  15 + .category {
  16 + background: transparent;
  17 + border-top: 1px dotted $default-color;
  18 + padding-top: 10px;
  19 + }
12 20 }
13 21 }
14 22 #search-input-container {
... ...