Download as
Browse Code »

Commit 36fe0ad4476a8edbf66cf4478dcf63d8e6acf687

Authored by Leonardo Merlin
2 parents 9f3e13f5 68620f5a
Exists in master and in 10 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, staging

Merge remote-tracking branch 'upstream/master' into fix-search

Showing 2 changed files with 16 additions and 7 deletions   Show diff stats
@@ -13,4 +13,8 @@ bower_components/ @@ -13,4 +13,8 @@ bower_components/
13 bower.json 13 bower.json
14 sass/bootstrap.scss 14 sass/bootstrap.scss
15 css/bootstrap.css 15 css/bootstrap.css
16 -html/  
17 \ No newline at end of file 16 \ No newline at end of file
  17 +html/
  18 +novo.css
  19 +novo.html
  20 +sass/novo.scss
  21 +sass/novo
18 \ No newline at end of file 22 \ No newline at end of file
sass/_proposal_detail.scss
  Diff comments   View file @36fe0ad
@@ -229,9 +229,14 @@ @@ -229,9 +229,14 @@
229 text-align: left; 229 text-align: left;
230 } 230 }
231 .message { 231 .message {
232 - margin-left: 20px; 232 + margin: 10px 35px;
  233 + padding: 10px 25px;
233 font-size: 12px; 234 font-size: 12px;
234 - color: #333; 235 + background-color: #f2dede;
  236 + border-color: #ebccd1;
  237 + font-weight:bold;
  238 + color: #a94442;
  239 + border-radius: 5px;
235 } 240 }
236 input, textarea { 241 input, textarea {
237 border-color: $color; 242 border-color: $color;
@@ -379,8 +384,8 @@ @@ -379,8 +384,8 @@
379 .experience-proposal-container{ 384 .experience-proposal-container{
380 float: left; 385 float: left;
381 width: 50%; 386 width: 50%;
382 - // height: $container-height;  
383 - // min-height: $container-height; 387 + height: $container-height;
  388 + min-height: $container-height;
384 position: relative; 389 position: relative;
385 text-align: center; 390 text-align: center;
386 .experience-proposal{ 391 .experience-proposal{
@@ -413,8 +418,8 @@ @@ -413,8 +418,8 @@
413 .talk-proposal-container{ 418 .talk-proposal-container{
414 width: 50%; 419 width: 50%;
415 float: left; 420 float: left;
416 - // height: $container-height;  
417 - // min-height: $container-height; 421 + height: $container-height;
  422 + min-height: $container-height;
418 position: relative; 423 position: relative;
419 text-align: center; 424 text-align: center;
420 .talk-proposal { 425 .talk-proposal {