Permalink
Browse files

css update + bootstrap

  • Loading branch information...
1 parent cfeeea5 commit 8153b5e7160ff7a75a3818a53eeda85c531e5da1 @jrabbott committed May 14, 2012
View
@@ -23,6 +23,8 @@ end
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
+ gem 'twitter-bootstrap-rails'
+
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', :platform => :ruby
View
@@ -39,6 +39,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.1)
+ commonjs (0.2.6)
devise (2.0.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
@@ -54,6 +55,12 @@ GEM
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.7.1)
+ less (2.2.1)
+ commonjs (~> 0.2.6)
+ less-rails (2.2.2)
+ actionpack (>= 3.1)
+ less (~> 2.2.0)
+ libv8 (3.3.10.4)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -98,11 +105,18 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
+ therubyracer (0.10.1)
+ libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
+ twitter-bootstrap-rails (2.0.7)
+ actionpack (>= 3.1)
+ less-rails (~> 2.2.2)
+ railties (>= 3.1)
+ therubyracer (~> 0.10.1)
tzinfo (0.3.33)
uglifier (1.2.4)
execjs (>= 0.3.0)
@@ -123,4 +137,5 @@ DEPENDENCIES
rake
sass-rails (~> 3.2.3)
sqlite3 (= 1.3.5)
+ twitter-bootstrap-rails
uglifier (>= 1.0.3)
@@ -12,4 +12,6 @@
//
//= require jquery
//= require jquery_ujs
+//= require twitter/bootstrap
//= require_tree .
+
@@ -0,0 +1,4 @@
+jQuery ->
+ $("a[rel=popover]").popover()
+ $(".tooltip").tooltip()
+ $("a[rel=tooltip]").tooltip()
@@ -1,3 +1,5 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
+
+
@@ -1,13 +1,7 @@
/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * 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.
- *
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * 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_self
*= require_tree .
*/
@@ -0,0 +1,29 @@
+@import "twitter/bootstrap/bootstrap";
+body { padding-top: 60px; }
+
+@import "twitter/bootstrap/responsive";
+
+// Set the correct sprite paths
+@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
+@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
+
+// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
+@fontAwesomeEotPath: asset-path('fontawesome-webfont.eot');
+@fontAwesomeWoffPath: asset-path('fontawesome-webfont.woff');
+@fontAwesomeTtfPath: asset-path('fontawesome-webfont.ttf');
+@fontAwesomeSvgzPath: asset-path('fontawesome-webfont.svgz');
+@fontAwesomeSvgPath: asset-path('fontawesome-webfont.svg');
+
+// Font Awesome
+@import "fontawesome";
+
+// Your custom LESS stylesheets goes here
+//
+// Since bootstrap was imported above you have access to its mixins which
+// you may use and inherit here
+//
+// If you'd like to override bootstrap's own variables, you can do so here as well
+// See http://twitter.github.com/bootstrap/less.html for their names and documentation
+//
+// Example:
+// @linkColor: #ff0000;
@@ -0,0 +1,36 @@
+/* guestbook page */
+
+#guestbook {
+ padding-bottom: 10px;
+ }
+ .entry {
+ text-align: justify;
+ margin-bottom: 5px;
+ padding: 10px 0px 0px 0px;
+ .entry_text{
+ padding: 0px 0px 5px 0px;
+ }
+ .meta {
+ border-top: 1px solid #E5E5E5;
+ border-bottom: 1px solid #E5E5E5;
+ padding: 5px 0px;
+ text-align: left;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-style: italic;
+ b {
+ color: #F26624;
+ }
+ }
+ .entry_actions {
+ float: right;
+ }
+ }
+ #post_comment{
+ margin: 20px 0;
+ border: solid 1px #E5E5E5;
+ padding: 5px 10px 5px 10px;
+ &:hover { background-color: #F4E6FA; }
+ .field{}
+ /*.actions{ @include button }*/
+}
@@ -0,0 +1,230 @@
+/* body */
+
+body {
+ margin: 0;
+ padding: 0;
+ background: #482E53;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 14px;
+ color: #525252;
+ h1, h2, h3 {
+ margin: 0;
+ padding: 0;
+ font-weight: normal;
+ color: #2C2723;
+ }
+ h1 {
+ font-size: 2em;
+ }
+ h2 {
+ font-size: 2.4em;
+ }
+ h3 {
+ font-size: 1.6em;
+ }
+ p, ul, ol {
+ margin-top: 0;
+ line-height: 180%;
+ }
+ a {
+ text-decoration: none;
+ color: #712B77;
+ &:hover {
+ text-decoration: underline;
+ }
+ }
+
+}
+
+/* Menu */
+
+#menu {
+ width: 980px;
+ height: 30px;
+ margin: 0 auto;
+ padding: 15px 0px 0px 0px;
+ ul {
+ margin: 0;
+ padding: 0px 0px 0px 4px;
+ list-style: none;
+ line-height: normal;
+ }
+ li {
+ float: left;
+ }
+ a {
+ display: block;
+ float: left;
+ height: 24px;
+ padding: 4px 30px 0px 30px;
+ text-decoration: none;
+ text-transform: lowercase;
+ font-size: 16px;
+ font-weight: normal;
+ color: #FFFFFF;
+ border: none;
+ }
+ .current_page_item {
+ background: #120019;
+ a {
+ background: #120019;
+ color: #FFFFFF;
+ }
+ }
+}
+
+/* Header */
+
+#header {
+ width: 980px;
+ height: 60px;
+ margin: 0 auto;
+ .title {
+ float: left;
+ margin: 0;
+ padding: 5px 0px 0px 30px;
+ float: left;
+ letter-spacing: -1px;
+ text-shadow: #15041C -1px 1px 2px;
+ font-family: Georgia, "Times New Roman", Times, serif;
+ font-size: 42px;
+ color: #FFFFFF;
+ font-weight: normal;
+ }
+ .signin {
+ float: right;
+ letter-spacing: -1px;
+ text-shadow: #15041C -1px 1px 2px;
+ font-family: Georgia, "Times New Roman", Times, serif;
+ font-size: 16px;
+ color: #FFFFFF;
+ padding: 30px 10px 0px 0px;
+ margin-top: 0;
+ line-height: 180%;
+ }
+
+ a {
+ text-decoration: none;
+ color: #FFFFFF;
+ &:hover {
+ color: #F26624;
+ }
+ }
+}
+
+/* splash image */
+
+#splash {
+ width: 980px;
+ height: 350px;
+ margin: 0px auto;
+ background: url(img01.jpg) no-repeat left top;
+}
+
+/* Page */
+
+#page {
+ width: 980px;
+ margin: 0px auto;
+ background: #FFFFFF;
+ .page-bgtop {
+ }
+
+ .page-bgbtm {
+ margin: 0px;
+ padding: 0px 30px 0px 30px;
+ }
+}
+
+/* Content */
+
+#content {
+ float: right;
+ width: 670px;
+ padding: 0px 20px 0px 0px;
+}
+
+#page_body {
+ padding-bottom: 10px;
+ h2 {
+ margin: 0px;
+ padding-bottom: 10px;
+ letter-spacing: -1px;
+ color: #F26624;
+ text-decoration: none;
+ border: none;
+ }
+ p {
+ text-align: justify;
+ margin-bottom: 5px;
+ padding: 10px 0px 0px 0px;
+ }
+}
+
+/* Sidebar */
+
+#sidebar {
+ float: left;
+ width: 200px;
+ padding: 10px 0px 0px 0px;
+}
+
+#sidebar ul {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+#sidebar li {
+ margin: 0;
+ padding-left: 15px;
+ line-height: 35px;
+ border-bottom: 1px solid #E5E5E5;
+}
+
+#sidebar h2 {
+ height: 38px;
+ margin-bottom: 20px;
+ padding: 10px 0px 0px 15px;
+ letter-spacing: -1px;
+ font-size: 28px;
+ color: #F26624;
+}
+
+#sidebar p {
+ margin: 0 0px;
+ padding: 0px 20px 20px 20px;
+ text-align: justify;
+}
+
+#sidebar a {
+ border: none;
+}
+
+#sidebar a:hover {
+ text-decoration: underline;
+}
+
+#sideimg {
+ width: 180px;
+ height: 145px;
+ margin: 0px auto;
+ background: url(img02.jpg) no-repeat left top;
+}
+
+/* Footer */
+
+#footer {
+ overflow: hidden;
+ width: 980px;
+ padding: 0px 0px 0px 0px;
+ background: #120019;
+ margin: 0 auto;
+ padding: 10px 0px 0px 0px;
+ line-height: normal;
+ font-size: 10px;
+ text-transform: uppercase;
+ text-align: center;
+ color: #FFFFFF;
+ font-family: Arial, Helvetica, sans-serif;
+}
@@ -1,3 +0,0 @@
-// Place all the styles related to the posts controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
Oops, something went wrong.

0 comments on commit 8153b5e

Please sign in to comment.