Permalink
Browse files

STUPID MERGE

  • Loading branch information...
zenspider committed Apr 10, 2013
2 parents 3a26969 + 3b1e92d commit 28ede4676d947799a14bc70dbdfafe21637575ae
Showing with 13,303 additions and 1,094 deletions.
  1. BIN app/assets/images/glyphicons-halflings-white.png
  2. BIN app/assets/images/glyphicons-halflings.png
  3. +0 −6 app/assets/javascripts/about.js
  4. +1 −1 app/assets/javascripts/application.js
  5. +6 −0 app/assets/javascripts/bootstrap.min.js
  6. +0 −7 app/assets/javascripts/contra.js
  7. +0 −294 app/assets/stylesheets/about.css.scss
  8. +1 −2 app/assets/stylesheets/application.css
  9. +5,816 −0 app/assets/stylesheets/bootstrap.css
  10. +0 −645 app/assets/stylesheets/bootstrap.min.css.scss
  11. +0 −56 app/assets/stylesheets/scaffolds.css.scss
  12. +7,376 −0 app/assets/stylesheets/seattlerb.css
  13. +0 −1 app/views/about/index.html.erb
  14. +1 −1 app/views/layouts/application.html.erb
  15. +19 −0 public/assets/application-28441d13b9e5a1c3578e4088cdb3494f.js
  16. BIN public/assets/application-28441d13b9e5a1c3578e4088cdb3494f.js.gz
  17. +1 −1 ...pplication-22a53c4a608cb58aff9534fe77908608.js → application-898da9c1cac4af96acb94a29cc8d31aa.js}
  18. BIN ...tion-22a53c4a608cb58aff9534fe77908608.js.gz → application-898da9c1cac4af96acb94a29cc8d31aa.js.gz}
  19. +1 −0 public/assets/application-8c83353b5362825c45c38b96da670f3b.css
  20. BIN public/assets/application-8c83353b5362825c45c38b96da670f3b.css.gz
  21. +0 −1 public/assets/application-92ae79d17519dd98127de17b2eddac3a.css
  22. BIN public/assets/application-92ae79d17519dd98127de17b2eddac3a.css.gz
  23. +1 −0 public/assets/application-a3cbcd7db6e0ed872983ec51d44426e5.css
  24. BIN public/assets/application-a3cbcd7db6e0ed872983ec51d44426e5.css.gz
  25. +1 −1 public/assets/application.css
  26. BIN public/assets/application.css.gz
  27. +2 −2 public/assets/application.js
  28. BIN public/assets/application.js.gz
  29. BIN ...{chocolate-882295525ebc90847f75208a1678aa9e.jpg → chocolate-5d98fdb867dbb457b08595af29350124.jpg}
  30. BIN ...02ddf3e8010521065a7a06d86addb691.png → glyphicons-halflings-102729ddc87c111939b5c2970ff2cae8.png}
  31. BIN public/assets/glyphicons-halflings-95fceccec7799ff7454b3c073da8dc5b.png
  32. BIN public/assets/glyphicons-halflings-white-0d9ce4eb23c7f3ec006607cdaa7017ba.png
  33. BIN ...ded394f1fd0e397ddf6c2458b8.png → glyphicons-halflings-white-8609010a6bc81de3472eddb5ef0c197d.png}
  34. BIN public/assets/glyphicons-halflings-white.png
  35. BIN public/assets/glyphicons-halflings.png
  36. BIN ...endar-687921a23382b0a84095f3775a8207cb.png → icon_hcalendar-3d03f91fee22e795d151bf186ed339a9.png}
  37. BIN ...-99af1abb57e7c5cd21eff553f5ebd23f.png → icon_hcard_download-c0ed20716a0cac73b09451c1fddc8be1.png}
  38. BIN ...4704121d570c8c944feecb599d.png → ui-bg_flat_0_aaaaaa_40x100-3d6cab3d33300aa47f146409ca385d18.png}
  39. BIN public/assets/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
  40. BIN ...15d2479ba68755f17cb0de396.png → ui-bg_flat_75_ffffff_40x100-a618d29ea31dfb22df53cf3727e1e8c2.png}
  41. BIN ...89665d5f737a0c3cbec8185fa.png → ui-bg_glass_55_fbf9ee_1x400-76cce7df3835009060f391c546cc3b75.png}
  42. BIN public/assets/jquery-ui/ui-bg_glass_55_fbf9ee_1x400.png
  43. BIN ...e0f2a9823f83f658e9c94f582.png → ui-bg_glass_65_ffffff_1x400-cdb25bf3055c9d35142cce1abc7853e8.png}
  44. BIN public/assets/jquery-ui/ui-bg_glass_65_ffffff_1x400.png
  45. BIN ...b98f998d64965af8a53aac820.png → ui-bg_glass_75_dadada_1x400-865323d895bee4352b37d1b0060cf592.png}
  46. BIN public/assets/jquery-ui/ui-bg_glass_75_dadada_1x400.png
  47. BIN ...fca2c734c391dfcae5633d136.png → ui-bg_glass_75_e6e6e6_1x400-dd158b2514a6d6f9fe655b7b6973ac77.png}
  48. BIN public/assets/jquery-ui/ui-bg_glass_75_e6e6e6_1x400.png
  49. BIN ...8df95fda58e653d52b471897e.png → ui-bg_glass_95_fef1ec_1x400-67554b1f2ab6443240d5dc4f9b63f325.png}
  50. BIN ...5baed5328d23361b.png → ui-bg_highlight-soft_75_cccccc_1x100-9413b54ea5caed6a46d3dffb2c9186c5.png}
  51. BIN public/assets/jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100.png
  52. BIN ...33dd7a7251c1fa6b2b7ab2e38d2ac.png → ui-icons_222222_256x240-a9a72a32cd6dcfe470fa8c499ea68a43.png}
  53. BIN public/assets/jquery-ui/ui-icons_222222_256x240.png
  54. BIN ...298374f084cbced146974558f5a8e.png → ui-icons_2e83ff_256x240-2bef58aef9950e41e1982ef43acc5d0c.png}
  55. BIN public/assets/jquery-ui/ui-icons_2e83ff_256x240.png
  56. BIN ...2b6a216cda808c8720680531d2c78.png → ui-icons_454545_256x240-08c70ece126b6b256508eab4ab05fe07.png}
  57. BIN public/assets/jquery-ui/ui-icons_454545_256x240.png
  58. BIN ...bd2a2efee406e6cf6c3bcf8330cc0.png → ui-icons_888888_256x240-03b975de6dd867c00e6b268cc439e988.png}
  59. BIN public/assets/jquery-ui/ui-icons_888888_256x240.png
  60. BIN ...f0924dd7ffdaae4585255b4a838c2.png → ui-icons_cd0a0a_256x240-74fb6e61b7fe6f6b26133d5187d1cc9b.png}
  61. BIN public/assets/jquery-ui/ui-icons_cd0a0a_256x240.png
  62. +74 −74 public/assets/manifest.yml
  63. BIN ..._image-e4bdc49a275def07ef4452433f9e1910.png → missing_image-28c3278cb37089367c09fced7e9a111d.png}
  64. BIN ...fallback-da55e947e1aac1e4664adf81539b33f4.png → bg_fallback-558a08c1a5fcbf4a8037662c3c8ea615.png}
  65. BIN ...n_sprite-c85b36fba1b0dd6067f900f7c8da5aec.png → icon_sprite-07784381caec9a6bfe93b447dee0a6b5.png}
  66. BIN ...ess_bar-d62259b73fbfae5fc0dfb0d13b3b05ed.gif → progress_bar-19b705689896a40f96759a6955a9844d.gif}
  67. BIN ...ndles-310e966fcf097f1420e555ce2be44d98.png → slider_handles-e1150a0815243b4944f6aab9abbd2406.png}
  68. BIN ...b74b682a6e3601e0265cacd1ac422.png → ui-icons_222222_256x240-3c0c401b34b1f97f23aa1de619984533.png}
  69. BIN ...553e0b9fe2aa26bc3b9e0c7fd7518.png → ui-icons_454545_256x240-459ceb652008329fc30cbdcd5174e675.png}
  70. BIN ...t_black-c21ba5046d11b49579e475585a65dbc9.png → bullet_black-06d2b4f6c8610bf5c3806560f2e4ad4a.png}
  71. BIN ...t_white-fcfc5f9672ea5a6adddf247799f140b1.png → bullet_white-2b48fcfdb1ae08157b6668a08165d4ee.png}
  72. BIN ...n/{calendar-901efc0a5cce1cdbee7c32af94fc0d58.png → calendar-8fb804d1709f79423d3affa5f07ea83c.png}
  73. BIN ...s_admin/{clock-268bd67862cc21f5010e6b9d47ad442d.png → clock-12321a6b66ed867d6376dee4cbdf8b15.png}
  74. BIN ...3866c08d3ccaa703553b94fbf636a5.png → colorpicker_background-ed9df189dfe5ec0a469424da4f3ab22c.png}
  75. BIN ..._hex-fbffe3c9580ee14e195b7c6f9ca67ca3.png → colorpicker_hex-56d7a82ffa50ad4b378302b4691f60ea.png}
  76. BIN ..._b-226fd667286412c66fa96d31c97d634e.png → colorpicker_hsb_b-f237b013fb4c99e7a9d4be33f7221148.png}
  77. BIN ..._h-e0fa82c4ca1bdc07c1c183de444bc489.png → colorpicker_hsb_h-7970004e5126a0437d736a1b03f6b27a.png}
  78. BIN ..._s-d85fae201e7aae3f32c79de267170561.png → colorpicker_hsb_s-8c38e80fb76825d0f731375ea2a2be98.png}
  79. BIN ...ic-c26b6da15b99fbb9eb62295cfe2d4394.gif → colorpicker_indic-ae7c4aacfcecd9f80f0213388db5c2be.gif}
  80. BIN ...-71cf6e474b6ae2b098abb0e4ebec5c39.png → colorpicker_overlay-1e6c8e3ba8c971e16fd62215861a308d.png}
  81. BIN ..._b-226fd667286412c66fa96d31c97d634e.png → colorpicker_rgb_b-f237b013fb4c99e7a9d4be33f7221148.png}
  82. BIN ..._g-8eddc965a4cf65cfa5010e2caad1eb16.png → colorpicker_rgb_g-cf51ff55897fd4bfdeed5ee5d87ba009.png}
  83. BIN ..._r-4597d0746bbeca7a8126e7d4f32eadf1.png → colorpicker_rgb_r-f37c39a4475ef528d82004dd99271b3c.png}
  84. BIN ...t-380469f21bc6fb2c3ae28fab45086643.gif → colorpicker_select-66447b48877c957d216418e131c0b90f.gif}
  85. BIN ...t-b421dae9b9a20770fd17642ac5228e7b.png → colorpicker_submit-8576cd985dc26344c908aa6033e54e19.png}
  86. BIN ...nd-64db8db582e00e7d01e39a07b4ccca93.png → custom_background-35efcb1a6c971063147bb350c2fa5ff9.png}
  87. BIN ...ustom_hex-ea906ffb29d5df3e2ab2781894ddd04d.png → custom_hex-dec1f152bcadcc08366a60a560f3d63c.png}
  88. BIN ...m_hsb_b-235ebbb05202bc0e936743aa8451f317.png → custom_hsb_b-3d3b9a9d8cbf28a4136cd50d67599d1e.png}
  89. BIN ...m_hsb_h-7ff92e129fa12aae8412b47344bdc2a9.png → custom_hsb_h-f3d540e1c8b26f88ec8b43551c18193c.png}
  90. BIN ...m_hsb_s-7124c5b7922768b921c5944181370484.png → custom_hsb_s-af5b6a83e27e71ac7e4b535948697280.png}
  91. BIN ...m_indic-81d9333dbada60db7234b8e3aea28759.gif → custom_indic-da5ee6756edce9ae1f7e3284df6cd9d3.gif}
  92. BIN ...m_rgb_b-ef10959cdc9cab88ff521049bf5a53bb.png → custom_rgb_b-e4c1a341610dddfb8be002befe563b54.png}
  93. BIN ...m_rgb_g-b997e567a9b99050439ff4424ac02f72.png → custom_rgb_g-89ef98049ead486d7b3c6ca83df42b45.png}
  94. BIN ...m_rgb_r-5ea381459fb58ad43d86346877dbc047.png → custom_rgb_r-ffd20d7e119e2ab981060403c78838c2.png}
  95. BIN ...submit-d5258e6549785d5095daf8f30e70c141.png → custom_submit-d85f7ab73d530b1a217bd86fc50e55e3.png}
  96. BIN ...icker/{select-dbc1e1eec49aa0d00ae5fcbbeff18626.png → select-7ed4cb8a959e9139ba680366d48c4fd4.png}
  97. BIN ...ker/{select2-f29c4f098b7a6db664a081046051fc56.png → select2-07b7477bcd38170fe9f90364a52fe662.png}
  98. BIN ...icker/{slider-a25d85d5830251cba4f85f1a30c122be.png → slider-84a898d4de51f84fe34b3d660ea17c03.png}
  99. +1 −1 ...r-abec8b04315eef26dca1e44d4070c4a1.css → jquery.colorpicker-7d523c3d0295b751fceafd08161883ae.css}
  100. BIN public/assets/rails_admin/jquery.colorpicker-7d523c3d0295b751fceafd08161883ae.css.gz
  101. 0 ...ker-d97744f2bdbfb7c741f81b752465150c.js → jquery.colorpicker-a907fcfc29dc7596f06847718c0f3fa5.js}
  102. BIN ...7744f2bdbfb7c741f81b752465150c.js.gz → jquery.colorpicker-a907fcfc29dc7596f06847718c0f3fa5.js.gz}
  103. BIN public/assets/rails_admin/jquery.colorpicker-abec8b04315eef26dca1e44d4070c4a1.css.gz
  104. BIN public/assets/rails_admin/jquery.colorpicker.css.gz
  105. BIN public/assets/rails_admin/jquery.colorpicker.js.gz
  106. BIN ...ils_admin/{logo-15718735b5a7b41f3b923c1d297cbb0e.png → logo-ad8c7203daea0683b3d68fed39e88318.png}
  107. BIN ...{magnifier-ed03843cd69f706d8690eff931bc2bb9.png → magnifier-8f59afb37bb26eae6d51d770397f22f2.png}
  108. BIN public/assets/rails_admin/magnifier.png
  109. BIN ...n_sprite-c85b36fba1b0dd6067f900f7c8da5aec.png → icon_sprite-07784381caec9a6bfe93b447dee0a6b5.png}
  110. BIN ...6dd4ed6919260c7dd82457.png → ui-icon-circle-triangle-n-dark-f9cc09ee6dd240eb53dd185333516f66.png}
  111. BIN ...b8c38fb86b26362abfd5e.png → ui-icon-circle-triangle-n-light-8a59c4095148cd024a258118c33bbb96.png}
  112. BIN ...f343cac3e336f6c9d656d2.png → ui-icon-circle-triangle-s-dark-2585cc6b1698f94c10868e7155b1fe6e.png}
  113. BIN ...f9fbba8ad7b1442ee20fa.png → ui-icon-circle-triangle-s-light-2e5df7a7ae183810c44aa3ba21f4bdf5.png}
  114. +1 −1 ...ls_admin-b1b727968a449508466ce3172fca1a2a.css → rails_admin-59c1c1c8108483544dc0b1cd80792e01.css}
  115. BIN public/assets/rails_admin/rails_admin-59c1c1c8108483544dc0b1cd80792e01.css.gz
  116. 0 ...ails_admin-17b5b4f5f8939cfba18613c49c20770c.js → rails_admin-6cd449d771e7d5fe713fc3f4d04f05ec.js}
  117. BIN ...dmin-17b5b4f5f8939cfba18613c49c20770c.js.gz → rails_admin-6cd449d771e7d5fe713fc3f4d04f05ec.js.gz}
  118. +1 −0 public/assets/rails_admin/rails_admin-a8b916b0e4801fdef371515f7060564e.css
  119. BIN public/assets/rails_admin/rails_admin-a8b916b0e4801fdef371515f7060564e.css.gz
  120. BIN public/assets/rails_admin/rails_admin-b1b727968a449508466ce3172fca1a2a.css.gz
  121. BIN public/assets/rails_admin/rails_admin.css.gz
  122. BIN public/assets/rails_admin/rails_admin.js.gz
  123. BIN ...der-aac73c8f6ac0932b1da9c682cf6c2f46.png → ruby-placeholder-f3fafc65b9c335e572dba32e56a00ddf.png}
  124. BIN ...logo-532934d41cab163d12b0b4efbea95533.png → seattle.rb-logo-c295050078d8e60444379fa72bd52b0e.png}
  125. BIN ...-be4fafbe97b6a8eb7f69c596b1f7d93a.png → seattle_rb_logo_big-eea0587cb287f72012cfa249caf120dc.png}
  126. BIN ...dc49a275def07ef4452433f9e1910.png → seattle_rb_logo_no_text-28c3278cb37089367c09fced7e9a111d.png}
  127. BIN ...16cd9c1e6492843e6e32e0ab12967378.png → glyphicons-halflings-0d35d28d069e8c8fefb369fb1653f3c9.png}
  128. BIN ...bcd2c204b90921315632a32a69.png → glyphicons-halflings-white-d050f89c8935ae163e68daa4d9807acd.png}
  129. BIN ...260b3ba3ed73e8e86b0fe7aa5b4a3518.png → vivace_on_google_map-c5e0d65a1ac843328491450c1649969f.png}
View
Binary file not shown.
Binary file not shown.
@@ -1,6 +0,0 @@
-$(function() {
- $.contra( function() {
- $('#hero-ruby').remove()
- $('#chocolate').show()
- } );
-});
@@ -5,5 +5,5 @@
// the compiled file.
//
//= require jquery
-//= require twitter/bootstrap
+//= require bootstrap.min
//= require_tree .

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,7 +0,0 @@
-/* jQuery Contra v1.0
- * http://jonraasch.com/blog/jquery-contra-plugin
- *
- * Copyright (c) 2009 Jon Raasch (http://jonraasch.com/)
- * Licensed under the MIT License (see http://dev.jonraasch.com/contra/docs#licensing)
- */
-(function(a){a.contra=function(e,d){function c(f){if(f==d.code[b]){b++;if(b>=d.code.length){e()}}else{b=0}}if(typeof e!="function"){return false}var b=0,d=d||{};d.scope=d.scope||a(document);d.code=d.code||[38,38,40,40,37,39,37,39,66,65,13];d.scope.keyup(function(f){c(f.which||f.keyCode)})};a.fn.contra=function(c,b){var b=b||{};b.scope=a(this);a.contra(c,b)}})(jQuery);
@@ -1,294 +0,0 @@
-
-/* LAYOUT... */
-
-.container {
- margin-top: 60px;
-}
-
-form {margin: 0}
-
-@media (max-width:979px){
- .container {
- margin-top: 0px;
- }
-}
-
-.brand {
- background: url(seattle.rb-logo.png) no-repeat left top !important;
- color: #c70000 !important;
- font-size: 275% !important;
- font-weight: bold !important;
- letter-spacing: -.04em;
- padding-left: 50px !important;
- margin: 5px 0 0 10px !important;
- line-height: 0.8 !important;
-}
-
-h2 {
- color: #b00800;
- line-height: 1.2;
- font-size: 200%;
-}
-
-.navbar .nav {
- margin-top: 8px;
-}
-
-.navbar .nav li {
- margin: 0 3px !important;
- font-size: 120%;
-}
-
-.navbar .nav li a {
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
-}
-
-.navbar .nav li a:hover {
- background-color: #c70000;
-}
-
-.row {
- padding-right: 0;
-}
-
-#monthly {
- background-color: #C3D9FF;
- background-image: -ms-linear-gradient(top, #C3D9FF 0%, #A9BBDD 100%);
- background-image: -moz-linear-gradient(top, #C3D9FF 0%, #A9BBDD 100%);
- background-image: -o-linear-gradient(top, #C3D9FF 0%, #A9BBDD 100%);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #C3D9FF), color-stop(1, #A9BBDD));
- background-image: -webkit-linear-gradient(top, #C3D9FF 0%, #A9BBDD 100%);
- background-image: linear-gradient(to bottom, #C3D9FF 0%, #A9BBDD 100%);
- border: 1px solid #A9BBDD;
- border-radius: 4px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- min-height: 100px;
- margin-bottom: 20px;
- h1, h2 {
- padding: 10px;
- }
- p.explanation{
- padding-left: 10px;
- }
- #first,
- #second,
- #third {
- p {
- width: 190px;
- }
- }
-}
-
-footer {
- background-color: #C3D9FF;
- padding: 7px 30px;
- font-weight: 200;
- font-size: 120%;
- color: #8A9AB5;
- margin-top: 10px;
- text-align: center;
-}
-
-table tr td {
- vertical-align: top;
-}
-
-address {margin: 0}
-
-.view-all {
- text-align: right;
-}
-input[type=checkbox] + label { display: inline-block }
-input[type=text], textarea, .uneditable-input { width:100% !important }
-.inline { display: inline-block}
-/*...LAYOUT*/
-
-/* HOME...*/
-
-.hero-unit {
- background: #fff;
- padding-bottom: 10px !important;
- margin-bottom: 10px;
-}
-
-.hero-unit img {
- text-align: center;
-}
-
-.hero-unit p {
- line-height: 1.4;
-}
-
-.hero-unit h2 {
- font-weight: 200;
- font-size: 150%;
- margin: 0 0 20px 3px;
- color: black;
- line-height: 0.8;
-}
-.proposed_talk {
- padding: 1em;
-}
-
-.proposed_talk .description {
- padding: 0 1em;
-}
-
-#map {
- color: #333;
- border: 1px solid #A9BBDD;
- padding: 0px !important;
- padding-top: 10px !important;
- margin-top: 15px;
- margin-right: 20px;
- margin-bottom: 25px;
- border-radius: 6px;
- moz-border-radius: 6px;
- webkit-border-radius: 6px;
- background-color: #C3D9FF;
- background-image: -ms-linear-gradient(top, #C3D9FF 0%, #A9BBDD 100%);
- background-image: -moz-linear-gradient(top, #C3D9FF 0%, #A9BBDD 100%);
- background-image: -o-linear-gradient(top, #C3D9FF 0%, #A9BBDD 100%);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #C3D9FF), color-stop(1, #A9BBDD));
- background-image: -webkit-linear-gradient(top, #C3D9FF 0%, #A9BBDD 100%);
- background-image: linear-gradient(to bottom, #C3D9FF 0%, #A9BBDD 100%);
- .span8 {
- margin-left: 0px;
- }
-}
-
-.join-us #map {
- background: white;
- border: none;
- margin-top: 0;
-}
-
-.join-us #map iframe {
- margin-top: 10px;
-}
-
-#map iframe {
- border-radius: 6px;
- moz-border-radius: 6px;
- webkit-border-radius: 6px;
- margin-bottom: 10px;
- width: 90%;
-}
-
-#map h3 {
- line-height: 1;
-}
-
-#map table {
- margin: 10px 0 0 0px;
-}
-
-#map table tr:first-child td {
- padding-bottom: 5px;
-}
-
-#map #address {
- margin-left: 10px !important;
- margin-right: 5px !important;
-}
-
-abbr.amp {
- font-weight: normal;
- font-style: italic;
- font-size: 120%;
- font-family: Baskerville, Palatino, "Book Antiqua", serif;
- border: none;
-}
-
-#chocolate { display: none; }
-
-/*...HOME*/
-
-/* PEOPLE...*/
-.profile {
- padding: 10px 0;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 5px;
-}
-
-.profile:nth-child(even) {
- background-color: #E9FBFF;
-}
-
-.profile .avatar {
-/* margin: 0 10px 0 0;*/
-}
-
-.profile img {
- width: 73px;
- border: 1px solid #ccc;
-}
-
-.profile .description h1 {
- line-height: 0.7;
- margin-bottom: 8px;
- font-size: 300%;
-}
-.links {
- margin: 2px;
-}
-.links li {
- display: inline-block;
- margin: 0 5px;
-}
-.mini-profile {
- margin-top: 15px;
- margin-bottom: 15px;
- border-radius: 3px;
- moz-border-radius: 3px;
- webkit-border-radius: 3px;
- background-color: #ddd;
-}
-
-.mini-profile h2 {
- font-size: 200%;
- margin: 5px 10px 0px 10px;
- line-height: 1;
-}
-
-.mini-profile p {
- margin: 0 12px;
- height: 55px;
-}
-
-@media (max-width:767px) {
- .mini-profile {
- min-height: 110px;
- height: 100%;
- }
- .mini-profile p {
- min-height: 50px;
- height: 100%;
- }
-}
-
-/*...DUDES*/
-.new {
- text-align: right;
-}
-
-
-/* PROJECTS...*/
-.project:first-child {
- border: none;
-}
-.project {
- border-top: 1px dotted #ddd;
- padding-top: 5px;
-}
-/* ...PROJECTS */
-
-/* JOIN US...*/
-
-#newsletter input[type=text] {
- margin-top: 5px;
-}
@@ -3,6 +3,5 @@
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
* the top of the compiled file, but it's generally better to create a new file per style scope.
-*= require 'bootstrap.min'
-*= require 'about'
+*= require_tree .
*/
Oops, something went wrong.

0 comments on commit 28ede46

Please sign in to comment.